From 7d0e40963a77205fcbc0978a52ffc28f0f68ba2d Mon Sep 17 00:00:00 2001
From: calvinpan <calvinpan@google.com>
Date: Thu, 10 Jan 2019 20:25:47 +0800
Subject: [PATCH] Migrate to TelephonyProvider new URI when query the current
 sim APN

Since MCC, MNC and MVNO is deprecated in the TelephonyProvider and
query based on SIM_APN_URI will return all matching APNs from current
subscription carrier, so migrate to the new URI.

Bug: 115709816
Test: Build pass.
Change-Id: I260f2da2677564f37ef6a7711d45040a61215ddc
---
 src/com/android/messaging/sms/MmsUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java
index 913e9a6..9c4c2d5 100644
--- a/src/com/android/messaging/sms/MmsUtils.java
+++ b/src/com/android/messaging/sms/MmsUtils.java
@@ -1535,7 +1535,7 @@ public class MmsUtils {
                 cursor = SqliteWrapper.query(
                         context,
                         resolver,
-                        Telephony.Carriers.CONTENT_URI,
+                        Telephony.Carriers.SIM_APN_URI,
                         TEST_CARRIERS_PROJECTION,
                         null/*selection*/,
                         null/*selectionArgs*/,