Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev

Author: Christopher Tate

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

@@ -344,7 +344,12 @@ private void sendNotify(Uri uri, int userHandle) {
         String notify = uri.getQueryParameter("notify");
         if (notify == null || "true".equals(notify)) {
             final int notifyTarget = isGlobal ? UserHandle.USER_ALL : userHandle;
-            getContext().getContentResolver().notifyChange(uri, null, true, notifyTarget);
+            final long oldId = Binder.clearCallingIdentity();
+            try {
+                getContext().getContentResolver().notifyChange(uri, null, true, notifyTarget);
+            } finally {
+                Binder.restoreCallingIdentity(oldId);
+            }
             if (LOCAL_LOGV) Log.v(TAG, "notifying for " + notifyTarget + ": " + uri);
         } else {
             if (LOCAL_LOGV) Log.v(TAG, "notification suppressed: " + uri);