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

Commit 9c2fe01d authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev am: 4edcb527 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9f17a7f09fd073b1770d020622402d80da11186
parents eeee775f 4edcb527

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11807,7 +11807,7 @@ package android.telephony { 
    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 @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult setIccLockEnabled(boolean, @NonNull String);

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

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

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

    method public int setNrDualConnectivityState(int);

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

telephony/java/android/telephony/TelephonyManager.java

+4 −4
Original line number Diff line number Diff line
@@ -14242,7 +14242,7 @@ public class TelephonyManager { 
     * 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}.

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

     * @hide

     */

    @SystemApi
@@ -14256,7 +14256,7 @@ public class TelephonyManager { 
     * 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}.

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

     * @hide

     */

    @SystemApi
@@ -14284,11 +14284,11 @@ public class TelephonyManager { 
     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

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

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

        try {

            ITelephony service = getITelephony();

            if (service != null) {

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

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

            }

        } catch (RemoteException ex) {

            // This could happen if binder process crashes.

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −1
Original line number Diff line number Diff line
@@ -2172,7 +2172,7 @@ interface ITelephony { 
     */

    String getMmsUAProfUrl(int subId);



    void setMobileDataPolicyEnabledStatus(int subscriptionId, int policy, boolean enabled);

    void setMobileDataPolicyEnabled(int subscriptionId, int policy, boolean enabled);



    boolean isMobileDataPolicyEnabled(int subscriptionId, int policy);