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

Commit 876b4742 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29032944']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29032944'] into sparse-12301355-L56800030006212796.
SPARSE_CHANGE: I7d1c61a337346979504c09ec47d4f81f98e19d7d

Change-Id: I53feb2dbcb4bf16b52a82770e3d67e509dd8f663
parents 96150ed2 500d89c6

telephony/java/android/telephony/TelephonyManager.java

+12 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ import com.android.internal.telephony.OperatorInfo; 
import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.flags.Flags;

import com.android.internal.telephony.util.TelephonyUtils;

import com.android.telephony.Rlog;















import java.io.IOException;










@@ -9975,6 +9976,7 @@ public class TelephonyManager {













            ALLOWED_NETWORK_TYPES_REASON_POWER,















            ALLOWED_NETWORK_TYPES_REASON_CARRIER,















            ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G,













            ALLOWED_NETWORK_TYPES_REASON_TEST,















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface AllowedNetworkTypesReason {










@@ -10012,6 +10014,14 @@ public class TelephonyManager {













    @SystemApi















    public static final int ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G = 3;



























    /**













     * To indicate allowed network type change is requested by Testing purpose, should be default to













     * {@link #getAllNetworkTypesBitmask} when done testing.













     *













     * @hide













     */













    public static final int ALLOWED_NETWORK_TYPES_REASON_TEST = 4;



























    /**















     * Set the allowed network types of the device and provide the reason triggering the allowed















     * network change.










@@ -10118,6 +10128,8 @@ public class TelephonyManager {













            case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER:















            case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G:















                return true;













            case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_TEST:













                return TelephonyUtils.IS_DEBUGGABLE;















        }















        return false;















    }