summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorZoey Chen <zoeychen@google.com>2020-03-19 06:21:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-03-19 06:21:35 +0000
commit1859e648d618820a8f4debefd2b24facee520455 (patch)
tree636ce29e1323e1721c535275e133cc2c1419d0db /core/java/android
parent28a33a26c2f8b2bde9f71868f52e628c8a648e3a (diff)
parentc73028e9f288f039fee85c07f6366ba860a632ca (diff)
Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. - CarrierColumns"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Telephony.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index b3e22bd2a649..2217ee353e81 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -1365,7 +1365,6 @@ public final class Telephony {
* Base column for the table that contain Carrier Public key.
* @hide
*/
- @SystemApi
public interface CarrierColumns extends BaseColumns {
/**
@@ -4865,7 +4864,6 @@ public final class Telephony {
* Contains mappings between matching rules with carrier id for all carriers.
* @hide
*/
- @SystemApi
public static final class All implements BaseColumns {
/**