From aa50c2224a7b5a6c98cf5d428e979c8dad0d826e Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Mon, 19 Oct 2020 20:01:28 +0100 Subject: [PATCH] UBMS.mRunInitIntent: Mark as immutable. No production code relies on the mutability. Code in fakeandroid's AlarmManager added in http://ag/3826144 relies on the mutability, and backup/internal/PerformInitializeTask sets a (now immutable) PendingIntent, but fakeandroid uses a different AlarmManager instance that the real system so these should be unrelated (I think - reviewer, please double-check my thinking). Fixes: 170163281 Test: Treehugger Change-Id: I3dd45cc270c2fd8ab9d4b3402edc6cc5d765fd5a --- .../com/android/server/backup/UserBackupManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index aa8532b67c43d..2ff66b564ec96 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -650,7 +650,7 @@ public class UserBackupManagerService { context, /* requestCode */ 0, initIntent, - /* flags */ 0, + /* flags */ PendingIntent.FLAG_IMMUTABLE, UserHandle.of(userId)); // Set up the backup-request journaling