commit fcd48d617b918e27b670a33e83958da31e53805b
author Jack Nudelman <jacknudelman@google.com> Mon Aug 09 20:13:49 2021 +0000
committer Jack Nudelman <jacknudelman@google.com> Wed Aug 11 12:29:23 2021 +0000
tree 68020b000f2edd15e4849303302af29a7c493bed
parent 21c63f1b2669940bb65db592b40cbf50876b5347

Null phone check when checking if radio is off for thermal mitigation.

Bug: 193858761
Test: https://android-build.googleplex.com/builds/abtd/run/L07000000950619836 and attempt to reproduce

Change-Id: I52a57517cf2f13200f5421d5bbfe2fff9da424da

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();
     }
 
     /**