commit c35fc38be96909d17350b5e3c60df7d760508f9c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 28 07:30:14 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 28 07:30:14 2024 +0000
tree 1a13dc2a240a6ad79bc4cecc85cdc01a64d35e87
parent 9ab22c28fb2581ff592d39a46114bf6be6436256
parent eea96db6da62e1100afe3e6b76e118d3c8a664be

Merge "Fix the keyboard shows up problem" into main

src/com/android/settings/MonitoringCertInfoActivity.java

diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
index 4225d72..f3abecc 100644
--- a/src/com/android/settings/MonitoringCertInfoActivity.java
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -117,6 +117,7 @@
     @Override
     public void onClick(DialogInterface dialog, int which) {
         Intent intent = new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
+        intent.setPackage(getPackageName());
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
         intent.putExtra(TrustedCredentialsSettings.ARG_SHOW_NEW_FOR_USER, mUserId);
         startActivity(intent);

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

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(

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

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;

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

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());

src/com/android/settings/security/CredentialStorage.java

diff --git a/src/com/android/settings/security/CredentialStorage.java b/src/com/android/settings/security/CredentialStorage.java
index ea33631..e663fe7 100644
--- a/src/com/android/settings/security/CredentialStorage.java
+++ b/src/com/android/settings/security/CredentialStorage.java
@@ -139,6 +139,7 @@
             }
 
             final Intent installIntent = new Intent(ACTION_INSTALL)
+                    .setPackage(getPackageName())
                     .setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
                     .putExtras(bundle);
             startActivityAsUser(installIntent, new UserHandle(dstUserId));

src/com/android/settings/security/InstallCaCertificateWarning.java

diff --git a/src/com/android/settings/security/InstallCaCertificateWarning.java b/src/com/android/settings/security/InstallCaCertificateWarning.java
index 3335fe6..b4f57ee 100644
--- a/src/com/android/settings/security/InstallCaCertificateWarning.java
+++ b/src/com/android/settings/security/InstallCaCertificateWarning.java
@@ -41,6 +41,8 @@
  */
 public class InstallCaCertificateWarning extends Activity {
 
+    private static final String CERT_INSTALLER_PACKAGE_NAME = "com.android.certinstaller";
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -79,6 +81,7 @@
         return v -> {
             final Intent intent = new Intent();
             intent.setAction(Credentials.INSTALL_ACTION);
+            intent.setPackage(CERT_INSTALLER_PACKAGE_NAME);
             intent.putExtra(Credentials.EXTRA_CERTIFICATE_USAGE, Credentials.CERTIFICATE_USAGE_CA);
             startActivity(intent);
             finish();