Merge "Fix permission check for TelephonyManager#isTtyModeSupported." am: 2052fba20a (a648cac0) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -6679,14 +6679,12 @@ public class TelephonyManager {
		@Deprecated
		public boolean isTtyModeSupported() {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		return telephony.isTtyModeSupported();
		TelecomManager telecomManager = TelecomManager.from(mContext);
		if (telecomManager != null) {
		return telecomManager.isTtySupported();
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#isTtyModeSupported", e);
		} catch (SecurityException e) {
		Log.e(TAG, "Permission error calling ITelephony#isTtyModeSupported", e);
		Log.e(TAG, "Permission error calling TelecomManager#isTtySupported", e);
		}
		return false;
		}