Merge "Avoid flaky test fail due to no Subscription service." into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
5b754d0428
@@ -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;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user