diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-06-05 18:24:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-05 18:24:05 +0000 |
| commit | 48cf298cb8ded48dbec8e977412815e61953b74f (patch) | |
| tree | f83367abdd3beec9db95dfdd55bc60c81ae350c1 | |
| parent | b1e0438ce316c95df2f08864f0c773d46f3f5e51 (diff) | |
| parent | 3ed641f65c3060205e304e8a0d13e88cc72d0af4 (diff) | |
| download | frameworks_base-48cf298cb8ded48dbec8e977412815e61953b74f.zip frameworks_base-48cf298cb8ded48dbec8e977412815e61953b74f.tar.gz frameworks_base-48cf298cb8ded48dbec8e977412815e61953b74f.tar.bz2 | |
Merge "Change to hide BEARER_BITMASK." into mnc-dev
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 7da4090..1d445cf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26919,8 +26919,7 @@ package android.provider { public static final class Telephony.Carriers implements android.provider.BaseColumns { field public static final java.lang.String APN = "apn"; field public static final java.lang.String AUTH_TYPE = "authtype"; - field public static final deprecated java.lang.String BEARER = "bearer"; - field public static final java.lang.String BEARER_BITMASK = "bearer_bitmask"; + field public static final java.lang.String BEARER = "bearer"; field public static final java.lang.String CARRIER_ENABLED = "carrier_enabled"; field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String CURRENT = "current"; diff --git a/api/system-current.txt b/api/system-current.txt index 319ad00..ae4bae6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28952,8 +28952,7 @@ package android.provider { public static final class Telephony.Carriers implements android.provider.BaseColumns { field public static final java.lang.String APN = "apn"; field public static final java.lang.String AUTH_TYPE = "authtype"; - field public static final deprecated java.lang.String BEARER = "bearer"; - field public static final java.lang.String BEARER_BITMASK = "bearer_bitmask"; + field public static final java.lang.String BEARER = "bearer"; field public static final java.lang.String CARRIER_ENABLED = "carrier_enabled"; field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String CURRENT = "current"; |