Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev (dd2f15a5) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -849,7 +849,6 @@ public class SettingsProvider extends ContentProvider {
		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 @@ public class SettingsProvider extends ContentProvider {
		}
		}

		// 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;