Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev

Browse Source 
* commit 'cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093':
  Catch & log security exception in telephonymanager
This commit is contained in:
Roshan Pius
2015-07-13 23:31:19 +00:00
committed by Android Git Automerger
parent 66eb1ad11e cf01fd0f12
commit 2ce65bddb5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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;
}