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

Commit 9260c0ea authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Revert "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED."" into... 

Merge "Merge "Revert "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED."" into rvc-dev am: 26d48541 am: 6f7f7c71" into rvc-d1-dev-plus-aosp am: cf63f4b0

Change-Id: Ibd6dae535af782b2adaf1f601ffef44a3d9d68dd
parents df4b87bc cf63f4b0

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -11565,6 +11565,7 @@ package android.telephony { 
    field public static final String ACTION_EMERGENCY_CALLBACK_MODE_CHANGED = "android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED";

    field public static final String ACTION_EMERGENCY_CALL_STATE_CHANGED = "android.intent.action.EMERGENCY_CALL_STATE_CHANGED";

    field public static final String ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE = "com.android.omadm.service.CONFIGURATION_UPDATE";

    field public static final String ACTION_SERVICE_PROVIDERS_UPDATED = "android.telephony.action.SERVICE_PROVIDERS_UPDATED";

    field public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS = "android.telephony.action.SHOW_NOTICE_ECM_BLOCK_OTHERS";

    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";

    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";
@@ -11582,6 +11583,7 @@ package android.telephony { 
    field public static final String EXTRA_APN_PROTOCOL_INT = "apnProtoInt";

    field @Deprecated public static final String EXTRA_APN_TYPE = "apnType";

    field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt";

    field public static final String EXTRA_DATA_SPN = "android.telephony.extra.DATA_SPN";

    field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable";

    field public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE = "android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";

    field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4; // 0x4
@@ -11594,12 +11596,16 @@ package android.telephony { 
    field public static final String EXTRA_PCO_VALUE = "pcoValue";

    field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE";

    field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL";

    field public static final String EXTRA_PLMN = "android.telephony.extra.PLMN";

    field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";

    field public static final String EXTRA_SHOW_PLMN = "android.telephony.extra.SHOW_PLMN";

    field public static final String EXTRA_SHOW_SPN = "android.telephony.extra.SHOW_SPN";

    field public static final String EXTRA_SIM_COMBINATION_NAMES = "android.telephony.extra.SIM_COMBINATION_NAMES";

    field public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE = "android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";

    field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA = 1; // 0x1

    field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE = 0; // 0x0

    field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";

    field public static final String EXTRA_SPN = "android.telephony.extra.SPN";

    field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";

    field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";

    field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff

telephony/java/android/telephony/TelephonyManager.java

+6 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,7 @@ public class TelephonyManager { 
     * <p>Note: this is a protected intent that can only be sent by the system.

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_SERVICE_PROVIDERS_UPDATED =

            "android.telephony.action.SERVICE_PROVIDERS_UPDATED";
@@ -1288,6 +1289,7 @@ public class TelephonyManager { 
     * whether the PLMN should be shown.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SHOW_PLMN = "android.telephony.extra.SHOW_PLMN";



    /**
@@ -1295,6 +1297,7 @@ public class TelephonyManager { 
     * the operator name of the registered network.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PLMN = "android.telephony.extra.PLMN";



    /**
@@ -1302,6 +1305,7 @@ public class TelephonyManager { 
     * whether the PLMN should be shown.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SHOW_SPN = "android.telephony.extra.SHOW_SPN";



    /**
@@ -1309,6 +1313,7 @@ public class TelephonyManager { 
     * the service provider name.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SPN = "android.telephony.extra.SPN";



    /**
@@ -1316,6 +1321,7 @@ public class TelephonyManager { 
     * the service provider name for data service.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_DATA_SPN = "android.telephony.extra.DATA_SPN";



    /**