From 7f4bb54ece5058f7f12cfd74a6f78e27fb53361d Mon Sep 17 00:00:00 2001
From: Raman Tenneti <rtenneti@google.com>
Date: Fri, 19 Jun 2020 14:40:58 -0700
Subject: [PATCH] AOSP/Messaging - Changed midSdkVersion to 14 and reverted to
 using Telephony.Carriers.CONTENT_URI instead of 
 Telephony.Carriers.SIM_APN_URI.

Fixes error: "NoSuchFieldError exception: Telephony.Carriers.SIM_APN_URI requires API level 29"

Bug: 159055957

Test: manual - Tested the messaging UI. Without this change the app is crashing when we click on it.

$ make -j 40

Change-Id: Ic34ccac673531a61386c1eaa3bbfff950d19517b
---
 AndroidManifest.xml                         | 2 +-
 src/com/android/messaging/sms/MmsUtils.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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" />
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 @@ public class MmsUtils {
                 cursor = SqliteWrapper.query(
                         context,
                         resolver,
-                        Telephony.Carriers.SIM_APN_URI,
+                        Telephony.Carriers.CONTENT_URI,
                         TEST_CARRIERS_PROJECTION,
                         null/*selection*/,
                         null/*selectionArgs*/,