summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorShuo Qian <shuoq@google.com>2020-03-17 23:09:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-17 23:09:31 +0000
commit0d4f4e464e61cd3b998325012c9569cb35fe7232 (patch)
tree696ec0fa3b6f0ef1cf57e423d3bf7c5507b095e3 /core/java/android
parent8ad736720c5dd583ae3e8bcb33dc35099f9b3c92 (diff)
parent1e154a345c6ad62f84547ae27c70c24d2cfa0dcb (diff)
Merge "Hide several System APIs" into rvc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityManager.java2
-rw-r--r--core/java/android/telephony/PhoneStateListener.java1
2 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 6cf9b2e212ee..f4ee8faaf9bf 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -4243,8 +4243,6 @@ public class ActivityManager {
* {@code false} otherwise.
* @hide
*/
- @SystemApi
- @TestApi
@RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION)
public boolean updateMccMncConfiguration(@NonNull String mcc, @NonNull String mnc) {
if (mcc == null || mnc == null) {
diff --git a/core/java/android/telephony/PhoneStateListener.java b/core/java/android/telephony/PhoneStateListener.java
index d2735008611c..28db2708988e 100644
--- a/core/java/android/telephony/PhoneStateListener.java
+++ b/core/java/android/telephony/PhoneStateListener.java
@@ -176,7 +176,6 @@ public class PhoneStateListener {
* @hide
*/
@RequiresPermission(android.Manifest.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH)
- @SystemApi
public static final int LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = 0x00000200;
/**