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

Commit 5aa44a6c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up 24Q3 aconfig flag reset_mobile_network_settings" into main

parents 1764de92 4a6f6efc

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -46367,7 +46367,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_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

+0 −1
Original line number Diff line number Diff line
@@ -2127,7 +2127,6 @@ public class TelephonyManager { 
     * <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";