From 6b2eddec32449d3d6f88027eb6d37e0fe0c95d13 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Tue, 17 Mar 2020 17:27:35 -0700 Subject: [PATCH] Un-expose ACTION_SERVICE_PROVIDERS_UPDATED. Will be exposed/reworked on in S. Test: basic sanity Bug: 147921202 Merged-in: Iab4974f9cd7cecde1ef6eba35c320101a288b481 Change-Id: Iab4974f9cd7cecde1ef6eba35c320101a288b481 (cherry picked from commit 13a8d14fcd4e1ea9b248d186652bc379ce8fde88) --- api/system-current.txt | 6 ------ telephony/java/android/telephony/TelephonyManager.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 165599bc4461a..71768f51aeed4 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9193,7 +9193,6 @@ package android.telephony { field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE"; 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_SERVICE_PROVIDERS_UPDATED = "android.telephony.action.SERVICE_PROVIDERS_UPDATED"; 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"; field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED"; @@ -9207,19 +9206,14 @@ 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_ERROR_CODE = "errorCode"; field public static final String EXTRA_PCO_ID = "pcoId"; 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_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 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 7a55a7b815ef9..5c4b8f97ba672 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1253,7 +1253,6 @@ public class TelephonyManager { *

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"; @@ -1263,7 +1262,6 @@ public class TelephonyManager { * whether the PLMN should be shown. * @hide */ - @SystemApi public static final String EXTRA_SHOW_PLMN = "android.telephony.extra.SHOW_PLMN"; /** @@ -1271,7 +1269,6 @@ public class TelephonyManager { * the operator name of the registered network. * @hide */ - @SystemApi public static final String EXTRA_PLMN = "android.telephony.extra.PLMN"; /** @@ -1279,7 +1276,6 @@ public class TelephonyManager { * whether the PLMN should be shown. * @hide */ - @SystemApi public static final String EXTRA_SHOW_SPN = "android.telephony.extra.SHOW_SPN"; /** @@ -1287,7 +1283,6 @@ public class TelephonyManager { * the service provider name. * @hide */ - @SystemApi public static final String EXTRA_SPN = "android.telephony.extra.SPN"; /** @@ -1295,7 +1290,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"; /**