Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 012a279038

Change-Id: I5e3aac3d3181aaae02e5568923154cd89f427380
This commit is contained in:
Amit Mahajan
2019-03-26 16:48:14 -07:00
committed by android-build-merger
parent d619ec0d0e 012a279038
commit 59a2a726bc
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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) {

5
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

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