Merge changes from topic "featureOpTelecom2" (c8aaee05) · Commits · e / os / android_packages_services_Telecomm

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

+42 −31

Original line number	Diff line number	Diff line
		@@ -108,11 +108,12 @@ public class TelecomServiceImpl {
		private final ITelecomService.Stub mBinderImpl = new ITelecomService.Stub() {
		@Override
		public PhoneAccountHandle getDefaultOutgoingPhoneAccount(String uriScheme,
		String callingPackage) {
		String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.gDOPA");
		synchronized (mLock) {
		if (!canReadPhoneState(callingPackage, "getDefaultOutgoingPhoneAccount")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId,
		"getDefaultOutgoingPhoneAccount")) {
		return null;
		}

		@@ -179,7 +180,7 @@ public class TelecomServiceImpl {

		@Override
		public List<PhoneAccountHandle> getCallCapablePhoneAccounts(
		boolean includeDisabledAccounts, String callingPackage) {
		boolean includeDisabledAccounts, String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.gCCPA");
		if (includeDisabledAccounts &&
		@@ -187,7 +188,8 @@ public class TelecomServiceImpl {
		callingPackage, "getCallCapablePhoneAccounts")) {
		return Collections.emptyList();
		}
		if (!canReadPhoneState(callingPackage, "getCallCapablePhoneAccounts")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId,
		"getCallCapablePhoneAccounts")) {
		return Collections.emptyList();
		}
		synchronized (mLock) {
		@@ -209,10 +211,12 @@ public class TelecomServiceImpl {
		}

		@Override
		public List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage) {
		public List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage,
		String callingFeatureId) {
		try {
		Log.startSession("TSI.gSMPA");
		if (!canReadPhoneState(callingPackage, "Requires READ_PHONE_STATE permission.")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId,
		"Requires READ_PHONE_STATE permission.")) {
		throw new SecurityException("Requires READ_PHONE_STATE permission.");
		}
		synchronized (mLock) {
		@@ -551,11 +555,11 @@ public class TelecomServiceImpl {
		*/
		@Override
		public boolean isVoiceMailNumber(PhoneAccountHandle accountHandle, String number,
		String callingPackage) {
		String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.iVMN");
		synchronized (mLock) {
		if (!canReadPhoneState(callingPackage, "isVoiceMailNumber")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId, "isVoiceMailNumber")) {
		return false;
		}
		final UserHandle callingUserHandle = Binder.getCallingUserHandle();
		@@ -583,10 +587,11 @@ public class TelecomServiceImpl {
		* @see android.telecom.TelecomManager#getVoiceMailNumber
		*/
		@Override
		public String getVoiceMailNumber(PhoneAccountHandle accountHandle, String callingPackage) {
		public String getVoiceMailNumber(PhoneAccountHandle accountHandle, String callingPackage,
		String callingFeatureId) {
		try {
		Log.startSession("TSI.gVMN");
		if (!canReadPhoneState(callingPackage, "getVoiceMailNumber")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId, "getVoiceMailNumber")) {
		return null;
		}
		try {
		@@ -618,10 +623,11 @@ public class TelecomServiceImpl {
		* @see android.telecom.TelecomManager#getLine1Number
		*/
		@Override
		public String getLine1Number(PhoneAccountHandle accountHandle, String callingPackage) {
		public String getLine1Number(PhoneAccountHandle accountHandle, String callingPackage,
		String callingFeatureId) {
		try {
		Log.startSession("getL1N");
		if (!canReadPhoneState(callingPackage, "getLine1Number")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId, "getLine1Number")) {
		return null;
		}

		@@ -772,10 +778,10 @@ public class TelecomServiceImpl {
		* @see android.telecom.TelecomManager#isInCall
		*/
		@Override
		public boolean isInCall(String callingPackage) {
		public boolean isInCall(String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.iIC");
		if (!canReadPhoneState(callingPackage, "isInCall")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId, "isInCall")) {
		return false;
		}

		@@ -791,10 +797,10 @@ public class TelecomServiceImpl {
		* @see android.telecom.TelecomManager#isInManagedCall
		*/
		@Override
		public boolean isInManagedCall(String callingPackage) {
		public boolean isInManagedCall(String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.iIMC");
		if (!canReadPhoneState(callingPackage, "isInManagedCall")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId, "isInManagedCall")) {
		throw new SecurityException("Only the default dialer or caller with " +
		"READ_PHONE_STATE permission can use this method.");
		}
		@@ -925,10 +931,11 @@ public class TelecomServiceImpl {
		* @see android.telecom.TelecomManager#showInCallScreen
		*/
		@Override
		public void showInCallScreen(boolean showDialpad, String callingPackage) {
		public void showInCallScreen(boolean showDialpad, String callingPackage,
		String callingFeatureId) {
		try {
		Log.startSession("TSI.sICS");
		if (!canReadPhoneState(callingPackage, "showInCallScreen")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId, "showInCallScreen")) {
		return;
		}

		@@ -1074,10 +1081,10 @@ public class TelecomServiceImpl {
		* @see android.telecom.TelecomManager#isTtySupported
		*/
		@Override
		public boolean isTtySupported(String callingPackage) {
		public boolean isTtySupported(String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.iTS");
		if (!canReadPhoneState(callingPackage, "isTtySupported")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId, "isTtySupported")) {
		throw new SecurityException("Only default dialer or an app with" +
		"READ_PRIVILEGED_PHONE_STATE or READ_PHONE_STATE can call this api");
		}
		@@ -1094,10 +1101,10 @@ public class TelecomServiceImpl {
		* @see android.telecom.TelecomManager#getCurrentTtyMode
		*/
		@Override
		public int getCurrentTtyMode(String callingPackage) {
		public int getCurrentTtyMode(String callingPackage, String callingFeatureId) {
		try {
		Log.startSession("TSI.gCTM");
		if (!canReadPhoneState(callingPackage, "getCurrentTtyMode")) {
		if (!canReadPhoneState(callingPackage, callingFeatureId, "getCurrentTtyMode")) {
		return TelecomManager.TTY_MODE_OFF;
		}

		@@ -1277,7 +1284,8 @@ public class TelecomServiceImpl {
		* @see android.telecom.TelecomManager#placeCall
		*/
		@Override
		public void placeCall(Uri handle, Bundle extras, String callingPackage) {
		public void placeCall(Uri handle, Bundle extras, String callingPackage,
		String callingFeatureId) {
		try {
		Log.startSession("TSI.pC");
		enforceCallingPackage(callingPackage);
		@@ -1299,14 +1307,14 @@ public class TelecomServiceImpl {

		if (!callingPackage.equals(
		phoneAccountHandle.getComponentName().getPackageName())
		&& !canCallPhone(callingPackage,
		&& !canCallPhone(callingPackage, callingFeatureId,
		"CALL_PHONE permission required to place calls.")) {
		// The caller is not allowed to place calls, so we want to ensure that it
		// can only place calls through itself.
		throw new SecurityException("Self-managed ConnectionServices can only "
		+ "place calls through their own ConnectionService.");
		}
		} else if (!canCallPhone(callingPackage, "placeCall")) {
		} else if (!canCallPhone(callingPackage, callingFeatureId, "placeCall")) {
		throw new SecurityException("Package " + callingPackage
		+ " is not allowed to place phone calls");
		}
		@@ -1319,7 +1327,8 @@ public class TelecomServiceImpl {
		// by {@link UserCallIntentProcessor}.

		final boolean hasCallAppOp = mAppOpsManager.noteOp(AppOpsManager.OP_CALL_PHONE,
		Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED;
		Binder.getCallingUid(), callingPackage, callingFeatureId, null)
		== AppOpsManager.MODE_ALLOWED;

		final boolean hasCallPermission = mContext.checkCallingPermission(CALL_PHONE) ==
		PackageManager.PERMISSION_GRANTED;
		@@ -2008,7 +2017,8 @@ public class TelecomServiceImpl {
		throw new SecurityException(message + ": Only shell user can call it");
		}

		private boolean canReadPhoneState(String callingPackage, String message) {
		private boolean canReadPhoneState(String callingPackage, String callingFeatureId,
		String message) {
		// The system/default dialer can always read phone state - so that emergency calls will
		// still work.
		if (isPrivilegedDialerCalling(callingPackage)) {
		@@ -2025,8 +2035,8 @@ public class TelecomServiceImpl {
		mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, message);

		// Some apps that have the permission can be restricted via app ops.
		return mAppOpsManager.noteOp(AppOpsManager.OP_READ_PHONE_STATE,
		Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED;
		return mAppOpsManager.noteOp(AppOpsManager.OP_READ_PHONE_STATE, Binder.getCallingUid(),
		callingPackage, callingFeatureId, message) == AppOpsManager.MODE_ALLOWED;
		}
		}

		@@ -2063,7 +2073,7 @@ public class TelecomServiceImpl {
		return false;
		}

		private boolean canCallPhone(String callingPackage, String message) {
		private boolean canCallPhone(String callingPackage, String callingFeatureId, String message) {
		// The system/default dialer can always read phone state - so that emergency calls will
		// still work.
		if (isPrivilegedDialerCalling(callingPackage)) {
		@@ -2075,7 +2085,8 @@ public class TelecomServiceImpl {

		// Some apps that have the permission can be restricted via app ops.
		return mAppOpsManager.noteOp(AppOpsManager.OP_CALL_PHONE,
		Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED;
		Binder.getCallingUid(), callingPackage, callingFeatureId, message)
		== AppOpsManager.MODE_ALLOWED;
		}

		private boolean isCallerSimCallManager(PhoneAccountHandle targetPhoneAccount) {

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

+29 −25

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

		PhoneAccountHandle returnedHandleTel
		= mTSIBinder.getDefaultOutgoingPhoneAccount("tel", DEFAULT_DIALER_PACKAGE);
		= mTSIBinder.getDefaultOutgoingPhoneAccount("tel", DEFAULT_DIALER_PACKAGE, null);
		assertEquals(TEL_PA_HANDLE_16, returnedHandleTel);

		PhoneAccountHandle returnedHandleSip
		= mTSIBinder.getDefaultOutgoingPhoneAccount("sip", DEFAULT_DIALER_PACKAGE);
		= mTSIBinder.getDefaultOutgoingPhoneAccount("sip", DEFAULT_DIALER_PACKAGE, null);
		assertEquals(SIP_PA_HANDLE_17, returnedHandleSip);
		}

		@@ -269,13 +269,14 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		.thenReturn(TEL_PA_HANDLE_16);
		when(mFakePhoneAccountRegistrar.getPhoneAccountUnchecked(TEL_PA_HANDLE_16)).thenReturn(
		makePhoneAccount(TEL_PA_HANDLE_16).build());
		when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_READ_PHONE_STATE), anyInt(), anyString()))
		when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_READ_PHONE_STATE), anyInt(), anyString(),
		nullable(String.class), nullable(String.class)))
		.thenReturn(AppOpsManager.MODE_IGNORED);
		doThrow(new SecurityException()).when(mContext)
		.enforceCallingOrSelfPermission(eq(READ_PRIVILEGED_PHONE_STATE), anyString());

		PhoneAccountHandle returnedHandleTel
		= mTSIBinder.getDefaultOutgoingPhoneAccount("tel", "");
		= mTSIBinder.getDefaultOutgoingPhoneAccount("tel", "", null);
		assertNull(returnedHandleTel);
		}

		@@ -338,9 +339,9 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);

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

		@SmallTest
		@@ -355,7 +356,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {

		List<PhoneAccountHandle> result = null;
		try {
		result = mTSIBinder.getCallCapablePhoneAccounts(true, "");
		result = mTSIBinder.getCallCapablePhoneAccounts(true, "", null);
		} catch (SecurityException e) {
		// intended behavior
		}
		@@ -684,14 +685,15 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		Uri handle = Uri.parse("tel:6505551234");
		Bundle extras = createSampleExtras();

		when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_CALL_PHONE), anyInt(), anyString()))
		when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_CALL_PHONE), anyInt(), anyString(),
		nullable(String.class), nullable(String.class)))
		.thenReturn(AppOpsManager.MODE_ALLOWED);
		doReturn(PackageManager.PERMISSION_GRANTED)
		.when(mContext).checkCallingPermission(CALL_PHONE);
		doReturn(PackageManager.PERMISSION_DENIED)
		.when(mContext).checkCallingPermission(CALL_PRIVILEGED);

		mTSIBinder.placeCall(handle, extras, DEFAULT_DIALER_PACKAGE);
		mTSIBinder.placeCall(handle, extras, DEFAULT_DIALER_PACKAGE, null);
		placeCallTestHelper(handle, extras, true);
		}

		@@ -701,14 +703,15 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		Uri handle = Uri.parse("tel:6505551234");
		Bundle extras = createSampleExtras();

		when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_CALL_PHONE), anyInt(), anyString()))
		when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_CALL_PHONE), anyInt(), anyString(),
		nullable(String.class), nullable(String.class)))
		.thenReturn(AppOpsManager.MODE_IGNORED);
		doReturn(PackageManager.PERMISSION_GRANTED)
		.when(mContext).checkCallingPermission(CALL_PHONE);
		doReturn(PackageManager.PERMISSION_DENIED)
		.when(mContext).checkCallingPermission(CALL_PRIVILEGED);

		mTSIBinder.placeCall(handle, extras, DEFAULT_DIALER_PACKAGE);
		mTSIBinder.placeCall(handle, extras, DEFAULT_DIALER_PACKAGE, null);
		placeCallTestHelper(handle, extras, false);
		}

		@@ -718,14 +721,15 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		Uri handle = Uri.parse("tel:6505551234");
		Bundle extras = createSampleExtras();

		when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_CALL_PHONE), anyInt(), anyString()))
		when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_CALL_PHONE), anyInt(), anyString(),
		nullable(String.class), nullable(String.class)))
		.thenReturn(AppOpsManager.MODE_ALLOWED);
		doReturn(PackageManager.PERMISSION_DENIED)
		.when(mContext).checkCallingPermission(CALL_PHONE);
		doReturn(PackageManager.PERMISSION_DENIED)
		.when(mContext).checkCallingPermission(CALL_PRIVILEGED);

		mTSIBinder.placeCall(handle, extras, DEFAULT_DIALER_PACKAGE);
		mTSIBinder.placeCall(handle, extras, DEFAULT_DIALER_PACKAGE, null);
		placeCallTestHelper(handle, extras, false);
		}

		@@ -750,7 +754,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		.when(mContext).enforceCallingOrSelfPermission(eq(CALL_PHONE), anyString());

		try {
		mTSIBinder.placeCall(handle, extras, "arbitrary_package_name");
		mTSIBinder.placeCall(handle, extras, "arbitrary_package_name", null);
		} catch (SecurityException e) {
		// expected
		}
		@@ -823,7 +827,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		doReturn(true).when(mFakePhoneAccountRegistrar).isVoiceMailNumber(TEL_PA_HANDLE_CURRENT,
		vmNumber);
		assertTrue(mTSIBinder.isVoiceMailNumber(TEL_PA_HANDLE_CURRENT,
		vmNumber, DEFAULT_DIALER_PACKAGE));
		vmNumber, DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@@ -837,7 +841,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		when(mFakePhoneAccountRegistrar.getPhoneAccount(TEL_PA_HANDLE_CURRENT,
		Binder.getCallingUserHandle())).thenReturn(null);
		assertFalse(mTSIBinder
		.isVoiceMailNumber(TEL_PA_HANDLE_CURRENT, vmNumber, DEFAULT_DIALER_PACKAGE));
		.isVoiceMailNumber(TEL_PA_HANDLE_CURRENT, vmNumber, DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@@ -854,7 +858,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
		when(mockTelephonyManager.getVoiceMailNumber()).thenReturn(vmNumber);

		assertEquals(vmNumber, mTSIBinder.getVoiceMailNumber(null, DEFAULT_DIALER_PACKAGE));
		assertEquals(vmNumber, mTSIBinder.getVoiceMailNumber(null, DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@@ -873,7 +877,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		.thenReturn(subId);

		assertEquals(vmNumber,
		mTSIBinder.getVoiceMailNumber(TEL_PA_HANDLE_CURRENT, DEFAULT_DIALER_PACKAGE));
		mTSIBinder.getVoiceMailNumber(TEL_PA_HANDLE_CURRENT, DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@@ -889,7 +893,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		when(mockTelephonyManager.getLine1Number()).thenReturn(line1Number);

		assertEquals(line1Number,
		mTSIBinder.getLine1Number(TEL_PA_HANDLE_CURRENT, DEFAULT_DIALER_PACKAGE));
		mTSIBinder.getLine1Number(TEL_PA_HANDLE_CURRENT, DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@@ -960,14 +964,14 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		@Test
		public void testIsInCall() throws Exception {
		when(mFakeCallsManager.hasOngoingCalls()).thenReturn(true);
		assertTrue(mTSIBinder.isInCall(DEFAULT_DIALER_PACKAGE));
		assertTrue(mTSIBinder.isInCall(DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@Test
		public void testNotIsInCall() throws Exception {
		when(mFakeCallsManager.hasOngoingCalls()).thenReturn(false);
		assertFalse(mTSIBinder.isInCall(DEFAULT_DIALER_PACKAGE));
		assertFalse(mTSIBinder.isInCall(DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@@ -976,7 +980,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission(
		anyString(), any());
		try {
		mTSIBinder.isInCall("blah");
		mTSIBinder.isInCall("blah", null);
		fail();
		} catch (SecurityException e) {
		// desired result
		@@ -988,14 +992,14 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		@Test
		public void testIsInManagedCall() throws Exception {
		when(mFakeCallsManager.hasOngoingManagedCalls()).thenReturn(true);
		assertTrue(mTSIBinder.isInManagedCall(DEFAULT_DIALER_PACKAGE));
		assertTrue(mTSIBinder.isInManagedCall(DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@Test
		public void testNotIsInManagedCall() throws Exception {
		when(mFakeCallsManager.hasOngoingManagedCalls()).thenReturn(false);
		assertFalse(mTSIBinder.isInManagedCall(DEFAULT_DIALER_PACKAGE));
		assertFalse(mTSIBinder.isInManagedCall(DEFAULT_DIALER_PACKAGE, null));
		}

		@SmallTest
		@@ -1004,7 +1008,7 @@ public class TelecomServiceImplTest extends TelecomTestCase {
		doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission(
		anyString(), any());
		try {
		mTSIBinder.isInManagedCall("blah");
		mTSIBinder.isInManagedCall("blah", null);
		fail();
		} catch (SecurityException e) {
		// desired result