commit f05a1b106201ee0d32221948694359d6eb1783bf
author Gil Cukierman <cukie@google.com> Tue Mar 05 04:39:10 2024 -0500
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue May 28 22:31:01 2024 +0000
tree 5ac951fdae5d3ed91fbc08f50a337796c9f03d52
parent c21d5839ccca3cc712b07d10321115047a548bbc

Handle missing default phone

If default phones have not been created, make the receiver a no-op.

Test: atest SafetySourceReceiverTest
Bug: 325460602
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:553d5dbd17df6ae96f878c71e9bd4fe593a47b44)
Merged-In: Ic2108ccd3025a0986fa5b12067ad1906faa14193
Change-Id: Ic2108ccd3025a0986fa5b12067ad1906faa14193

src/com/android/phone/security/SafetySourceReceiver.java

diff --git a/src/com/android/phone/security/SafetySourceReceiver.java b/src/com/android/phone/security/SafetySourceReceiver.java
index d2be1a1..76f8e72 100644
--- a/src/com/android/phone/security/SafetySourceReceiver.java
+++ b/src/com/android/phone/security/SafetySourceReceiver.java
@@ -28,8 +28,10 @@
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.flags.Flags;
 import com.android.phone.PhoneGlobals;
+import com.android.telephony.Rlog;
 
 public class SafetySourceReceiver extends BroadcastReceiver {
+    private static final String TAG = "TelephonySafetySourceReceiver";
     @Override
     public void onReceive(Context context, Intent intent) {
 
@@ -72,6 +74,11 @@
 
     @VisibleForTesting
     public Phone getDefaultPhone() {
-        return PhoneGlobals.getPhone();
+        try {
+            return PhoneGlobals.getPhone();
+        } catch (IllegalStateException e) {
+            Rlog.i(TAG, "Unable to get phone. Skipping safety source refresh: " + e.getMessage());
+        }
+        return null;
     }
 }