commit d616ee6fd5f752cc59eae90388f588c0f2e615a0
author Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Tue Jan 10 17:12:59 2012 -0600
committer Wink Saville <wink@google.com> Fri Jan 13 16:21:17 2012 -0800
tree 786970ba1bc1ed2ccb5d29cafaa357239e44e5ff
parent 09710cec4926bcd3708376face04507e661bcc02

Added a new URI updating preferred APN w/o change notification

Solving the issue that setting preferred APN from GDCT triggers
back APN change event and force unnecessary data call disconnects
and setups.

This patch adds one new URI used for preferred APN entry without
causing change notification via ContentObserver.

Bug:5448858
Change-Id: I2c132f367188b9a9da797fec65b3ff974c59a1b4

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 f498692..79d6a95 100755
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -60,6 +60,7 @@
     private static final int URL_ID = 3;
     private static final int URL_RESTOREAPN = 4;
     private static final int URL_PREFERAPN = 5;
+    private static final int URL_PREFERAPN_NO_UPDATE = 6;
 
     private static final String TAG = "TelephonyProvider";
     private static final String CARRIERS_TABLE = "carriers";
@@ -81,6 +82,7 @@
         s_urlMatcher.addURI("telephony", "carriers/#", URL_ID);
         s_urlMatcher.addURI("telephony", "carriers/restore", URL_RESTOREAPN);
         s_urlMatcher.addURI("telephony", "carriers/preferapn", URL_PREFERAPN);
+        s_urlMatcher.addURI("telephony", "carriers/preferapn_no_update", URL_PREFERAPN_NO_UPDATE);
 
         s_currentNullMap = new ContentValues(1);
         s_currentNullMap.put("current", (Long) null);
@@ -444,7 +446,8 @@
                 break;
             }
 
-            case URL_PREFERAPN: {
+            case URL_PREFERAPN:
+            case URL_PREFERAPN_NO_UPDATE: {
                 qb.appendWhere("_id = " + getPreferredApnId());
                 break;
             }
@@ -471,6 +474,7 @@
             return "vnd.android.cursor.item/telephony-carrier";
 
         case URL_PREFERAPN:
+        case URL_PREFERAPN_NO_UPDATE:
             return "vnd.android.cursor.item/telephony-carrier";
 
         default:
@@ -578,6 +582,7 @@
             }
 
             case URL_PREFERAPN:
+            case URL_PREFERAPN_NO_UPDATE:
             {
                 if (initialValues != null) {
                     if(initialValues.containsKey(COLUMN_APN_ID)) {
@@ -598,7 +603,7 @@
     @Override
     public int delete(Uri url, String where, String[] whereArgs)
     {
-        int count;
+        int count = 0;
 
         checkPermission();
 
@@ -632,9 +637,10 @@
             }
 
             case URL_PREFERAPN:
+            case URL_PREFERAPN_NO_UPDATE:
             {
                 setPreferredApnId((long)-1);
-                count = 1;
+                if (match == URL_PREFERAPN) count = 1;
                 break;
             }
 
@@ -685,11 +691,12 @@
             }
 
             case URL_PREFERAPN:
+            case URL_PREFERAPN_NO_UPDATE:
             {
                 if (values != null) {
                     if (values.containsKey(COLUMN_APN_ID)) {
                         setPreferredApnId(values.getAsLong(COLUMN_APN_ID));
-                        count = 1;
+                        if (match == URL_PREFERAPN) count = 1;
                     }
                 }
                 break;