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

Commit 012a2790 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: cd24e832

Change-Id: I9ae2b31e6dd3f4a4c575ff37b8a9df58eb2c2e70
parents 94628539 cd24e832
Loading
Loading
Loading
Loading
+12 −1
Original line number Original line Diff line number Diff line
@@ -7107,10 +7107,21 @@ public class TelephonyManager {
     * @hide
     * @hide
     */
     */
    public boolean getTetherApnRequired() {
    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 {
        try {
            ITelephony telephony = getITelephony();
            ITelephony telephony = getITelephony();
            if (telephony != null)
            if (telephony != null)
                return telephony.getTetherApnRequired();
                return telephony.getTetherApnRequiredForSubscriber(subId);
        } catch (RemoteException ex) {
        } catch (RemoteException ex) {
            Rlog.e(TAG, "hasMatchedTetherApnSetting RemoteException", ex);
            Rlog.e(TAG, "hasMatchedTetherApnSetting RemoteException", ex);
        } catch (NullPointerException ex) {
        } catch (NullPointerException ex) {
+3 −2
Original line number Original line Diff line number Diff line
@@ -788,12 +788,13 @@ interface ITelephony {
    int getPreferredNetworkType(int subId);
    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.
     * @return {@code true} if DUN APN is required for tethering.
     * @hide
     * @hide
     */
     */
    boolean getTetherApnRequired();
    boolean getTetherApnRequiredForSubscriber(int subId);


    /**
    /**
    * Enables framework IMS and triggers IMS Registration.
    * Enables framework IMS and triggers IMS Registration.