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

Commit 95f616da authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Device could not use wifi hotspot when data card switch to sim2" am:... 

Merge "Device could not use wifi hotspot when data card switch to sim2" am: cd24e832 am: 012a2790
am: 59a2a726

Change-Id: I23f5c047f63fa585a49c5daf935931e0dec92ef5
parents 02aefee5 59a2a726

telephony/java/android/telephony/TelephonyManager.java

+12 −1
Original line number Diff line number Diff line
@@ -7197,10 +7197,21 @@ public class TelephonyManager { 
     * @hide

     */

    public boolean getTetherApnRequired() {

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

    }



    /**

     * Check whether DUN APN is required for tethering with subId.

     *

     * @param subId the id of the subscription to require tethering.

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

     * @hide

     */

    public boolean getTetherApnRequired(int subId) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.getTetherApnRequired();

                return telephony.getTetherApnRequiredForSubscriber(subId);

        } catch (RemoteException ex) {

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

        } catch (NullPointerException ex) {

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

+3 −2
Original line number Diff line number Diff line
@@ -788,12 +788,13 @@ interface ITelephony { 
    int getPreferredNetworkType(int subId);



    /**

     * Check whether DUN APN is required for tethering.

     * Check whether DUN APN is required for tethering with subId.

     *

     * @param subId the id of the subscription to require tethering.

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

     * @hide

     */

    boolean getTetherApnRequired();

    boolean getTetherApnRequiredForSubscriber(int subId);



    /**

    * Enables framework IMS and triggers IMS Registration.