diff options
| author | Stuart Scott <stuartscott@google.com> | 2015-01-14 21:40:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-14 21:40:06 +0000 |
| commit | e2b9d5b56c6b06418e85cd49afd87e0d08f57c71 (patch) | |
| tree | 9bcf71c1912205fc6dd40878134f9f5b73c281d8 /telephony | |
| parent | 31572ede1c85efccb8b876e4492f7a23a9b8e739 (diff) | |
| parent | 542f4ee61986e2a2883211f229a1b3ad23ceca81 (diff) | |
| download | frameworks_base-e2b9d5b56c6b06418e85cd49afd87e0d08f57c71.zip frameworks_base-e2b9d5b56c6b06418e85cd49afd87e0d08f57c71.tar.gz frameworks_base-e2b9d5b56c6b06418e85cd49afd87e0d08f57c71.tar.bz2 | |
am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev
* commit '542f4ee61986e2a2883211f229a1b3ad23ceca81':
Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
Diffstat (limited to 'telephony')
| -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 */ |