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

Commit 33894b29 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 1199a352 ed961d90

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