diff options
| author | Stuart Scott <stuartscott@google.com> | 2015-01-14 21:28:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-14 21:28:54 +0000 |
| commit | a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b (patch) | |
| tree | a1c014729aee130f24ad60dccba6d48e13d575a8 | |
| parent | eec75faaa25b5da3382cf0925a65e9e6bd90fdc9 (diff) | |
| parent | 400a3f6df20b92e639f20956301a36beb67b511b (diff) | |
| download | frameworks_base-a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b.zip frameworks_base-a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b.tar.gz frameworks_base-a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b.tar.bz2 | |
Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionInfo.java | 5 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 96fccf7..3e11cda 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28619,6 +28619,7 @@ package android.telephony { method public int describeContents(); method public java.lang.CharSequence getCarrierName(); method public java.lang.String getCountryIso(); + method public int getDataRoaming(); method public java.lang.CharSequence getDisplayName(); method public java.lang.String getIccId(); method public int getIconTint(); @@ -28641,6 +28642,8 @@ package android.telephony { method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList(); method public boolean isNetworkRoaming(int); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); + field public static final int DATA_ROAMING_DISABLE = 0; // 0x0 + field public static final int DATA_ROAMING_ENABLE = 1; // 0x1 } public static class SubscriptionManager.OnSubscriptionsChangedListener { diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index f3b6910..adbe1d8 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -254,9 +254,8 @@ public class SubscriptionInfo implements Parcelable { } /** - * @return the data roaming state for this subscription, either DATA_ROAMING_ENABLE or - * DATA_ROAMING_DISABLE. - * @hide + * @return the data roaming state for this subscription, either + * {@link SubscriptionManager#DATA_ROAMING_ENABLE} or {@link SubscriptionManager#DATA_ROAMING_DISABLE}. */ public int getDataRoaming() { return this.mDataRoaming; diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 9ef6f1f..c67629d 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -226,10 +226,10 @@ public class SubscriptionManager { /** @hide */ public static final String DATA_ROAMING = "data_roaming"; - /** @hide */ + /** Indicates that data roaming is enabled for a subscription */ public static final int DATA_ROAMING_ENABLE = 1; - /** @hide */ + /** Indicates that data roaming is disabled for a subscription */ public static final int DATA_ROAMING_DISABLE = 0; /** @hide */ |