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

Commit 2d496f34 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED.""" into rvc-dev am: 753bb176 

Change-Id: I5af8bbf268e6b02311cef105c3c3581fb223743d
parents b153c4dd 753bb176

api/system-current.txt

+0 −6
Original line number Diff line number Diff line
@@ -11567,7 +11567,6 @@ 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";
@@ -11585,7 +11584,6 @@ 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
@@ -11598,16 +11596,12 @@ 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/api/system-current.txt

+0 −6
Original line number Diff line number Diff line
@@ -878,7 +878,6 @@ 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";
@@ -896,7 +895,6 @@ 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
@@ -909,16 +907,12 @@ 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

+0 −6
Original line number Diff line number Diff line
@@ -1279,7 +1279,6 @@ 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";
@@ -1289,7 +1288,6 @@ public class TelephonyManager { 
     * whether the PLMN should be shown.

     * @hide

     */

    @SystemApi

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



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

     * @hide

     */

    @SystemApi

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



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

     * @hide

     */

    @SystemApi

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



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

     * @hide

     */

    @SystemApi

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



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

     * @hide

     */

    @SystemApi

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



    /**