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

Merge "Protect against null ITelephony to fix crash."

Browse Source
This commit is contained in:
Andrew Lee
2015-04-03 21:24:06 +00:00
committed by Android (Google) Code Review
parent 8bd4f7b3d1 896a1e650c
commit 73576b22bc
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3982,7 +3982,10 @@ public class TelephonyManager {
*/
public boolean canChangeDtmfToneLength() {
try {
return getITelephony().canChangeDtmfToneLength();
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.canChangeDtmfToneLength();
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#canChangeDtmfToneLength", e);
}
@@ -3996,7 +3999,10 @@ public class TelephonyManager {
*/
public boolean isWorldPhone() {
try {
return getITelephony().isWorldPhone();
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.isWorldPhone();
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isWorldPhone", e);
}
@@ -4010,7 +4016,10 @@ public class TelephonyManager {
*/
public boolean isTtyModeSupported() {
try {
return getITelephony().isTtyModeSupported();
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.isTtyModeSupported();
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isTtyModeSupported", e);
}
@@ -4025,7 +4034,10 @@ public class TelephonyManager {
*/
public boolean isHearingAidCompatibilitySupported() {
try {
return getITelephony().isHearingAidCompatibilitySupported();
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.isHearingAidCompatibilitySupported();
}
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#isHearingAidCompatibilitySupported", e);
}