Store carrier app name in global settings for SIM dialog/notification
Bug: 70042722
Test: Manual QA
Change-Id: If3e97e90a37ac4e585a64c21ddfe234259cd0813
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 09f637e..0442c9c 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9098,6 +9098,16 @@
@SystemApi
public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";
+ /**
+ * Map of package name to application names. Package names must be lower cased as they are
+ * used as a key in the map. The application names cannot and will not be localized.
+ *
+ * The value is "packageName1:appName1;packageName2:appName2;..."
+ * @hide
+ */
+ @SystemApi
+ public static final String CARRIER_APP_NAMES = "carrier_app_names";
+
/**
* USB Mass Storage Enabled
*/
diff --git a/core/proto/android/providers/settings.proto b/core/proto/android/providers/settings.proto
index 3ea0879..9752d3b 100644
--- a/core/proto/android/providers/settings.proto
+++ b/core/proto/android/providers/settings.proto
@@ -183,6 +183,7 @@
// prompt the user for install when a SIM card with matching UICC carrier privilege rules is
// inserted.
optional SettingProto carrier_app_whitelist = 116 [ (android.privacy).dest = DEST_AUTOMATIC ];
+ optional SettingProto carrier_app_names = 358 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto usb_mass_storage_enabled = 117 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto use_google_mail = 118 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto webview_data_reduction_proxy_key = 119;
@@ -434,7 +435,7 @@
// Please insert fields in the same order as in
// frameworks/base/core/java/android/provider/Settings.java.
- // Next tag = 358;
+ // Next tag = 359;
}
message SecureSettingsProto {
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index cadc3ff..5c9f863 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3204,9 +3204,10 @@
<string name="sim_restart_button">Restart</string>
<!-- See Carrier_App_Dialog. This is the message of that dialog. -->
<string name="install_carrier_app_notification_title">Activate mobile service</string>
- <string name="install_carrier_app_notification_text">
- Download the carrier app to activate your new SIM
- </string>
+ <!-- Notification message that shows when the user inserts a SIM card that requires a carrier app download, but the app name is unknown -->
+ <string name="install_carrier_app_notification_text">Download the carrier app to activate your new SIM</string>
+ <!-- Notification message that shows when the user inserts a SIM card that requires a carrier app download. App name is known -->
+ <string name="install_carrier_app_notification_text_app_name">Download the <xliff:g id="app_name">%1$s</xliff:g> app to activate your new SIM</string>
<!-- See Carrier_App_Notification. This is the button of that dialog. -->
<string name="install_carrier_app_notification_button">Download app</string>
<!-- See carrier_app_notification. This is the headline. -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index a2af57e..a6a3663 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2774,6 +2774,7 @@
<java-symbol type="string" name="install_carrier_app_notification_title" />
<java-symbol type="string" name="install_carrier_app_notification_text" />
+ <java-symbol type="string" name="install_carrier_app_notification_text_app_name" />
<java-symbol type="string" name="install_carrier_app_notification_button" />
<java-symbol type="string" name="carrier_app_notification_title" />
<java-symbol type="string" name="carrier_app_notification_text" />
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index bba8c1a..be2c235 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -155,6 +155,7 @@
Settings.Global.CAPTIVE_PORTAL_USER_AGENT,
Settings.Global.CAR_DOCK_SOUND,
Settings.Global.CARRIER_APP_WHITELIST,
+ Settings.Global.CARRIER_APP_NAMES,
Settings.Global.CAR_UNDOCK_SOUND,
Settings.Global.CDMA_CELL_BROADCAST_SMS,
Settings.Global.CDMA_ROAMING_MODE,