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

Commit 526abec2 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "telephonymanager-data-policy" 

* changes:
  Remove old methods for mobile data
  Add new methods for setting mobile data policy
parents b38b1d31 9d30001a

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -11554,6 +11554,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean isIccLockEnabled();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMobileDataPolicyEnabled(int);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);
@@ -11584,6 +11585,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
@@ -11634,6 +11636,8 @@ package android.telephony { 
    field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff

    field public static final int KEY_TYPE_EPDG = 1; // 0x1

    field public static final int KEY_TYPE_WLAN = 2; // 0x2

    field public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1; // 0x1

    field public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2; // 0x2

    field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L

    field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L

    field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -4269,11 +4269,13 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();

    method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMobileDataPolicyEnabled(int);

    method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();

    method @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public void resetOtaEmergencyNumberDbFilePath();

    method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);

    method public void setCarrierTestOverride(String, String, String, String, String, String, String, String, String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>);

    method @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor);
@@ -4282,6 +4284,8 @@ package android.telephony { 
    field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0

    field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff

    field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff

    field public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1; // 0x1

    field public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2; // 0x2

    field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff

  }

non-updatable-api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -10413,6 +10413,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean isIccLockEnabled();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMobileDataPolicyEnabled(int);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);
@@ -10443,6 +10444,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
@@ -10493,6 +10495,8 @@ package android.telephony { 
    field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff

    field public static final int KEY_TYPE_EPDG = 1; // 0x1

    field public static final int KEY_TYPE_WLAN = 2; // 0x2

    field public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1; // 0x1

    field public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2; // 0x2

    field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L

    field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L

    field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L

telephony/api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean isIccLockEnabled();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMobileDataPolicyEnabled(int);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);
@@ -757,6 +758,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
@@ -807,6 +809,8 @@ package android.telephony { 
    field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff

    field public static final int KEY_TYPE_EPDG = 1; // 0x1

    field public static final int KEY_TYPE_WLAN = 2; // 0x2

    field public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1; // 0x1

    field public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2; // 0x2

    field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L

    field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L

    field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L

telephony/java/android/telephony/TelephonyManager.java

+55 −44
Original line number Diff line number Diff line
@@ -12808,7 +12808,7 @@ public class TelephonyManager { 
     *  1) User data is turned on, or

     *  2) APN is un-metered for this subscription, or

     *  3) APN type is whitelisted. E.g. MMS is whitelisted if

     *  {@link #setAlwaysAllowMmsData(boolean)} is turned on.

     *  {@link #MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED} is enabled.

     *

     * @param apnType Value indicating the apn type. Apn types are defined in {@link ApnSetting}.

     * @return whether data is enabled for a apn type.
@@ -13285,54 +13285,66 @@ public class TelephonyManager { 
    }















    /**













     * Set allowing mobile data during voice call. This is used for allowing data on the non-default













     * data SIM. When a voice call is placed on the non-default data SIM on DSDS devices, users will













     * not be able to use mobile data. By calling this API, data will be temporarily enabled on the













     * non-default data SIM during the life cycle of the voice call.













     * Controls whether mobile data  on the non-default SIM is allowed during a voice call.















     *













     * @param allow {@code true} if allowing using data during voice call, {@code false} if













     * disallowed.













     * This is used for allowing data on the non-default data SIM when a voice call is placed on













     * the non-default data SIM on DSDS devices. If this policy is disabled, users will not be able













     * to use mobile data via the non-default data SIM during the call, which may mean no mobile













     * data at all since some modem implementations disallow mobile data via the default data SIM













     * during voice calls.













     * If this policy is enabled, data will be temporarily enabled on the non-default data SIM













     * during any voice calls.















     *













     * @return {@code true} if operation is successful. otherwise {@code false}.













     * This policy can be enabled and disabled via {@link #setMobileDataPolicyEnabledStatus}.













     * @hide













     */













    @SystemApi













    @TestApi













    public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1;

























    /**













     * Controls whether MMS messages bypass the user-specified "mobile data" toggle.















     *













     * @throws SecurityException if the caller doesn't have the permission.













     * When enabled, requests for connections to the MMS APN will be accepted by telephony even if













     * the user has turned "mobile data" off on this specific sim card. {@link #isDataEnabledForApn}













     * will also return true for {@link ApnSetting#TYPE_MMS}.













     * When disabled, the MMS APN will be governed by the same rules as all other APNs.















     *













     * This policy can be enabled and disabled via {@link #setMobileDataPolicyEnabledStatus}.















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)













    public boolean setDataAllowedDuringVoiceCall(boolean allow) {













        try {













            ITelephony service = getITelephony();













            if (service != null) {













                return service.setDataAllowedDuringVoiceCall(getSubId(), allow);













            }













        } catch (RemoteException ex) {













            // This could happen if binder process crashes.













            if (!isSystemProcess()) {













                ex.rethrowAsRuntimeException();













            }













        }













        return false;













    }













    @SystemApi













    @TestApi













    public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2;





























    /**













     * Check whether data is allowed during voice call. This is used for allowing data on the













     * non-default data SIM. When a voice call is placed on the non-default data SIM on DSDS













     * devices, users will not be able to use mobile data. By calling this API, data will be













     * temporarily enabled on the non-default data SIM during the life cycle of the voice call.













     *













     * @return {@code true} if data is allowed during voice call.













     * @hide













     */













    @IntDef(prefix = { "MOBILE_DATA_POLICY_" }, value = {













            MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,













            MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED,













    })













    @Retention(RetentionPolicy.SOURCE)













    public @interface MobileDataPolicy { }

























    /**













     * Enables or disables a piece of mobile data policy.















     *













     * @throws SecurityException if the caller doesn't have the permission.













     * Enables or disables the mobile data policy specified in {@code policy}. See the detailed













     * description of each policy constant for what they do.















     *













     * @param policy The data policy to enable.













     * @param enabled Whether to enable or disable the policy.















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    public boolean isDataAllowedInVoiceCall() {













    @SystemApi













    @TestApi













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)













    public void setMobileDataPolicyEnabledStatus(@MobileDataPolicy int policy, boolean enabled) {















        try {















            ITelephony service = getITelephony();















            if (service != null) {













                return service.isDataAllowedInVoiceCall(getSubId());













                service.setMobileDataPolicyEnabledStatus(getSubId(), policy, enabled);















            }















        } catch (RemoteException ex) {















            // This could happen if binder process crashes.









@@ -13340,27 +13352,26 @@ public class TelephonyManager {













                ex.rethrowAsRuntimeException();















            }















        }













        return false;















    }





























    /**













     * Set whether the specific sim card always allows MMS connection. If true, MMS network













     * request will be accepted by telephony even if user turns "mobile data" off













     * on this specific sim card.













     *













     * @param alwaysAllow whether Mms data is always allowed.













     * @return whether operation is successful.













     * Fetches the status of a piece of mobile data policy.















     *













     * @param policy The data policy that you want the status for.













     * @return {@code true} if enabled, {@code false} otherwise.















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)













    public boolean setAlwaysAllowMmsData(boolean alwaysAllow) {













    @SystemApi













    @TestApi













    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    public boolean isMobileDataPolicyEnabled(@MobileDataPolicy int policy) {















        try {















            ITelephony service = getITelephony();















            if (service != null) {













                return service.setAlwaysAllowMmsData(getSubId(), alwaysAllow);













                return service.isMobileDataPolicyEnabled(getSubId(), policy);















            }















        } catch (RemoteException ex) {













            // This could happen if binder process crashes.















            if (!isSystemProcess()) {















                ex.rethrowAsRuntimeException();















            }