diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-25 15:03:20 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-09-25 15:27:51 -0700 |
| commit | bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324 (patch) | |
| tree | d0b8906847bdb134fc8ab9b1bae876fccd4611c0 /services/java/com/android/server/BackupManagerService.java | |
| parent | d49359631bc2642be73dc162a8a73207df1e0baf (diff) | |
Update references to migrated global settings.
Fixed one setting that was migrated but not marked deprecated.
Removed a hidden setting that is no longer used by the new
power manager service.
Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
Diffstat (limited to 'services/java/com/android/server/BackupManagerService.java')
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index 5e2b42551d95..15fc479aa58c 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -729,14 +729,14 @@ class BackupManagerService extends IBackupManager.Stub { final ContentResolver resolver = context.getContentResolver(); boolean areEnabled = Settings.Secure.getInt(resolver, Settings.Secure.BACKUP_ENABLED, 0) != 0; - mProvisioned = Settings.Secure.getInt(resolver, - Settings.Secure.DEVICE_PROVISIONED, 0) != 0; + mProvisioned = Settings.Global.getInt(resolver, + Settings.Global.DEVICE_PROVISIONED, 0) != 0; mAutoRestore = Settings.Secure.getInt(resolver, Settings.Secure.BACKUP_AUTO_RESTORE, 1) != 0; mProvisionedObserver = new ProvisionedObserver(mBackupHandler); resolver.registerContentObserver( - Settings.Secure.getUriFor(Settings.Secure.DEVICE_PROVISIONED), + Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED), false, mProvisionedObserver); // If Encrypted file systems is enabled or disabled, this call will return the @@ -4956,7 +4956,7 @@ class BackupManagerService extends IBackupManager.Stub { boolean deviceIsProvisioned() { final ContentResolver resolver = mContext.getContentResolver(); - return (Settings.Secure.getInt(resolver, Settings.Secure.DEVICE_PROVISIONED, 0) != 0); + return (Settings.Global.getInt(resolver, Settings.Global.DEVICE_PROVISIONED, 0) != 0); } // Run a *full* backup pass for the given package, writing the resulting data stream |