diff options
| author | Christopher Tate <ctate@google.com> | 2014-08-28 00:00:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 00:00:48 +0000 |
| commit | 89972815a2d17775538d66b9ba02747e016c81e2 (patch) | |
| tree | 795aae63d18d91c0bb7d817db198c8324e0f0fdc | |
| parent | 30a480bcfc822bc182ae8c6a57c79dacf50a8660 (diff) | |
| parent | 674d3e750133efc4b2d575d806596d1f56bda8d9 (diff) | |
| download | frameworks_base-89972815a2d17775538d66b9ba02747e016c81e2.zip frameworks_base-89972815a2d17775538d66b9ba02747e016c81e2.tar.gz frameworks_base-89972815a2d17775538d66b9ba02747e016c81e2.tar.bz2 | |
Merge "Do not require device provisioning to do restore-at-install" into lmp-dev
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index de5e7cb..3e7a7e4 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -8634,10 +8634,9 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF skip = true; } - if (!mAutoRestore || !mProvisioned) { + if (!mAutoRestore) { if (DEBUG) { - Slog.w(TAG, "Non-restorable state: auto=" + mAutoRestore - + " prov=" + mProvisioned); + Slog.w(TAG, "Non-restorable state: auto=" + mAutoRestore); } skip = true; } |