From 6b2eddec32449d3d6f88027eb6d37e0fe0c95d13 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Tue, 17 Mar 2020 17:27:35 -0700 Subject: [PATCH 1/3] 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"; /** From c8c1919abe9f575434fe3260658cb749705648d5 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Thu, 19 Mar 2020 14:39:00 -0700 Subject: [PATCH 2/3] Un-expose LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH for R. Test: TH Bug: 147322848 Merged-in: Ie8e4842264eb47e09397c9e56355d00c732c86c1 Change-Id: Ie8e4842264eb47e09397c9e56355d00c732c86c1 (cherry picked from commit aed5beae536c914dc7e872efd3cbd15791cd4340) --- api/system-current.txt | 1 - core/res/AndroidManifest.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 71768f51aeed4..1bbef9dee66d7 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -94,7 +94,6 @@ package android { field public static final String INTERNAL_SYSTEM_WINDOW = "android.permission.INTERNAL_SYSTEM_WINDOW"; field public static final String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP"; field public static final String KILL_UID = "android.permission.KILL_UID"; - field public static final String LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = "android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"; field public static final String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS"; field public static final String LOCK_DEVICE = "android.permission.LOCK_DEVICE"; field public static final String LOOP_RADIO = "android.permission.LOOP_RADIO"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 29e4609108574..1a2dfce88fd09 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2096,7 +2096,7 @@ - From f360f2cf0586f22a59cd5a73e8f8623e67adca28 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Fri, 20 Mar 2020 14:39:06 -0700 Subject: [PATCH 3/3] Exposing TelephonyManager.isIccLockEnabled as a system API. This was recently removed as part of un-exposing telephony mainline related APIs (b/146983487), but being added back in R as GMSCore already uses it (b/151742706). Test: TH Bug: 151742706 Bug: 146983487 Merged-in: If4e8e87c7dfbb261ee3abfec2a4774980c24d0c2 Change-Id: If4e8e87c7dfbb261ee3abfec2a4774980c24d0c2 (cherry picked from commit 1c6679a3adf72fa4e2d3b8152ea3641f05b86d3e) --- api/system-current.txt | 1 + telephony/api/system-current.txt | 1 + telephony/java/android/telephony/TelephonyManager.java | 1 + 3 files changed, 3 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index 1bbef9dee66d7..d11ac28893653 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9128,6 +9128,7 @@ package android.telephony { method public boolean isDataConnectivityPossible(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled(); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean isIccLockEnabled(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled(); diff --git a/telephony/api/system-current.txt b/telephony/api/system-current.txt index 874b7033f59d0..892bd03a562e9 100644 --- a/telephony/api/system-current.txt +++ b/telephony/api/system-current.txt @@ -811,6 +811,7 @@ package android.telephony { method public boolean isDataConnectivityPossible(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled(); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean isIccLockEnabled(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 5c4b8f97ba672..74339e9833a1b 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -12895,6 +12895,7 @@ public class TelephonyManager { */ @WorkerThread @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + @SystemApi public boolean isIccLockEnabled() { try { ITelephony telephony = getITelephony();