Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set flags on the correct Intent, please" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-04 10:47:42 +00:00
committed by Android (Google) Code Review
parent 1199a352fc ed961d90ea
commit 33894b2998
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -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

2
services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java
View File

@@ -750,7 +750,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