Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5af9675 authored by Raman Tenneti's avatar Raman Tenneti Committed by Automerger Merge Worker
Browse files

Merge "API level 30 upgrade: AOSP Dialer" am: e9828780 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1782168

Change-Id: I92d5e86d7aca49249ef93884566d11b4e24438fd
parents f82b1643 e9828780

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"/>

assets/quantum/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.google.android.assets.quantum">

  <uses-sdk android:targetSdkVersion="29" />

  <uses-sdk android:targetSdkVersion="30" />

  <application/>

</manifest>

java/com/android/dialer/app/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 


  <uses-sdk

    android:minSdkVersion="24"

    android:targetSdkVersion="29"/>

    android:targetSdkVersion="30"/>



  <application>

java/com/android/dialer/assisteddialing/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


  <uses-sdk

      android:minSdkVersion="24"

      android:targetSdkVersion="29"/>

      android:targetSdkVersion="30"/>



</manifest>

java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


  <uses-sdk

      android:minSdkVersion="24"

      android:targetSdkVersion="29"/>

      android:targetSdkVersion="30"/>



  <application>

    <activity