commit adfda46e9b07df1144d7e4013d41adab6743e9e6
author Xiangyu/Malcolm Chen <refuhoo@google.com> Sat Dec 08 05:52:16 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 08 05:52:16 2018 +0000
tree 7298caa7e62f91e794a9dff9103337195187f27f
parent 9a242096fc481ee4b5e3fb1b13b917b344f35fc9
parent 07717cd6477551c4561a0d4c6b9d2dcf4ff324a8

Merge "Fix bug of carriers/filtered/# URL doesn't fetch subId correctly."

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 1261218..db7e4e7 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -169,6 +169,7 @@
     private static final int URL_PREFERAPNSET_USING_SUBID = 22;
     private static final int URL_SIM_APN_LIST = 23;
     private static final int URL_SIM_APN_LIST_ID = 24;
+    private static final int URL_FILTERED_USING_SUBID = 25;
 
     private static final String TAG = "TelephonyProvider";
     private static final String CARRIERS_TABLE = "carriers";
@@ -420,6 +421,9 @@
         // Only called by Settings app, DcTracker and other telephony components to get a
         // single APN according to whether DPC records are enforced.
         s_urlMatcher.addURI("telephony", "carriers/filtered/#", URL_FILTERED_ID);
+        // Used by DcTracker to pass a subId.
+        s_urlMatcher.addURI("telephony", "carriers/filtered/subId/*", URL_FILTERED_USING_SUBID);
+
         // Only Called by DevicePolicyManager to enforce DPC records.
         s_urlMatcher.addURI("telephony", "carriers/enforce_managed", URL_ENFORCE_MANAGED);
         s_urlMatcher.addURI("telephony", "carriers/sim_apn_list", URL_SIM_APN_LIST);
@@ -2701,8 +2705,19 @@
                 break;
             }
 
-            case URL_FILTERED_ID: {
-                qb.appendWhere("_id = " + url.getLastPathSegment());
+            case URL_FILTERED_ID:
+            case URL_FILTERED_USING_SUBID: {
+                String idString = url.getLastPathSegment();
+                if (match == URL_FILTERED_ID) {
+                    qb.appendWhere("_id = " + idString);
+                } else {
+                    try {
+                        subId = Integer.parseInt(idString);
+                    } catch (NumberFormatException e) {
+                        loge("NumberFormatException" + e);
+                        return null;
+                    }
+                }
             }
             //intentional fall through from above case
             case URL_FILTERED: {
@@ -2889,6 +2904,7 @@
 
         case URL_ID:
         case URL_FILTERED_ID:
+        case URL_FILTERED_USING_SUBID:
             return "vnd.android.cursor.item/telephony-carrier";
 
         case URL_PREFERAPN_USING_SUBID: