Merge "Fix disableGroup" into main (51a2da4b) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -4278,9 +4278,10 @@ public class SubscriptionManagerService extends ISub.Stub {
		*/
		@VisibleForTesting
		public void updateGroupDisabled() {
		List<SubscriptionInfoInternal> activeSubscriptions = mSubscriptionDatabaseManager
		List<SubscriptionInfo> activeSubscriptions = mSubscriptionDatabaseManager
		.getAllSubscriptions().stream()
		.filter(SubscriptionInfoInternal::isActive)
		.map(SubscriptionInfoInternal::toSubscriptionInfo)
		.collect(Collectors.toList());
		for (SubscriptionInfo oppSubInfo : getOpportunisticSubscriptions(
		mContext.getOpPackageName(), mContext.getFeatureId())) {

+13 −1

Original line number	Diff line number	Diff line
		@@ -2957,7 +2957,6 @@ public class SubscriptionManagerServiceTest extends TelephonyTest {
		assertThat(subInfo.getNativeAccessRules()).isEqualTo(new byte[]{});
		}


		@Test
		public void testGetActiveSubscriptionInfoListNoSecurityException() {
		// Grant MODIFY_PHONE_STATE permission for insertion.
		@@ -2983,4 +2982,17 @@ public class SubscriptionManagerServiceTest extends TelephonyTest {
		assertThat(mSubscriptionManagerServiceUT.getActiveSubscriptionInfoList(
		CALLING_PACKAGE, CALLING_FEATURE, true)).isEmpty();
		}

		@Test
		public void testUpdateGroupDisabled() {
		insertSubscription(FAKE_SUBSCRIPTION_INFO1);
		insertSubscription(new SubscriptionInfoInternal
		.Builder(FAKE_SUBSCRIPTION_INFO2).setGroupUuid(FAKE_UUID1).build());

		mSubscriptionManagerServiceUT.updateGroupDisabled();

		SubscriptionInfoInternal subInfo = mSubscriptionManagerServiceUT
		.getSubscriptionInfoInternal(2);
		assertThat(subInfo.isGroupDisabled()).isFalse();
		}
		}