Merge "Avoid flaky test fail due to no Subscription service." into main

This commit is contained in:
Treehugger Robot
2024-05-30 13:02:58 +00:00
committed by Android (Google) Code Review

View File

@@ -643,8 +643,13 @@ public class SubscriptionUtil {
final SubscriptionManager subscriptionManager = context.getSystemService( final SubscriptionManager subscriptionManager = context.getSystemService(
SubscriptionManager.class); SubscriptionManager.class);
String rawPhoneNumber = subscriptionManager.getPhoneNumber( String rawPhoneNumber = "";
try {
rawPhoneNumber = subscriptionManager.getPhoneNumber(
subscriptionInfo.getSubscriptionId()); subscriptionInfo.getSubscriptionId());
} catch (IllegalStateException e) {
Log.e(TAG, "Subscription service unavailable : " + e);
}
if (TextUtils.isEmpty(rawPhoneNumber)) { if (TextUtils.isEmpty(rawPhoneNumber)) {
return null; return null;
} }