diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-07-07 23:49:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-07 23:49:47 +0000 |
| commit | 26248f8c47254089febc20a51001725bbb96aa1f (patch) | |
| tree | eb6df809e17cd6fc0a9d13893126af807308d6ce | |
| parent | bfc8fa88ee5bb6e9cdfa7d32d2fe59381a46bd8d (diff) | |
| parent | a80c0019898802dcd995c08e52d435c8b1a51487 (diff) | |
| download | platform_packages_services_Telephony-android-s-beta-4.tar.gz platform_packages_services_Telephony-android-s-beta-4.tar.bz2 platform_packages_services_Telephony-android-s-beta-4.zip | |
Merge "Only check pending emergency call if TelephonyConnectionService nonull."android-s-beta-4android-s-beta-3android-s-beta-4
| -rwxr-xr-x | src/com/android/phone/PhoneInterfaceManager.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index 8d946f598..fa52f48f2 100755 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java @@ -9638,13 +9638,7 @@ public class PhoneInterfaceManager extends ITelephony.Stub { TelephonyConnectionService service = registry.getTelephonyConnectionService(); - if (service == null) { - Log.e(LOG_TAG, "TelephonyConnectionService is null"); - thermalMitigationResult = - TelephonyManager.THERMAL_MITIGATION_RESULT_INVALID_STATE; - break; - - } else if (service.isEmergencyCallPending()) { + if (service != null && service.isEmergencyCallPending()) { Log.e(LOG_TAG, "An emergency call is pending"); thermalMitigationResult = TelephonyManager.THERMAL_MITIGATION_RESULT_INVALID_STATE; |