summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-03-21 21:17:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-21 21:17:33 +0000
commit9a58d5747ad15af44730484e3660f1c0638ea285 (patch)
tree49bd15b703d94e64b81bcca545845f7e91ae8326 /core/java
parentaa3d42b12977b32cd6b1c554409755c21f9bf5d7 (diff)
parent4009110b3beb36b5d86146e5a35b26385dc39b3e (diff)
Merge "Un-expose APIs added for telephony mainline." into rvc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/Context.java1
-rw-r--r--core/java/android/telephony/TelephonyRegistryManager.java1
2 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 6f4606659c3e..413fef755209 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -5104,7 +5104,6 @@ public abstract class Context {
* {@link TelephonyRegistryManager}.
* @hide
*/
- @SystemApi
public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry";
/**
diff --git a/core/java/android/telephony/TelephonyRegistryManager.java b/core/java/android/telephony/TelephonyRegistryManager.java
index 21d16f64d2b3..0854452e6886 100644
--- a/core/java/android/telephony/TelephonyRegistryManager.java
+++ b/core/java/android/telephony/TelephonyRegistryManager.java
@@ -61,7 +61,6 @@ import java.util.concurrent.Executor;
*
* @hide
*/
-@TestApi
public class TelephonyRegistryManager {
private static final String TAG = "TelephonyRegistryManager";