Merge cherrypicks of [19370567, 19774786] into security-aosp-sc-v2-release. (249c797a) · Commits · e / os / android_packages_services_Telecomm

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

+15 −4

Original line number	Diff line number	Diff line
		@@ -2071,6 +2071,16 @@ public class CallsManager extends Call.ListenerBase
		boolean endEarly = false;
		String disconnectReason = "";
		String callRedirectionApp = mRoleManagerAdapter.getDefaultCallRedirectionApp();
		PhoneAccount phoneAccount = mPhoneAccountRegistrar
		.getPhoneAccountUnchecked(phoneAccountHandle);
		if (phoneAccount != null
		&& !phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_MULTI_USER)) {
		// Check if the phoneAccountHandle belongs to the current user
		if (phoneAccountHandle != null &&
		!phoneAccountHandle.getUserHandle().equals(mCurrentUserHandle)) {
		phoneAccountHandle = null;
		}
		}

		boolean isPotentialEmergencyNumber;
		try {
		@@ -2105,9 +2115,9 @@ public class CallsManager extends Call.ListenerBase
		endEarly = true;
		disconnectReason = "Null handle from Call Redirection Service";
		} else if (phoneAccountHandle == null) {
		Log.w(this, "onCallRedirectionComplete: phoneAccountHandle is null");
		Log.w(this, "onCallRedirectionComplete: phoneAccountHandle is unavailable");
		endEarly = true;
		disconnectReason = "Null phoneAccountHandle from Call Redirection Service";
		disconnectReason = "Unavailable phoneAccountHandle from Call Redirection Service";
		} else if (isPotentialEmergencyNumber) {
		Log.w(this, "onCallRedirectionComplete: emergency number %s is redirected from Call"
		+ " Redirection Service", handle.getSchemeSpecificPart());
		@@ -2128,6 +2138,7 @@ public class CallsManager extends Call.ListenerBase
		return;
		}

		final PhoneAccountHandle finalPhoneAccountHandle = phoneAccountHandle;
		if (uiAction.equals(CallRedirectionProcessor.UI_TYPE_USER_DEFINED_ASK_FOR_CONFIRM)) {
		Log.addEvent(call, LogUtils.Events.REDIRECTION_USER_CONFIRMATION);
		mPendingRedirectedOutgoingCall = call;
		@@ -2137,7 +2148,7 @@ public class CallsManager extends Call.ListenerBase
		@Override
		public void loggedRun() {
		Log.addEvent(call, LogUtils.Events.REDIRECTION_USER_CONFIRMED);
		call.setTargetPhoneAccount(phoneAccountHandle);
		call.setTargetPhoneAccount(finalPhoneAccountHandle);
		placeOutgoingCall(call, handle, gatewayInfo, speakerphoneOn,
		videoState);
		}
		@@ -2147,7 +2158,7 @@ public class CallsManager extends Call.ListenerBase
		new Runnable("CM.oCRC", mLock) {
		@Override
		public void loggedRun() {
		call.setTargetPhoneAccount(phoneAccountHandle);
		call.setTargetPhoneAccount(finalPhoneAccountHandle);
		placeOutgoingCall(call, handle, null, speakerphoneOn,
		videoState);
		}

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

+28 −22

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import android.content.Intent;
		import android.content.PermissionChecker;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ParceledListSlice;
		import android.content.pm.ResolveInfo;
		import android.net.Uri;
		import android.os.Binder;
		@@ -190,25 +191,26 @@ public class TelecomServiceImpl {
		}

		@Override
		public List<PhoneAccountHandle> getCallCapablePhoneAccounts(
		public ParceledListSlice<PhoneAccountHandle> getCallCapablePhoneAccounts(
		boolean includeDisabledAccounts, String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.gCCPA");
		if (includeDisabledAccounts &&
		!canReadPrivilegedPhoneState(
		callingPackage, "getCallCapablePhoneAccounts")) {
		return Collections.emptyList();
		return ParceledListSlice.emptyList();
		}
		if (!canReadPhoneState(callingPackage, callingFeatureId,
		"getCallCapablePhoneAccounts")) {
		return Collections.emptyList();
		return ParceledListSlice.emptyList();
		}
		synchronized (mLock) {
		final UserHandle callingUserHandle = Binder.getCallingUserHandle();
		long token = Binder.clearCallingIdentity();
		try {
		return mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null,
		includeDisabledAccounts, callingUserHandle);
		return new ParceledListSlice<>(
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null,
		includeDisabledAccounts, callingUserHandle));
		} catch (Exception e) {
		Log.e(this, e, "getCallCapablePhoneAccounts");
		throw e;
		@@ -222,8 +224,8 @@ public class TelecomServiceImpl {
		}

		@Override
		public List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage,
		String callingFeatureId) {
		public ParceledListSlice<PhoneAccountHandle> getSelfManagedPhoneAccounts(
		String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.gSMPA");
		if (!canReadPhoneState(callingPackage, callingFeatureId,
		@@ -234,8 +236,8 @@ public class TelecomServiceImpl {
		final UserHandle callingUserHandle = Binder.getCallingUserHandle();
		long token = Binder.clearCallingIdentity();
		try {
		return mPhoneAccountRegistrar.getSelfManagedPhoneAccounts(
		callingUserHandle);
		return new ParceledListSlice<>(mPhoneAccountRegistrar
		.getSelfManagedPhoneAccounts(callingUserHandle));
		} catch (Exception e) {
		Log.e(this, e, "getSelfManagedPhoneAccounts");
		throw e;
		@@ -249,8 +251,8 @@ public class TelecomServiceImpl {
		}

		@Override
		public List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(String uriScheme,
		String callingPackage) {
		public ParceledListSlice<PhoneAccountHandle> getPhoneAccountsSupportingScheme(
		String uriScheme, String callingPackage) {
		try {
		Log.startSession("TSI.gPASS");
		try {
		@@ -259,15 +261,16 @@ public class TelecomServiceImpl {
		} catch (SecurityException e) {
		EventLog.writeEvent(0x534e4554, "62347125", Binder.getCallingUid(),
		"getPhoneAccountsSupportingScheme: " + callingPackage);
		return Collections.emptyList();
		return ParceledListSlice.emptyList();
		}

		synchronized (mLock) {
		final UserHandle callingUserHandle = Binder.getCallingUserHandle();
		long token = Binder.clearCallingIdentity();
		try {
		return mPhoneAccountRegistrar.getCallCapablePhoneAccounts(uriScheme, false,
		callingUserHandle);
		return new ParceledListSlice<>(mPhoneAccountRegistrar
		.getCallCapablePhoneAccounts(uriScheme, false,
		callingUserHandle));
		} catch (Exception e) {
		Log.e(this, e, "getPhoneAccountsSupportingScheme %s", uriScheme);
		throw e;
		@@ -281,7 +284,8 @@ public class TelecomServiceImpl {
		}

		@Override
		public List<PhoneAccountHandle> getPhoneAccountsForPackage(String packageName) {
		public ParceledListSlice<PhoneAccountHandle> getPhoneAccountsForPackage(
		String packageName) {
		//TODO: Deprecate this in S
		try {
		enforceCallingPackage(packageName, "getPhoneAccountsForPackage");
		@@ -304,8 +308,8 @@ public class TelecomServiceImpl {
		long token = Binder.clearCallingIdentity();
		try {
		Log.startSession("TSI.gPAFP");
		return mPhoneAccountRegistrar.getPhoneAccountsForPackage(packageName,
		callingUserHandle);
		return new ParceledListSlice<>(mPhoneAccountRegistrar
		.getPhoneAccountsForPackage(packageName, callingUserHandle));
		} catch (Exception e) {
		Log.e(this, e, "getPhoneAccountsForPackage %s", packageName);
		throw e;
		@@ -375,7 +379,7 @@ public class TelecomServiceImpl {
		synchronized (mLock) {
		try {
		// This list is pre-filtered for the calling user.
		return getAllPhoneAccounts().size();
		return getAllPhoneAccounts().getList().size();
		} catch (Exception e) {
		Log.e(this, e, "getAllPhoneAccountsCount");
		throw e;
		@@ -388,7 +392,7 @@ public class TelecomServiceImpl {
		}

		@Override
		public List<PhoneAccount> getAllPhoneAccounts() {
		public ParceledListSlice<PhoneAccount> getAllPhoneAccounts() {
		synchronized (mLock) {
		try {
		Log.startSession("TSI.gAPA");
		@@ -404,7 +408,8 @@ public class TelecomServiceImpl {
		final UserHandle callingUserHandle = Binder.getCallingUserHandle();
		long token = Binder.clearCallingIdentity();
		try {
		return mPhoneAccountRegistrar.getAllPhoneAccounts(callingUserHandle);
		return new ParceledListSlice<>(mPhoneAccountRegistrar
		.getAllPhoneAccounts(callingUserHandle));
		} catch (Exception e) {
		Log.e(this, e, "getAllPhoneAccounts");
		throw e;
		@@ -418,7 +423,7 @@ public class TelecomServiceImpl {
		}

		@Override
		public List<PhoneAccountHandle> getAllPhoneAccountHandles() {
		public ParceledListSlice<PhoneAccountHandle> getAllPhoneAccountHandles() {
		try {
		Log.startSession("TSI.gAPAH");
		try {
		@@ -434,7 +439,8 @@ public class TelecomServiceImpl {
		final UserHandle callingUserHandle = Binder.getCallingUserHandle();
		long token = Binder.clearCallingIdentity();
		try {
		return mPhoneAccountRegistrar.getAllPhoneAccountHandles(callingUserHandle);
		return new ParceledListSlice<>(mPhoneAccountRegistrar
		.getAllPhoneAccountHandles(callingUserHandle));
		} catch (Exception e) {
		Log.e(this, e, "getAllPhoneAccounts");
		throw e;

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

+23 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.reset;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.timeout;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		@@ -57,7 +56,7 @@ import android.os.UserHandle;
		import android.telecom.CallerInfo;
		import android.telecom.Connection;
		import android.telecom.DisconnectCause;
		import android.telecom.Log;
		import android.telecom.GatewayInfo;
		import android.telecom.PhoneAccount;
		import android.telecom.PhoneAccountHandle;
		import android.telecom.TelecomManager;
		@@ -77,7 +76,6 @@ import com.android.server.telecom.CallDiagnosticServiceController;
		import com.android.server.telecom.CallState;
		import com.android.server.telecom.CallerInfoLookupHelper;
		import com.android.server.telecom.CallsManager;
		import com.android.server.telecom.CallsManagerListenerBase;
		import com.android.server.telecom.ClockProxy;
		import com.android.server.telecom.ConnectionServiceFocusManager;
		import com.android.server.telecom.ConnectionServiceFocusManager.ConnectionServiceFocusManagerFactory;
		@@ -133,8 +131,12 @@ import java.util.concurrent.TimeUnit;
		@RunWith(JUnit4.class)
		public class CallsManagerTest extends TelecomTestCase {
		private static final int TEST_TIMEOUT = 5000; // milliseconds
		private static final int SECONDARY_USER_ID = 12;
		private static final PhoneAccountHandle SIM_1_HANDLE = new PhoneAccountHandle(
		ComponentName.unflattenFromString("com.foo/.Blah"), "Sim1");
		private static final PhoneAccountHandle SIM_1_HANDLE_SECONDARY = new PhoneAccountHandle(
		ComponentName.unflattenFromString("com.foo/.Blah"), "Sim1",
		new UserHandle(SECONDARY_USER_ID));
		private static final PhoneAccountHandle SIM_2_HANDLE = new PhoneAccountHandle(
		ComponentName.unflattenFromString("com.foo/.Blah"), "Sim2");
		private static final PhoneAccountHandle CONNECTION_MGR_1_HANDLE = new PhoneAccountHandle(
		@@ -1625,6 +1627,24 @@ public class CallsManagerTest extends TelecomTestCase {
		verify(callSpy, never()).setDisconnectCause(any(DisconnectCause.class));
		}


		@SmallTest
		@Test
		public void testCrossUserCallRedirectionEndEarlyForIncapablePhoneAccount() {
		when(mPhoneAccountRegistrar.getPhoneAccountUnchecked(eq(SIM_1_HANDLE_SECONDARY)))
		.thenReturn(SIM_1_ACCOUNT);
		mCallsManager.onUserSwitch(UserHandle.SYSTEM);

		Call callSpy = addSpyCall(CallState.NEW);
		mCallsManager.onCallRedirectionComplete(callSpy, TEST_ADDRESS, SIM_1_HANDLE_SECONDARY,
		new GatewayInfo("foo", TEST_ADDRESS2, TEST_ADDRESS), true /* speakerphoneOn */,
		VideoProfile.STATE_AUDIO_ONLY, false /* shouldCancelCall /, "" / uiAction */);

		ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
		verify(callSpy).disconnect(argumentCaptor.capture());
		assertTrue(argumentCaptor.getValue().contains("Unavailable phoneAccountHandle"));
		}

		private Call addSpyCall() {
		return addSpyCall(SIM_2_HANDLE, CallState.ACTIVE);
		}

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

+11 −7

Original line number	Diff line number	Diff line
		@@ -395,9 +395,11 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);

		assertEquals(fullPHList,
		mTSIBinder.getCallCapablePhoneAccounts(true, DEFAULT_DIALER_PACKAGE, null));
		mTSIBinder.getCallCapablePhoneAccounts(
		true, DEFAULT_DIALER_PACKAGE, null).getList());
		assertEquals(smallPHList,
		mTSIBinder.getCallCapablePhoneAccounts(false, DEFAULT_DIALER_PACKAGE, null));
		mTSIBinder.getCallCapablePhoneAccounts(
		false, DEFAULT_DIALER_PACKAGE, null).getList());
		}

		@SmallTest
		@@ -412,7 +414,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {

		List<PhoneAccountHandle> result = null;
		try {
		result = mTSIBinder.getCallCapablePhoneAccounts(true, "", null);
		result = mTSIBinder.getCallCapablePhoneAccounts(true, "", null).getList();
		} catch (SecurityException e) {
		// intended behavior
		}
		@@ -440,9 +442,11 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);

		assertEquals(telPHList,
		mTSIBinder.getPhoneAccountsSupportingScheme("tel", DEFAULT_DIALER_PACKAGE));
		mTSIBinder.getPhoneAccountsSupportingScheme(
		"tel", DEFAULT_DIALER_PACKAGE).getList());
		assertEquals(sipPHList,
		mTSIBinder.getPhoneAccountsSupportingScheme("sip", DEFAULT_DIALER_PACKAGE));
		mTSIBinder.getPhoneAccountsSupportingScheme(
		"sip", DEFAULT_DIALER_PACKAGE).getList());
		}

		@SmallTest
		@@ -458,7 +462,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);
		assertEquals(phoneAccountHandleList,
		mTSIBinder.getPhoneAccountsForPackage(
		TEL_PA_HANDLE_16.getComponentName().getPackageName()));
		TEL_PA_HANDLE_16.getComponentName().getPackageName()).getList());
		}

		@SmallTest
		@@ -487,7 +491,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		when(mFakePhoneAccountRegistrar.getAllPhoneAccounts(any(UserHandle.class)))
		.thenReturn(phoneAccountList);

		assertEquals(2, mTSIBinder.getAllPhoneAccounts().size());
		assertEquals(2, mTSIBinder.getAllPhoneAccounts().getList().size());
		}

		@SmallTest