diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-07-01 18:04:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 18:04:37 +0000 |
| commit | b6045cb8e0e55db00f7938925d4b6767da1bb5b0 (patch) | |
| tree | 11e7871ab69d089ee13381bb2a11f9857e8fa271 | |
| parent | 1f9d5a0950256403b4070bb890ec68342c2950b5 (diff) | |
| parent | 6ce5d68a58f10a3eb0caa64a1c37b09ba012e6b6 (diff) | |
| download | frameworks_base-b6045cb8e0e55db00f7938925d4b6767da1bb5b0.zip frameworks_base-b6045cb8e0e55db00f7938925d4b6767da1bb5b0.tar.gz frameworks_base-b6045cb8e0e55db00f7938925d4b6767da1bb5b0.tar.bz2 | |
Merge "Catch SecurityExceptions" into mnc-dev
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index ab2a98d..671f42a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4157,6 +4157,8 @@ 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); } return false; } |