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

Fix permission checks around setBackupEnabled()

Browse Source 
...by making sure to drop binder identity before writing our new
state to secure settings etc.

Bug 10506933

Change-Id: I00505cc5215c8fe5f30f2f35698b30645fe14c87
This commit is contained in:
Christopher Tate
2013-09-08 15:41:32 -07:00
parent e6a01f3793
commit ffe0a803f8
1 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
services/java/com/android/server/BackupManagerService.java
View File

@@ -5358,47 +5358,53 @@ class BackupManagerService extends IBackupManager.Stub {
} }
// Enable/disable the backup service // Enable/disable the backup service
@Override
public void setBackupEnabled(boolean enable) { public void setBackupEnabled(boolean enable) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP, mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP,
"setBackupEnabled"); "setBackupEnabled");
Slog.i(TAG, "Backup enabled => " + enable); Slog.i(TAG, "Backup enabled => " + enable);
boolean wasEnabled = mEnabled; long oldId = Binder.clearCallingIdentity();
synchronized (this) { try {
Settings.Secure.putInt(mContext.getContentResolver(), boolean wasEnabled = mEnabled;
Settings.Secure.BACKUP_ENABLED, enable ? 1 : 0); synchronized (this) {
mEnabled = enable; Settings.Secure.putInt(mContext.getContentResolver(),
} Settings.Secure.BACKUP_ENABLED, enable ? 1 : 0);
mEnabled = enable;
}
synchronized (mQueueLock) { synchronized (mQueueLock) {
if (enable && !wasEnabled && mProvisioned) { if (enable && !wasEnabled && mProvisioned) {
// if we've just been enabled, start scheduling backup passes // if we've just been enabled, start scheduling backup passes
startBackupAlarmsLocked(BACKUP_INTERVAL); startBackupAlarmsLocked(BACKUP_INTERVAL);
} else if (!enable) { } else if (!enable) {
// No longer enabled, so stop running backups // No longer enabled, so stop running backups
if (DEBUG) Slog.i(TAG, "Opting out of backup"); if (DEBUG) Slog.i(TAG, "Opting out of backup");
mAlarmManager.cancel(mRunBackupIntent); mAlarmManager.cancel(mRunBackupIntent);
// This also constitutes an opt-out, so we wipe any data for // This also constitutes an opt-out, so we wipe any data for
// this device from the backend. We start that process with // this device from the backend. We start that process with
// an alarm in order to guarantee wakelock states. // an alarm in order to guarantee wakelock states.
if (wasEnabled && mProvisioned) { if (wasEnabled && mProvisioned) {
// NOTE: we currently flush every registered transport, not just // NOTE: we currently flush every registered transport, not just
// the currently-active one. // the currently-active one.
HashSet<String> allTransports; HashSet<String> allTransports;
synchronized (mTransports) { synchronized (mTransports) {
allTransports = new HashSet<String>(mTransports.keySet()); allTransports = new HashSet<String>(mTransports.keySet());
}
// build the set of transports for which we are posting an init
for (String transport : allTransports) {
recordInitPendingLocked(true, transport);
}
mAlarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(),
mRunInitIntent);
} }
// build the set of transports for which we are posting an init
for (String transport : allTransports) {
recordInitPendingLocked(true, transport);
}
mAlarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(),
mRunInitIntent);
} }
} }
} finally {
Binder.restoreCallingIdentity(oldId);
} }
} }