commit d9ea711a75b52e4bbce9c751e6b851e22cc87c8a
author Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Thu Jan 19 09:26:58 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 19 09:26:58 2012 -0800
tree 6cbc2b07cdb26859f6b458a4fe8bf2bd09bf25c9
parent f409b0e23a37080c3b8c501671c4ea436a1e6346
parent d616ee6fd5f752cc59eae90388f588c0f2e615a0

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

* commit 'd616ee6fd5f752cc59eae90388f588c0f2e615a0':
  Added a new URI updating preferred APN w/o change notification

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;