diff options
| author | 2017-09-04 11:15:39 +0000 | |
|---|---|---|
| committer | 2017-09-04 11:15:39 +0000 | |
| commit | 39be7faab29984412611f387b1c0bc0296e2a6b4 (patch) | |
| tree | eb78b5ce1127f27727fc3e2e4dea5312ad81b424 | |
| parent | b71ec00c2d9133e84aa61c460933cf5387028ea0 (diff) | |
| parent | a80316daa30ecdfd5e198fcb494d32b89d80b05c (diff) | |
Merge "Set flags on the correct Intent, please" into oc-mr1-dev am: 33894b2998
am: a80316daa3
Change-Id: I486096da329ccfed44ba6e5e9f6e14af47db8932
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 2 | ||||
| -rw-r--r-- | services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index dc4caaa5a168..d2f8bacef5f2 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -1315,7 +1315,7 @@ public class BackupManagerService implements BackupManagerServiceInterface { mRunBackupIntent = PendingIntent.getBroadcast(context, MSG_RUN_BACKUP, backupIntent, 0); Intent initIntent = new Intent(RUN_INITIALIZE_ACTION); - backupIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); + initIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); mRunInitIntent = PendingIntent.getBroadcast(context, 0, initIntent, 0); // Set up the backup-request journaling diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java index 10b03f98ce9a..b6e3f0f4f19e 100644 --- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java @@ -745,7 +745,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter mRunBackupIntent = PendingIntent.getBroadcast(context, 0, backupIntent, 0); Intent initIntent = new Intent(RUN_INITIALIZE_ACTION); - backupIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); + initIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); mRunInitIntent = PendingIntent.getBroadcast(context, 0, initIntent, 0); // Set up the backup-request journaling |