summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-11-17 02:22:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-11-17 02:22:22 +0000
commit59f1ee6a36ec166ff675df161fa304f19bdcfe5c (patch)
tree0f37d76bc798243e1434269f554dced8c75080ad
parent94568f1e74e08e8397338d232eac80a866971301 (diff)
parent60b062f7b84cb08b653559cc3aa3a12d72951d99 (diff)
Merge "[RESTRICT AUTOMERGE] Make MultiClient IMMS PendingIntent IMMUTABLE" into sc-v2-dev
-rw-r--r--services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java
index aa4fa7c6f470..4a41cb6d81e2 100644
--- a/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java
@@ -917,7 +917,7 @@ public final class MultiClientInputMethodManagerService {
.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(
context, 0,
new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS),
- PendingIntent.FLAG_MUTABLE));
+ PendingIntent.FLAG_IMMUTABLE));
// Note: Instead of re-dispatching callback from the main thread to the worker thread
// where OnWorkerThreadCallback is running, we pass the Handler object here so that