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

Merge "Change return value of getTetherApnRequired() to a boolean."

Browse Source 
am: 077a04828d

Change-Id: I493559087fc5bd3ace8db52bf9e6e5cc576e843f
This commit is contained in:
Mark Chien
2019-03-02 23:05:19 -08:00
committed by android-build-merger
parent a0e1501981 077a04828d
commit 2b8bbdf659
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6907,14 +6907,12 @@ public class TelephonyManager {
}
/**
* Check TETHER_DUN_REQUIRED and TETHER_DUN_APN settings, net.tethering.noprovisioning
* SystemProperty to decide whether DUN APN is required for
* tethering.
* Check whether DUN APN is required for tethering.
*
* @return 0: Not required. 1: required. 2: Not set.
* @return {@code true} if DUN APN is required for tethering.
* @hide
*/
public int getTetherApnRequired() {
public boolean getTetherApnRequired() {
try {
ITelephony telephony = getITelephony();
if (telephony != null)
@@ -6924,7 +6922,7 @@ public class TelephonyManager {
} catch (NullPointerException ex) {
Rlog.e(TAG, "hasMatchedTetherApnSetting NPE", ex);
}
return 2;
return false;
}

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

@@ -700,13 +700,12 @@ interface ITelephony {
int getPreferredNetworkType(int subId);
/**
* Check TETHER_DUN_REQUIRED and TETHER_DUN_APN settings, net.tethering.noprovisioning
* SystemProperty to decide whether DUN APN is required for
* tethering.
* Check whether DUN APN is required for tethering.
*
* @return 0: Not required. 1: required. 2: Not set.
* @return {@code true} if DUN APN is required for tethering.
* @hide
*/
int getTetherApnRequired();
boolean getTetherApnRequired();
/**
* Enables framework IMS and triggers IMS Registration.