Snap for 11355999 from 7c733b40802bc885923702e4437c120522f38b78 to 24Q2-release (60766061) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/InCallController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1932,7 +1932,8 @@ public class InCallController extends CallsManagerListenerBase implements

		// Actually try binding to the UI InCallService.
		if (inCallServiceConnection.connect(call) ==
		InCallServiceConnection.CONNECTION_SUCCEEDED \|\| call.isSelfManaged()) {
		InCallServiceConnection.CONNECTION_SUCCEEDED \|\| (call != null
		&& call.isSelfManaged())) {
		// Only connect to the non-ui InCallServices if we actually connected to the main UI
		// one, or if the call is self-managed (in which case we'd still want to keep Wear, BT,
		// etc. informed.

src/com/android/server/telecom/TelecomServiceImpl.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telecom.ICallControl;
		import com.android.internal.telecom.ICallEventCallback;
		import com.android.internal.telecom.ITelecomService;
		import com.android.internal.telephony.flags.Flags;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.server.telecom.components.UserCallIntentProcessorFactory;
		import com.android.server.telecom.flags.FeatureFlags;
		@@ -807,6 +808,13 @@ public class TelecomServiceImpl {
		// Validate the profile boundary of the given image URI.
		validateAccountIconUserBoundary(account.getIcon());

		if (mTelephonyFeatureFlags.simultaneousCallingIndications()
		&& account.hasSimultaneousCallingRestriction()) {
		validateSimultaneousCallingPackageNames(
		account.getAccountHandle().getComponentName().getPackageName(),
		account.getSimultaneousCallingRestriction());
		}

		final long token = Binder.clearCallingIdentity();
		try {
		Log.i(this, "registerPhoneAccount: account=%s",
		@@ -3292,4 +3300,20 @@ public class TelecomServiceImpl {
		}
		}
		}

		private void validateSimultaneousCallingPackageNames(String appPackageName,
		Set<PhoneAccountHandle> handles) {
		for (PhoneAccountHandle handle : handles) {
		ComponentName name = handle.getComponentName();
		if (name == null) {
		throw new IllegalArgumentException("ComponentName is null");
		}
		String restrictionPackageName = name.getPackageName();
		if (!appPackageName.equals(restrictionPackageName)) {
		throw new SecurityException("The package name of the PhoneAccount does not "
		+ "match one or more of the package names set in the simultaneous "
		+ "calling restriction.");
		}
		}
		}
		}

tests/src/com/android/server/telecom/tests/CallControlTest.java

+2 −17

Original line number	Diff line number	Diff line
		@@ -39,14 +39,7 @@ import org.mockito.MockitoAnnotations;
		import java.util.UUID;

		public class CallControlTest extends TelecomTestCase {

		private static final PhoneAccountHandle mHandle = new PhoneAccountHandle(
		new ComponentName("foo", "bar"), "1");

		@Mock
		private ICallControl mICallControl;
		@Mock
		private ClientTransactionalServiceRepository mRepository;
		@Mock private ICallControl mICallControl;
		private static final String CALL_ID_1 = UUID.randomUUID().toString();

		@Override
		@@ -64,15 +57,7 @@ public class CallControlTest extends TelecomTestCase {

		@Test
		public void testGetCallId() {
		CallControl control = new CallControl(CALL_ID_1, mICallControl, mRepository, mHandle);
		CallControl control = new CallControl(CALL_ID_1, mICallControl);
		assertEquals(CALL_ID_1, control.getCallId().toString());
		}

		@Test
		public void testCallControlHitsIllegalStateException() {
		CallControl control = new CallControl(CALL_ID_1, null, mRepository, mHandle);
		assertThrows(IllegalStateException.class, () ->
		control.setInactive(Runnable::run, result -> {
		}));
		}
		}

tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java

+59 −0

Original line number	Diff line number	Diff line
		@@ -111,7 +111,10 @@ import org.mockito.Mock;

		import java.lang.reflect.Method;
		import java.util.Collection;
		import java.util.Collections;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Set;
		import java.util.concurrent.Executor;
		import java.util.function.IntConsumer;

		@@ -844,6 +847,62 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		registerPhoneAccountTestHelper(phoneAccount, true);
		}

		@SmallTest
		@Test
		public void testRegisterPhoneAccountSimultaneousCallingVerification() throws RemoteException {
		doReturn(true).when(mTelephonyFeatureFlags).simultaneousCallingIndications();
		doReturn(PackageManager.PERMISSION_GRANTED)
		.when(mContext).checkCallingOrSelfPermission(MODIFY_PHONE_STATE);
		String packageNameToUse = "com.android.officialpackage";
		PhoneAccountHandle phHandle = new PhoneAccountHandle(new ComponentName(
		packageNameToUse, "cs"), "test", Binder.getCallingUserHandle());
		PhoneAccountHandle phAllowedRestriction = new PhoneAccountHandle(new ComponentName(
		packageNameToUse, "cs"), "test2", Binder.getCallingUserHandle());

		PhoneAccount phoneAccountEmptyRestriction = makePhoneAccount(phHandle)
		.setSimultaneousCallingRestriction(Collections.emptySet())
		.build();
		try {
		mTSIBinder.registerPhoneAccount(phoneAccountEmptyRestriction, CALLING_PACKAGE);
		verify(mFakePhoneAccountRegistrar).registerPhoneAccount(phoneAccountEmptyRestriction);
		} catch (SecurityException e) {
		fail("registerPhoneAccount must not throw a SecurityException if there is a "
		+ " restriction registered with the same package name.");
		}

		Set<PhoneAccountHandle> restriction = new HashSet<>(3);
		restriction.add(phAllowedRestriction);
		PhoneAccount phoneAccount = makePhoneAccount(phHandle)
		.setSimultaneousCallingRestriction(restriction)
		.build();

		try {
		mTSIBinder.registerPhoneAccount(phoneAccount, CALLING_PACKAGE);
		verify(mFakePhoneAccountRegistrar).registerPhoneAccount(phoneAccount);
		} catch (SecurityException e) {
		fail("registerPhoneAccount must not throw a SecurityException if there is a "
		+ " restriction registered with the same package name.");
		}

		String anotherPackageName = "com.android.anotherpackage";
		PhoneAccountHandle phDisallowedRestriction = new PhoneAccountHandle(new ComponentName(
		anotherPackageName, "cs"), "test", Binder.getCallingUserHandle());
		restriction.add(phDisallowedRestriction);
		phoneAccount = makePhoneAccount(phHandle)
		.setSimultaneousCallingRestriction(restriction)
		.build();

		try {
		mTSIBinder.registerPhoneAccount(phoneAccount, CALLING_PACKAGE);
		// there should not be another call to registerPhoneAccount
		verify(mFakePhoneAccountRegistrar, times(1)).registerPhoneAccount(phoneAccount);
		fail("registerPhoneAccount must throw a SecurityException if there is a "
		+ " restriction registered with a different package name.");
		} catch (SecurityException e) {
		//expected
		}
		}

		@SmallTest
		@Test
		public void testRegisterPhoneAccountWithoutPermissionAnomalyReported() throws RemoteException {