diff options
| author | Raman Tenneti <rtenneti@google.com> | 2021-08-02 20:46:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-02 20:46:37 +0000 |
| commit | 17c942c7fd71674dae29d3fc9dcaa747c8a67b44 (patch) | |
| tree | 32ed8f7db5b485ac22ad811bfc3db6f892d9818e /java/com | |
| parent | c0c649c84ab5bcf4d70c512b6dbc9b0e1f862638 (diff) | |
| parent | c5af967504ee6df3ba0413e445fef495efe87652 (diff) | |
| download | Dialer-17c942c7fd71674dae29d3fc9dcaa747c8a67b44.tar.gz | |
Merge "API level 30 upgrade: AOSP Dialer" am: e98287809e am: c5af967504
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1782168
Change-Id: I975ce2e612e979884c82ef9da6e70b70dce076aa
Diffstat (limited to 'java/com')
14 files changed, 14 insertions, 14 deletions
diff --git a/java/com/android/dialer/app/AndroidManifest.xml b/java/com/android/dialer/app/AndroidManifest.xml index be0015b35..ade5bd447 100644 --- a/java/com/android/dialer/app/AndroidManifest.xml +++ b/java/com/android/dialer/app/AndroidManifest.xml @@ -56,7 +56,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> diff --git a/java/com/android/dialer/assisteddialing/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/AndroidManifest.xml index 0c2302bba..6b44f1b1a 100644 --- a/java/com/android/dialer/assisteddialing/AndroidManifest.xml +++ b/java/com/android/dialer/assisteddialing/AndroidManifest.xml @@ -17,6 +17,6 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> </manifest> diff --git a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml index 1405841f7..fb6e30510 100644 --- a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml +++ b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml @@ -17,7 +17,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> <activity diff --git a/java/com/android/dialer/binary/google/AndroidManifest.xml b/java/com/android/dialer/binary/google/AndroidManifest.xml index d504d21d1..8555ff6e0 100644 --- a/java/com/android/dialer/binary/google/AndroidManifest.xml +++ b/java/com/android/dialer/binary/google/AndroidManifest.xml @@ -21,7 +21,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <uses-permission android:name="android.permission.CALL_PHONE"/> <uses-permission android:name="android.permission.READ_CONTACTS"/> diff --git a/java/com/android/dialer/calllog/AndroidManifest.xml b/java/com/android/dialer/calllog/AndroidManifest.xml index a48723355..35a798ec2 100644 --- a/java/com/android/dialer/calllog/AndroidManifest.xml +++ b/java/com/android/dialer/calllog/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> diff --git a/java/com/android/dialer/calllog/config/AndroidManifest.xml b/java/com/android/dialer/calllog/config/AndroidManifest.xml index 73a0f1f99..80ba1d5c3 100644 --- a/java/com/android/dialer/calllog/config/AndroidManifest.xml +++ b/java/com/android/dialer/calllog/config/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> diff --git a/java/com/android/dialer/promotion/impl/AndroidManifest.xml b/java/com/android/dialer/promotion/impl/AndroidManifest.xml index 209072bd8..55a165765 100644 --- a/java/com/android/dialer/promotion/impl/AndroidManifest.xml +++ b/java/com/android/dialer/promotion/impl/AndroidManifest.xml @@ -18,6 +18,6 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> </manifest> diff --git a/java/com/android/dialer/shortcuts/AndroidManifest.xml b/java/com/android/dialer/shortcuts/AndroidManifest.xml index 826ad9c28..e54b659ca 100644 --- a/java/com/android/dialer/shortcuts/AndroidManifest.xml +++ b/java/com/android/dialer/shortcuts/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> diff --git a/java/com/android/dialer/spannable/AndroidManifest.xml b/java/com/android/dialer/spannable/AndroidManifest.xml index afc1675a7..e768daccd 100644 --- a/java/com/android/dialer/spannable/AndroidManifest.xml +++ b/java/com/android/dialer/spannable/AndroidManifest.xml @@ -18,5 +18,5 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> </manifest> diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index e2afd9a30..7283702fa 100644 --- a/java/com/android/incallui/AndroidManifest.xml +++ b/java/com/android/incallui/AndroidManifest.xml @@ -19,7 +19,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/> <!-- We use this to disable the status bar buttons of home, back and recent diff --git a/java/com/android/incallui/autoresizetext/AndroidManifest.xml b/java/com/android/incallui/autoresizetext/AndroidManifest.xml index 9bff6f20d..f66ee5709 100644 --- a/java/com/android/incallui/autoresizetext/AndroidManifest.xml +++ b/java/com/android/incallui/autoresizetext/AndroidManifest.xml @@ -19,7 +19,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application /> </manifest> diff --git a/java/com/android/incallui/rtt/protocol/AndroidManifest.xml b/java/com/android/incallui/rtt/protocol/AndroidManifest.xml index c0d39b091..05f475725 100644 --- a/java/com/android/incallui/rtt/protocol/AndroidManifest.xml +++ b/java/com/android/incallui/rtt/protocol/AndroidManifest.xml @@ -18,5 +18,5 @@ package="com.android.incallui.rtt.protocol"> <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="26"/> + android:targetSdkVersion="30"/> </manifest>
\ No newline at end of file diff --git a/java/com/android/incallui/video/protocol/AndroidManifest.xml b/java/com/android/incallui/video/protocol/AndroidManifest.xml index c73ce10b3..8548e9954 100644 --- a/java/com/android/incallui/video/protocol/AndroidManifest.xml +++ b/java/com/android/incallui/video/protocol/AndroidManifest.xml @@ -18,5 +18,5 @@ package="com.android.incallui.video.protocol"> <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> </manifest> diff --git a/java/com/android/voicemail/AndroidManifest.xml b/java/com/android/voicemail/AndroidManifest.xml index ccd89a9a5..d5c9a2d1d 100644 --- a/java/com/android/voicemail/AndroidManifest.xml +++ b/java/com/android/voicemail/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <!-- Applications using this module should merge these permissions using android_manifest_merge --> |