From: Robert Berry <robertberry@google.com>
Date: Thu, 6 Jul 2017 12:04:47 +0000 (+0100)
Subject: Improve logging when restore fails to load Package Manager.
X-Git-Tag: android-x86-9.0-r1~1318^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4dd18c7fbc2e79f69ac1aae510ddffa42472b9b;p=android-x86%2Fframeworks-base.git

Improve logging when restore fails to load Package Manager.

When the transport has no more packages to return, #nextRestorePackage()
returns RestoreDescription.NO_MORE_PACKAGES. Instead of logging that it had
been unable to get the package metadata, the code in BackupManagerService
was assuming that this was a valid package but one with an unexpected
package name, and hence logged a confusing error message.

Bug: 37695157
Change-Id: I75f2123d2bb062ad04003d7ef2a3a25d9661338c
Test: manual
---

diff --git a/core/java/android/app/backup/RestoreDescription.java b/core/java/android/app/backup/RestoreDescription.java
index 611ff07c8d0c..0250326e42f2 100644
--- a/core/java/android/app/backup/RestoreDescription.java
+++ b/core/java/android/app/backup/RestoreDescription.java
@@ -34,7 +34,7 @@ public class RestoreDescription implements Parcelable {
     private final String mPackageName;
     private final int mDataType;
 
-    private static final String NO_MORE_PACKAGES_SENTINEL = "";
+    private static final String NO_MORE_PACKAGES_SENTINEL = "NO_MORE_PACKAGES";
 
     /**
      * Return this constant RestoreDescription from BackupTransport.nextRestorePackage()