Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f123e65 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am ed7e8009: am 977b314b: Merge "Do not require device provisioning to do... 

am ed7e8009: am 977b314b: Merge "Do not require device provisioning to do restore-at-install" into lmp-dev

* commit 'ed7e80096b3b392a94a5d7f5ef321c0f5997911f':
  Do not require device provisioning to do restore-at-install
parents bbc0f671 afab9ecf

services/backup/java/com/android/server/backup/BackupManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -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;

        }