Merge "Change return value of getTetherApnRequired() to a boolean." am: 077a04828d am: 2b8bbdf659 (7c37a585) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -6931,14 +6931,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)
		@@ -6948,7 +6946,7 @@ public class TelephonyManager {
		} catch (NullPointerException ex) {
		Rlog.e(TAG, "hasMatchedTetherApnSetting NPE", ex);
		}
		return 2;
		return false;
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -721,13 +721,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.