Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3016f335 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Store carrier app name in global settings for SIM dialog/notification"

parents 284786b9 15f5a7ef

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4177,6 +4177,7 @@ package android.provider { 
    method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String, boolean);

    method public static void resetToDefaults(android.content.ContentResolver, java.lang.String);

    field public static final java.lang.String AUTOFILL_COMPAT_ALLOWED_PACKAGES = "autofill_compat_allowed_packages";

    field public static final java.lang.String CARRIER_APP_NAMES = "carrier_app_names";

    field public static final java.lang.String CARRIER_APP_WHITELIST = "carrier_app_whitelist";

    field public static final java.lang.String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";

    field public static final java.lang.String INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT = "install_carrier_app_notification_persistent";

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -9098,6 +9098,16 @@ public final class Settings { 
        @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

        */

core/proto/android/providers/settings.proto

+2 −1
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ message GlobalSettingsProto { 
    // 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 @@ message GlobalSettingsProto { 


    // 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 {

core/res/res/values/strings.xml

+4 −3
Original line number Diff line number Diff line
@@ -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. -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />