summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2015-07-13 23:17:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-13 23:17:04 +0000
commitcf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093 (patch)
tree6a4c83cf992e75a2e816c89e07ac1722145fd41c
parent53e5ba22c1694fad23b67d18c42c01d6deada5f6 (diff)
parent7e9cb0d094043bd8bdb7544c2356abd5479b7aee (diff)
downloadframeworks_base-cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093.zip
frameworks_base-cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093.tar.gz
frameworks_base-cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093.tar.bz2
Merge "Catch & log security exception in telephonymanager" into mnc-dev
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 89e9d2e..0bb04f8 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -4230,7 +4230,7 @@ public class TelephonyManager {
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#canChangeDtmfToneLength", e);
} catch (SecurityException e) {
- Log.w(TAG, "Permission error calling ITelephony#canChangeDtmfToneLength", e);
+ Log.e(TAG, "Permission error calling ITelephony#canChangeDtmfToneLength", e);
}
return false;
}
@@ -4248,6 +4248,8 @@ public class TelephonyManager {
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isWorldPhone", e);
+ } catch (SecurityException e) {
+ Log.e(TAG, "Permission error calling ITelephony#isWorldPhone", e);
}
return false;
}
@@ -4265,6 +4267,8 @@ public class TelephonyManager {
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isTtyModeSupported", e);
+ } catch (SecurityException e) {
+ Log.e(TAG, "Permission error calling ITelephony#isTtyModeSupported", e);
}
return false;
}
@@ -4283,6 +4287,8 @@ public class TelephonyManager {
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isHearingAidCompatibilitySupported", e);
+ } catch (SecurityException e) {
+ Log.e(TAG, "Permission error calling ITelephony#isHearingAidCompatibilitySupported", e);
}
return false;
}