From 27d2115eaf85bab36d589383c3f2b932c2e1ca19 Mon Sep 17 00:00:00 2001
From: tomhsu <tomhsu@google.com>
Date: Thu, 30 May 2024 10:39:48 +0000
Subject: [PATCH] Avoid flaky test fail due to no Subscription service.

Fix: 340875634
Test: atest passed
Change-Id: Id922ace830f25dd730cad2d8aa19177988b6670d
---
 src/com/android/settings/network/SubscriptionUtil.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index ff88b1a9c33..7e3f78dde0e 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -643,8 +643,13 @@ public class SubscriptionUtil {
 
         final SubscriptionManager subscriptionManager = context.getSystemService(
                 SubscriptionManager.class);
-        String rawPhoneNumber = subscriptionManager.getPhoneNumber(
-                subscriptionInfo.getSubscriptionId());
+        String rawPhoneNumber = "";
+        try {
+            rawPhoneNumber = subscriptionManager.getPhoneNumber(
+                    subscriptionInfo.getSubscriptionId());
+        } catch (IllegalStateException e) {
+            Log.e(TAG, "Subscription service unavailable : " + e);
+        }
         if (TextUtils.isEmpty(rawPhoneNumber)) {
             return null;
         }