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

Commit 83bb093c authored by Hall Liu's avatar Hall Liu
Browse files

Add new methods for setting mobile data policy 

Add isMobileDataPolicyEnabled and setMobileDataPolicyEnabledStatus in
TelephonyManager. These are intended to replace the mms-always-allowed
and data-during-voice-call setters/getters.

Old methods will be removed in a follow up commit.
Fixes: 169367013
Test: atest TelephonyManagerTest

Change-Id: I6033a84f0a0163e460343ebf603d66078455fe38
Merged-In: I6033a84f0a0163e460343ebf603d66078455fe38
parent 9caec785

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -11237,6 +11237,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);
@@ -11265,6 +11266,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);
@@ -11311,6 +11313,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
@@ -1658,10 +1658,14 @@ package android.telephony { 
    method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);

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

    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
@@ -10119,6 +10119,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);
@@ -10147,6 +10148,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);
@@ -10193,6 +10195,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
@@ -694,6 +694,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);
@@ -722,6 +723,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);
@@ -768,6 +770,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

+95 −4
Original line number Diff line number Diff line
@@ -12938,10 +12938,101 @@ 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.













     *













     * 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.













     *













     * 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.













     *













     * 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













     */













    @SystemApi













    @TestApi













    public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2;

























    /**













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













     *













     * 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













     */













    @SystemApi













    @TestApi













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)













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













        try {













            ITelephony service = getITelephony();













            if (service != null) {













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













            }













        } catch (RemoteException ex) {













            // This could happen if binder process crashes.













            if (!isSystemProcess()) {













                ex.rethrowAsRuntimeException();













            }













        }













    }

























    /**













     * 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













     */













    @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.isMobileDataPolicyEnabled(getSubId(), policy);













            }













        } catch (RemoteException ex) {













            // This could happen if binder process crashes.













            if (!isSystemProcess()) {













                ex.rethrowAsRuntimeException();













            }













        }













        return false;













    }

























    /**















     *















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















     * disallowed.