Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f86aeb66360bc825090c18851ffb8d89baa000bf':
  Make sure to check write perms after rewriting destination table
This commit is contained in:
Christopher Tate
2012-10-04 16:57:50 -07:00
committed by Android Git Automerger
parent ca6a2c3453 f86aeb6636
commit 6d5cd6cb56
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -849,7 +849,6 @@ public class SettingsProvider extends ContentProvider {
if (TABLE_FAVORITES.equals(args.table)) { if (TABLE_FAVORITES.equals(args.table)) {
return null; return null;
} }
checkWritePermissions(args);
// Special case LOCATION_PROVIDERS_ALLOWED. // Special case LOCATION_PROVIDERS_ALLOWED.
// Support enabling/disabling a single provider (using "+" or "-" prefix) // 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 // The global table is stored under the owner, always
if (TABLE_GLOBAL.equals(args.table)) { if (TABLE_GLOBAL.equals(args.table)) {
desiredUserHandle = UserHandle.USER_OWNER; desiredUserHandle = UserHandle.USER_OWNER;