Merge "Gate default with explicit flag" into main (dbe09540) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -2879,6 +2879,7 @@ public class SubscriptionManagerService extends ISub.Stub {
	* @return The subscription Id default to use.		* @return The subscription Id default to use.
	*/		*/
	private int getDefaultAsUser(@UserIdInt int userId, int defaultValue) {		private int getDefaultAsUser(@UserIdInt int userId, int defaultValue) {
			if (mFeatureFlags.workProfileApiSplit()) {
	List<SubscriptionInfoInternal> subInfos =		List<SubscriptionInfoInternal> subInfos =
	getSubscriptionInfoStreamAsUser(UserHandle.of(userId))		getSubscriptionInfoStreamAsUser(UserHandle.of(userId))
	.filter(SubscriptionInfoInternal::isActive)		.filter(SubscriptionInfoInternal::isActive)
	@@ -2886,6 +2887,7 @@ public class SubscriptionManagerService extends ISub.Stub {
	if (subInfos.size() == 1) {		if (subInfos.size() == 1) {
	return subInfos.get(0).getSubscriptionId();		return subInfos.get(0).getSubscriptionId();
	}		}
			}
	return defaultValue;		return defaultValue;
	}		}