Merge "[Safer intents] Input method" into main

src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java

@@ -53,6 +53,7 @@ public class KeyboardSettingsPreferenceController extends BasePreferenceControll
         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(

src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java

@@ -67,6 +67,7 @@ public class PhysicalKeyboardPreferenceController extends AbstractPreferenceCont
             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;

src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java

@@ -191,7 +191,8 @@ public class UserDictionaryListPreferenceController extends BasePreferenceContro
     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());