Merge "Check callingpackage for calling UID consistency with phoneAccountHandle." (bb078eb6) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -2430,7 +2430,8 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		return service.isIncomingCallPermitted(phoneAccountHandle);
		return service.isIncomingCallPermitted(phoneAccountHandle,
		mContext.getOpPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error isIncomingCallPermitted", e);
		}
		@@ -2463,7 +2464,8 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		return service.isOutgoingCallPermitted(phoneAccountHandle);
		return service.isOutgoingCallPermitted(phoneAccountHandle,
		mContext.getOpPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error isOutgoingCallPermitted", e);
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -306,12 +306,14 @@ interface ITelecomService {
		/**
		* @see TelecomServiceImpl#isIncomingCallPermitted
		*/
		boolean isIncomingCallPermitted(in PhoneAccountHandle phoneAccountHandle);
		boolean isIncomingCallPermitted(in PhoneAccountHandle phoneAccountHandle,
		String callingPackage);

		/**
		* @see TelecomServiceImpl#isOutgoingCallPermitted
		*/
		boolean isOutgoingCallPermitted(in PhoneAccountHandle phoneAccountHandle);
		boolean isOutgoingCallPermitted(in PhoneAccountHandle phoneAccountHandle,
		String callingPackage);

		/**
		* @see TelecomServiceImpl#waitOnHandler