diff options
| author | Tyler Gunn <tgunn@google.com> | 2018-06-04 08:31:42 -0700 |
|---|---|---|
| committer | Tim Schumacher <timschumi@gmx.de> | 2018-08-08 22:26:58 +0200 |
| commit | a7d49fb09aafbdec6aa9e2c86e680623bd9553cd (patch) | |
| tree | 9c14cd9038585bc9d16374203990a50f731b7930 | |
| parent | 63bc67152ac3587b2b329e994a0fe47d5da30a0c (diff) | |
| download | android_packages_services_Telephony-a7d49fb09aafbdec6aa9e2c86e680623bd9553cd.tar.gz android_packages_services_Telephony-a7d49fb09aafbdec6aa9e2c86e680623bd9553cd.tar.bz2 android_packages_services_Telephony-a7d49fb09aafbdec6aa9e2c86e680623bd9553cd.zip | |
Fix potential NPE in EmergencyCallbackModeExitDialog.
Ensure NPE will not crash com.android.phone process.
Test: Manual using test app provided in bug
Bug: 79995313
Change-Id: I83a5e94acdae4287e6a62558cffb586d35930b47
Merged-In: I8b899023b0977e4a8963cc536602ced4f7e43769
(cherry picked from commit 00f0c43dc4dd37d13ef614e84492783a9a6e981b)
| -rw-r--r-- | src/com/android/phone/EmergencyCallbackModeExitDialog.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/phone/EmergencyCallbackModeExitDialog.java b/src/com/android/phone/EmergencyCallbackModeExitDialog.java index 479e3533b..299d8ba44 100644 --- a/src/com/android/phone/EmergencyCallbackModeExitDialog.java +++ b/src/com/android/phone/EmergencyCallbackModeExitDialog.java @@ -80,10 +80,11 @@ public class EmergencyCallbackModeExitDialog extends Activity implements OnCance mPhone = PhoneGlobals.getInstance().getPhoneInEcm(); // Check if phone is in Emergency Callback Mode. If not, exit. - final boolean isInEcm = Boolean.parseBoolean( - SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE)); - Log.i(TAG, "ECMModeExitDialog launched - isInEcm: " + isInEcm + " phone:" + mPhone); - if (mPhone == null || !isInEcm) { + if (mPhone == null || !mPhone.isInEcm()) { + if (mPhone == null) { + android.util.EventLog.writeEvent(0x534e4554, "79995313", -1, ""); + } + Log.i(TAG, "ECMModeExitDialog launched - isInEcm: false" + " phone:" + mPhone); finish(); return; } |