Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a80316da authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

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

am: 33894b29

Change-Id: I27e90c362abd23746e4b854308cf14b46abe9293
parents 41be8131 33894b29

services/backup/java/com/android/server/backup/BackupManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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

































services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java



+1
−1




























Original line number
Diff line number
Diff line








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