From c4dd18c7fbc2e79f69ac1aae510ddffa42472b9b Mon Sep 17 00:00:00 2001 From: Robert Berry Date: Thu, 6 Jul 2017 13:04:47 +0100 Subject: [PATCH] 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 --- core/java/android/app/backup/RestoreDescription.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- 2.11.0