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

Commit a571f9b8 authored by SongFerngWang's avatar SongFerngWang
Browse files

[mainline] Expose getTetherApnRequired API as system API 

1. getTetherApnRequired API rename to isTetherApnRequired.
2. Expose isTetherApnRequired API as system API.

Bug: 142365448
Test: Build pass.
      atest TetheringConfigurationTest (PASS)

Change-Id: Iafb2e4fbddb0251e23673742d990ad098a8ae375
parent da28d60c

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8458,6 +8458,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);

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

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

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

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

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

    method public boolean needsOtaServiceProvisioning();

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ 


             - TYPE_ETHERNET (9) is prepended to this list, and



             - the return value of TelephonyManager.getTetherApnRequired()

             - the return value of TelephonyManager.isTetherApnRequired()

               determines how the array is further modified:



                   * TRUE (DUN REQUIRED).

packages/Tethering/src/com/android/server/connectivity/tethering/TetheringConfiguration.java

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ public class TetheringConfiguration { 
    /** Check whether dun is required. */

    public static boolean checkDunRequired(Context ctx, int id) {

        final TelephonyManager tm = (TelephonyManager) ctx.getSystemService(TELEPHONY_SERVICE);

        return (tm != null) ? tm.getTetherApnRequired(id) : false;

        return (tm != null) ? tm.isTetherApnRequired(id) : false;

    }



    private static Collection<Integer> getUpstreamIfaceTypes(Resources res, boolean dunRequired) {

packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringConfigurationTest.java

+5 −5
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public class TetheringConfigurationTest { 


    @Test

    public void testDunFromTelephonyManagerMeansDun() {

        when(mTelephonyManager.getTetherApnRequired(anyInt())).thenReturn(true);

        when(mTelephonyManager.isTetherApnRequired(anyInt())).thenReturn(true);



        final TetheringConfiguration cfgWifi = getTetheringConfiguration(TYPE_WIFI);

        final TetheringConfiguration cfgMobileWifiHipri = getTetheringConfiguration(
@@ -169,7 +169,7 @@ public class TetheringConfigurationTest { 


    @Test

    public void testDunNotRequiredFromTelephonyManagerMeansNoDun() {

        when(mTelephonyManager.getTetherApnRequired(anyInt())).thenReturn(false);

        when(mTelephonyManager.isTetherApnRequired(anyInt())).thenReturn(false);



        final TetheringConfiguration cfgWifi = getTetheringConfiguration(TYPE_WIFI);

        final TetheringConfiguration cfgMobileWifiHipri = getTetheringConfiguration(
@@ -212,7 +212,7 @@ public class TetheringConfigurationTest { 
    @Test

    public void testNoDefinedUpstreamTypesAddsEthernet() {

        when(mResources.getIntArray(config_tether_upstream_types)).thenReturn(new int[]{});

        when(mTelephonyManager.getTetherApnRequired(anyInt())).thenReturn(false);

        when(mTelephonyManager.isTetherApnRequired(anyInt())).thenReturn(false);



        final TetheringConfiguration cfg = new TetheringConfiguration(

                mMockContext, mLog, INVALID_SUBSCRIPTION_ID);
@@ -235,7 +235,7 @@ public class TetheringConfigurationTest { 
    public void testDefinedUpstreamTypesSansEthernetAddsEthernet() {

        when(mResources.getIntArray(config_tether_upstream_types)).thenReturn(

                new int[]{TYPE_WIFI, TYPE_MOBILE_HIPRI});

        when(mTelephonyManager.getTetherApnRequired(anyInt())).thenReturn(false);

        when(mTelephonyManager.isTetherApnRequired(anyInt())).thenReturn(false);



        final TetheringConfiguration cfg = new TetheringConfiguration(

                mMockContext, mLog, INVALID_SUBSCRIPTION_ID);
@@ -253,7 +253,7 @@ public class TetheringConfigurationTest { 
    public void testDefinedUpstreamTypesWithEthernetDoesNotAddEthernet() {

        when(mResources.getIntArray(config_tether_upstream_types))

                .thenReturn(new int[]{TYPE_WIFI, TYPE_ETHERNET, TYPE_MOBILE_HIPRI});

        when(mTelephonyManager.getTetherApnRequired(anyInt())).thenReturn(false);

        when(mTelephonyManager.isTetherApnRequired(anyInt())).thenReturn(false);



        final TetheringConfiguration cfg = new TetheringConfiguration(

                mMockContext, mLog, INVALID_SUBSCRIPTION_ID);

telephony/java/android/telephony/TelephonyManager.java

+8 −4
Original line number Diff line number Diff line
@@ -7756,12 +7756,16 @@ public class TelephonyManager { 


    /**

     * Check whether DUN APN is required for tethering.

     * <p>

     * Requires Permission: READ_PRIVILEGED_PHONE_STATE.

     *

     * @return {@code true} if DUN APN is required for tethering.

     * @hide

     */

    public boolean getTetherApnRequired() {

        return getTetherApnRequired(getSubId(SubscriptionManager.getActiveDataSubscriptionId()));

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @SystemApi

    public boolean isTetherApnRequired() {

        return isTetherApnRequired(getSubId(SubscriptionManager.getActiveDataSubscriptionId()));

    }



    /**
@@ -7771,11 +7775,11 @@ public class TelephonyManager { 
     * @return {@code true} if DUN APN is required for tethering.

     * @hide

     */

    public boolean getTetherApnRequired(int subId) {

    public boolean isTetherApnRequired(int subId) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.getTetherApnRequiredForSubscriber(subId);

                return telephony.isTetherApnRequiredForSubscriber(subId);

        } catch (RemoteException ex) {

            Rlog.e(TAG, "hasMatchedTetherApnSetting RemoteException", ex);

        } catch (NullPointerException ex) {