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

Commit 371caede authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Use flatten component name for Carrier Settings activity" am: 4ebb7cca 

am: ebf790fc

Change-Id: I4e4a7da8f8b21c7bdfd5536d94433375431e9848
parents 32cdabf5 ebf790fc

telephony/java/android/telephony/CarrierConfigManager.java

+4 −14
Original line number Diff line number Diff line
@@ -1277,20 +1277,11 @@ public class CarrierConfigManager { 
    public static final String KEY_WORLD_MODE_ENABLED_BOOL = "world_mode_enabled_bool";



    /**

     * Package name of the carrier settings activity.

     * @see {@link #KEY_CARRIER_SETTINGS_ACTIVITY_CLASS_NAME_STRING}.

     * Flatten {@link android.content.ComponentName} of the carrier's settings activity.

     * @hide

     */

    public static final String KEY_CARRIER_SETTINGS_ACTIVITY_PACKAGE_NAME_STRING =

            "carrier_settings_activity_package_name_string";



    /**

     * Class name of the carrier settings activity.

     * @see {@link #KEY_CARRIER_SETTINGS_ACTIVITY_PACKAGE_NAME_STRING}.

     * @hide

     */

    public static final String KEY_CARRIER_SETTINGS_ACTIVITY_CLASS_NAME_STRING =

            "carrier_settings_activity_class_name_string";

    public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING =

            "carrier_settings_activity_component_name_string";



    // These variables are used by the MMS service and exposed through another API,

    // SmsManager. The variable names and string values are copied from there.
@@ -2637,8 +2628,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SUPPORT_TDSCDMA_BOOL, false);

        sDefaults.putStringArray(KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_WORLD_MODE_ENABLED_BOOL, false);

        sDefaults.putString(KEY_CARRIER_SETTINGS_ACTIVITY_PACKAGE_NAME_STRING, "");

        sDefaults.putString(KEY_CARRIER_SETTINGS_ACTIVITY_CLASS_NAME_STRING, "");

        sDefaults.putString(KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING, "");

        sDefaults.putBoolean(KEY_CARRIER_CONFIG_APPLIED_BOOL, false);

        sDefaults.putBoolean(KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL, false);

        sDefaults.putIntArray(KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY,