diff options
| author | Stuart Scott <stuartscott@google.com> | 2015-01-14 10:49:49 -0800 |
|---|---|---|
| committer | Stuart Scott <stuartscott@google.com> | 2015-01-14 12:12:02 -0800 |
| commit | 400a3f6df20b92e639f20956301a36beb67b511b (patch) | |
| tree | 6860ed85a5dc31f6a7147fcb8c324bad81137921 /telephony/java | |
| parent | b018399a3a2762e95126acbe14397eca15bad772 (diff) | |
| download | frameworks_base-400a3f6df20b92e639f20956301a36beb67b511b.zip frameworks_base-400a3f6df20b92e639f20956301a36beb67b511b.tar.gz frameworks_base-400a3f6df20b92e639f20956301a36beb67b511b.tar.bz2 | |
Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionInfo.java | 5 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 4 |
2 files changed, 4 insertions, 5 deletions
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 */ |