diff --git a/core/java/com/android/server/backup/SystemBackupAgent.java b/core/java/com/android/server/backup/SystemBackupAgent.java index 3e4530944b9e0..9d296fa194005 100644 --- 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(); + } } }