Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev

Author: Christopher Tate

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

@@ -849,7 +849,6 @@ private Uri insertForUser(Uri url, ContentValues initialValues, int desiredUserH
         if (TABLE_FAVORITES.equals(args.table)) {
             return null;
         }
-        checkWritePermissions(args);
 
         // Special case LOCATION_PROVIDERS_ALLOWED.
         // Support enabling/disabling a single provider (using "+" or "-" prefix)
@@ -869,6 +868,9 @@ private Uri insertForUser(Uri url, ContentValues initialValues, int desiredUserH
             }
         }
 
+        // Check write permissions only after determining which table the insert will touch
+        checkWritePermissions(args);
+
         // The global table is stored under the owner, always
         if (TABLE_GLOBAL.equals(args.table)) {
             desiredUserHandle = UserHandle.USER_OWNER;