Merge "Clean up shouldHideSubscription API" am: b85117c432 (4c7c5de9) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SubscriptionController.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -2301,17 +2301,18 @@ public class SubscriptionController extends ISub.Stub {
		return allSubs;
		}

		private boolean isInvisibleSubscription(int subId) {
		private boolean isSubscriptionVisible(int subId) {
		for (SubscriptionInfo info : mCacheOpportunisticSubInfoList) {
		if (info.getSubscriptionId() == subId) {
		return SubscriptionManager.isInvisibleSubscription(info);
		// If group UUID is null, it's stand alone opportunistic profile. So it's visible.
		// otherwise, it's bundled opportunistic profile, and is not visible.
		return info.getGroupUuid() == null;
		}
		}

		return false;
		return true;
		}


		/**
		* @return the list of subId's that are active, is never null but the length maybe 0.
		*/
		@@ -2321,7 +2322,7 @@ public class SubscriptionController extends ISub.Stub {

		if (visibleOnly) {
		// Grouped opportunistic subscriptions should be hidden.
		allSubs = allSubs.stream().filter(subId -> !isInvisibleSubscription(subId))
		allSubs = allSubs.stream().filter(subId -> isSubscriptionVisible(subId))
		.collect(Collectors.toList());
		}