| commit | 9ab22c28fb2581ff592d39a46114bf6be6436256 | [log] [tgz] |
|---|---|---|
| author | Jason Chiu <chiujason@google.com> | Thu Mar 28 02:44:18 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 28 02:44:18 2024 +0000 |
| tree | dee6cd1cf2b425c7fed2b1bcb0ff91890ca26635 | |
| parent | e65774a05667950ba828df688c1fa158219a1969 [diff] | |
| parent | a18f9e501455e8a113be34e7a26b316f90530367 [diff] |
Merge "[Safer intents] Input method" into main
diff --git a/src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java b/src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java index ae6a24a..06a132d 100644 --- a/src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java +++ b/src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java
@@ -53,6 +53,7 @@ for (HardKeyboardDeviceInfo hardKeyboardDeviceInfo : newHardKeyboards) { if (mCachedDevice.getAddress().equals(hardKeyboardDeviceInfo.mBluetoothAddress)) { Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS); + intent.setPackage(mContext.getPackageName()); intent.putExtra( Settings.EXTRA_ENTRYPOINT, SettingsEnums.CONNECTED_DEVICES_SETTINGS); intent.putExtra(
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index b88928c..e4ad17a 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
@@ -67,6 +67,7 @@ return false; } Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS); + intent.setPackage(mContext.getPackageName()); intent.putExtra(Settings.EXTRA_ENTRYPOINT, SettingsEnums.KEYBOARD_SETTINGS); mContext.startActivity(intent); return true;
diff --git a/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java b/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java index 9343493..ddc0fea 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java +++ b/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
@@ -191,7 +191,8 @@ private Preference createUserDictionaryPreference(String locale) { final String KEY_LOCALE = "locale"; final Preference newPref = new Preference(mScreen.getContext()); - final Intent intent = new Intent(USER_DICTIONARY_SETTINGS_INTENT_ACTION); + final Intent intent = new Intent(USER_DICTIONARY_SETTINGS_INTENT_ACTION) + .setPackage(mContext.getPackageName()); if (locale == null) { newPref.setTitle(Locale.getDefault().getDisplayName()); newPref.setKey(Locale.getDefault().toString());