am 2a98c97e: Allow PSTN phone account for incoming calls from connection manager (e566b575) · Commits · e / os / android_packages_services_Telecomm

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

+23 −5

Original line number	Diff line number	Diff line
		@@ -657,11 +657,16 @@ public class TelecomService extends Service {
		public void addNewIncomingCall(PhoneAccountHandle phoneAccountHandle, Bundle extras) {
		Log.i(this, "Adding new incoming call with phoneAccountHandle %s", phoneAccountHandle);
		if (phoneAccountHandle != null && phoneAccountHandle.getComponentName() != null) {
		mAppOpsManager.checkPackage(
		Binder.getCallingUid(), phoneAccountHandle.getComponentName().getPackageName());

		// TODO(sail): Add unit tests for adding incoming calls from a SIM call manager.
		if (isCallerSimCallManager() && TelephonyUtil.isPstnComponentName(
		phoneAccountHandle.getComponentName())) {
		Log.v(this, "Allowing call manager to add incoming call with PSTN handle");
		} else {
		mAppOpsManager.checkPackage(Binder.getCallingUid(),
		phoneAccountHandle.getComponentName().getPackageName());
		// Make sure it doesn't cross the UserHandle boundary
		enforceUserHandleMatchesCaller(phoneAccountHandle);
		}

		Intent intent = new Intent(TelecomManager.ACTION_INCOMING_CALL);
		intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
		@@ -932,6 +937,19 @@ public class TelecomService extends Service {
		}
		}

		private boolean isCallerSimCallManager() {
		PhoneAccountHandle accountHandle = mPhoneAccountRegistrar.getSimCallManager();
		if (accountHandle != null) {
		try {
		mAppOpsManager.checkPackage(
		Binder.getCallingUid(), accountHandle.getComponentName().getPackageName());
		return true;
		} catch (SecurityException e) {
		}
		}
		return false;
		}

		private boolean isDefaultDialerCalling() {
		ComponentName defaultDialerComponent = getDefaultPhoneAppInternal();
		if (defaultDialerComponent != null) {