Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev

Browse Source
This commit is contained in:
Stuart Scott
2015-01-14 21:28:53 +00:00
committed by Android (Google) Code Review
parent eec75faaa2 400a3f6df2
commit a2fa3d219b
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -28619,6 +28619,7 @@ package android.telephony {
method public int describeContents(); method public int describeContents();
method public java.lang.CharSequence getCarrierName(); method public java.lang.CharSequence getCarrierName();
method public java.lang.String getCountryIso(); method public java.lang.String getCountryIso();
method public int getDataRoaming();
method public java.lang.CharSequence getDisplayName(); method public java.lang.CharSequence getDisplayName();
method public java.lang.String getIccId(); method public java.lang.String getIccId();
method public int getIconTint(); method public int getIconTint();
@@ -28641,6 +28642,8 @@ package android.telephony {
method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList(); method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
method public boolean isNetworkRoaming(int); method public boolean isNetworkRoaming(int);
method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); 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 { public static class SubscriptionManager.OnSubscriptionsChangedListener {

5
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -254,9 +254,8 @@ public class SubscriptionInfo implements Parcelable {
} }
/** /**
* @return the data roaming state for this subscription, either DATA_ROAMING_ENABLE or * @return the data roaming state for this subscription, either
* DATA_ROAMING_DISABLE. * {@link SubscriptionManager#DATA_ROAMING_ENABLE} or {@link SubscriptionManager#DATA_ROAMING_DISABLE}.
* @hide
*/ */
public int getDataRoaming() { public int getDataRoaming() {
return this.mDataRoaming; return this.mDataRoaming;

4
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -226,10 +226,10 @@ public class SubscriptionManager {
/** @hide */ /** @hide */
public static final String DATA_ROAMING = "data_roaming"; 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; 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; public static final int DATA_ROAMING_DISABLE = 0;
/** @hide */ /** @hide */