commit 33894b2998b15b0f7526bfc39dfdbbfa124fd700
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 04 10:47:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 04 10:47:42 2017 +0000
tree 4e2cd7a5ea79b181d1454c7b0878dfb90344ea80
parent 1199a352fcb938a8dc7a34a2853c4fde7f5656f1
parent ed961d90ea737f72d85b8a9105c191ed2a9b8f23

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

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

diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index 29d562b..92d3d39 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 @@
         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

diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java
index d118917..e8c5058 100644
--- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java
@@ -750,7 +750,7 @@
         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