1 files changed, 6 insertions, 0 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index 12003e2..a1ed6e9 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -2931,6 +2931,12 @@ public class BackupManagerService {
 
             final String pkgName = mCurrentPackage.packageName;
             final long filepos = mBackupDataName.length();
+            if (mBackupDataName == null) {
+                failAgent(mAgentBinder, "Backup data was null: " + mBackupDataName);
+                addBackupTrace("backup data was null: " + mBackupDataName);
+                agentErrorCleanup();
+                return;
+            }
             FileDescriptor fd = mBackupData.getFileDescriptor();
             try {
                 // If it's a 3rd party app, see whether they wrote any protected keys