Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 542f4ee6 authored by Stuart Scott's avatar Stuart Scott Committed by Android Git Automerger
Browse files

am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to... 

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

* commit 'a2fa3d21':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
parents 5497e99c a2fa3d21

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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 {

























telephony/java/android/telephony/SubscriptionInfo.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -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;

































telephony/java/android/telephony/SubscriptionManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -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 */