commit 5850cee247ff7ea1c898d04405fca143134ee905
author Raman Tenneti <rtenneti@google.com> Fri Jun 19 23:50:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 19 23:50:53 2020 +0000
tree 425945fba895ead33c8dac0d22faa165893a46db
parent f33a0d08235a92ee9f4e6ef767cd361c714bd960
parent f556ac71f2ee3f2c12ad545a84534b2adc3b9f7f

AOSP/Messaging - Changed midSdkVersion to 14 and reverted to using Telephony.Carriers.CONTENT_URI instead of  Telephony.Carriers.SIM_APN_URI. am: 7f4bb54ece am: f556ac71f2

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

Change-Id: Id215ca02976858312f465f78e70eedb7d371317f

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b25ff16..9a32085 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="com.android.messaging"
     android:installLocation="internalOnly">
 
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
 
     <!-- Application holds CPU wakelock while working in background -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />

src/com/android/messaging/sms/MmsUtils.java

diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java
index 75a01dd..32f0616 100644
--- a/src/com/android/messaging/sms/MmsUtils.java
+++ b/src/com/android/messaging/sms/MmsUtils.java
@@ -1499,7 +1499,7 @@
                 cursor = SqliteWrapper.query(
                         context,
                         resolver,
-                        Telephony.Carriers.SIM_APN_URI,
+                        Telephony.Carriers.CONTENT_URI,
                         TEST_CARRIERS_PROJECTION,
                         null/*selection*/,
                         null/*selectionArgs*/,