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

am: cd24e832e8

Change-Id: I9ae2b31e6dd3f4a4c575ff37b8a9df58eb2c2e70
This commit is contained in:
Amit Mahajan
2019-03-26 15:45:52 -07:00
committed by android-build-merger
2 changed files with 15 additions and 3 deletions

View File

@@ -7107,10 +7107,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) {

View File

@@ -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.