commit 070541b7cc3612a15ee81407f0849071c4ef0bfb
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Sep 21 14:48:39 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 21 14:48:39 2021 +0000
tree 04194c08b12209a3cce610e80b8fc200ac15e643
parent 28cbf97411170585ec73a80f35eef016c3e88ef9
parent fcd48d617b918e27b670a33e83958da31e53805b

Merge "Null phone check when checking if radio is off for thermal mitigation." into sc-qpr1-dev

src/com/android/services/telephony/DisconnectCauseUtil.java

diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index 9c89e9e..ffd9f63 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -792,7 +792,7 @@
 
     private static boolean isRadioOffForThermalMitigation(int phoneId) {
         Phone phone = PhoneFactory.getPhone(phoneId);
-        return phone.isRadioOffForThermalMitigation();
+        return phone == null ? false : phone.isRadioOffForThermalMitigation();
     }
 
     /**