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

Commit 9562a928 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Adding @hide API to return whether an APN is metered or not. 

In addition, make isMmsDataEnabled more generic:
isDataEnabledForApn

Bug: 128616035
Test: manual
Change-Id: Icd520c3094dd761a13435fae79b7b6b3ba2ebda9
parent 6e0668c7

telephony/java/android/telephony/TelephonyManager.java

+36 −10
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import android.telecom.PhoneAccount; 
import android.telecom.PhoneAccountHandle;

import android.telecom.TelecomManager;

import android.telephony.VisualVoicemailService.VisualVoicemailTask;

import android.telephony.data.ApnSetting;

import android.telephony.emergency.EmergencyNumber;

import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories;

import android.telephony.ims.aidl.IImsConfig;
@@ -10949,26 +10950,31 @@ public class TelephonyManager { 
        return new Pair<Integer, Integer>(-1, -1);

    }





    /**

     * Return whether MMS data is enabled. This will tell if framework will accept a MMS network

     * request on a subId.

     * Return whether data is enabled for certain APN type. This will tell if framework will accept

     * corresponding network requests on a subId.

     *

     * {@link #isDataEnabled()} is directly associated with users' Mobile data toggle on / off. If

     * {@link #isDataEnabled()} returns false, it means in general all meter-ed data are disabled.

     *

     * This per APN type API gives a better idea whether data is allowed on a specific APN type.

     * It will return true if:

     *

     *  Mms is enabled if:

     *  1) user data is turned on, or

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

     *  3) alwaysAllowMms setting {@link SubscriptionManager#setAlwaysAllowMmsData} is turned on.

     *  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 SubscriptionManager#setAlwaysAllowMmsData} is turned on.

     *

     * @return whether MMS data is allowed.

     * @return whether data is enabled for a apn type.

     *

     * @hide

     */

    public boolean isMmsDataEnabled() {

    public boolean isDataEnabledForApn(@ApnSetting.ApnType int apnType) {

        String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";

        try {

            ITelephony service = getITelephony();

            if (service != null) {

                return service.isMmsDataEnabled(getSubId(), pkgForDebug);

                return service.isDataEnabledForApn(apnType, getSubId(), pkgForDebug);

            }

        } catch (RemoteException ex) {

            if (!isSystemProcess()) {
@@ -10977,4 +10983,24 @@ public class TelephonyManager { 
        }

        return false;

    }



    /**

     * Whether an APN type is metered or not. It will be evaluated with the subId associated

     * with the TelephonyManager instance.

     *

     * @hide

     */

    public boolean isApnMetered(@ApnSetting.ApnType int apnType) {

        try {

            ITelephony service = getITelephony();

            if (service != null) {

                return service.isApnMetered(apnType, getSubId());

            }

        } catch (RemoteException ex) {

            if (!isSystemProcess()) {

                ex.rethrowAsRuntimeException();

            }

        }

        return true;

    }

}

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

+3 −1
Original line number Diff line number Diff line
@@ -1967,5 +1967,7 @@ interface ITelephony { 


    boolean isModemEnabledForSlot(int slotIndex, String callingPackage);



    boolean isMmsDataEnabled(int subId, String callingPackage);

    boolean isDataEnabledForApn(int apnType, int subId, String callingPackage);



    boolean isApnMetered(int apnType, int subId);

}