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

Commit 7b56ebfe authored by Rambo Wang's avatar Rambo Wang Committed by Android (Google) Code Review
Browse files

Merge "Introduce activity action to launch Reset mobile network settings" into main

parents a91b70c1 4d4097eb

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45682,6 +45682,7 @@ package android.telephony { 
    field public static final String ACTION_MULTI_SIM_CONFIG_CHANGED = "android.telephony.action.MULTI_SIM_CONFIG_CHANGED";

    field public static final String ACTION_NETWORK_COUNTRY_CHANGED = "android.telephony.action.NETWORK_COUNTRY_CHANGED";

    field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";

    field @FlaggedApi("com.android.internal.telephony.flags.reset_mobile_network_settings") public static final String ACTION_RESET_MOBILE_NETWORK_SETTINGS = "android.telephony.action.RESET_MOBILE_NETWORK_SETTINGS";

    field public static final String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

    field public static final String ACTION_SECRET_CODE = "android.telephony.action.SECRET_CODE";

    field public static final String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";

telephony/java/android/telephony/TelephonyManager.java

+14 −0
Original line number Diff line number Diff line
@@ -2115,6 +2115,20 @@ public class TelephonyManager { 
    public static final String ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE =

            "com.android.omadm.service.CONFIGURATION_UPDATE";













    /**













     * Activity action: Show setting to reset mobile networks.













     *













     * <p>On devices with a settings activity to reset mobile networks, the activity should be













     * launched without additional permissions.













     *













     * <p>On some devices, this settings activity may not exist. Callers should ensure that this













     * case is appropriately handled.













     */













    @FlaggedApi(Flags.FLAG_RESET_MOBILE_NETWORK_SETTINGS)













    @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_RESET_MOBILE_NETWORK_SETTINGS =













            "android.telephony.action.RESET_MOBILE_NETWORK_SETTINGS";



























    //















    //















    // Device Info