Merge "Only invoke k/v helpers during k/v operations" into nyc-dev

2016-04-21 01:12:06 +00:00
parent 34a96e704e c9e584b422
commit 157ae98762
1 changed files with 4 additions and 1 deletions
--- a/core/java/com/android/server/backup/SystemBackupAgent.java
+++ b/core/java/com/android/server/backup/SystemBackupAgent.java
@@ -183,6 +183,9 @@ public class SystemBackupAgent extends BackupAgentHelper {

    @Override
    public void onRestoreFinished() {
-        mWallpaperHelper.onRestoreFinished();
+        // helper will be null following 'adb restore' or other full-data operation
+        if (mWallpaperHelper != null) {
+            mWallpaperHelper.onRestoreFinished();
+        }
    }
 }