diff options
| author | Roshan Pius <rpius@google.com> | 2015-07-13 23:31:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 23:31:19 +0000 |
| commit | 2ce65bddb50ecd376cc4eafdc9853b6bf50ac970 (patch) | |
| tree | d7858d040a0e6fe6f994415c11f6b035524bd4e3 /telephony | |
| parent | 66eb1ad11ecf8e33d2511d3a3b113429cccb7a72 (diff) | |
| parent | cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093 (diff) | |
| download | frameworks_base-2ce65bddb50ecd376cc4eafdc9853b6bf50ac970.zip frameworks_base-2ce65bddb50ecd376cc4eafdc9853b6bf50ac970.tar.gz frameworks_base-2ce65bddb50ecd376cc4eafdc9853b6bf50ac970.tar.bz2 | |
am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev
* commit 'cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093':
Catch & log security exception in telephonymanager
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c1440c8..a8066d8 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; } |