Merge "Remove erroneous permission checks in ConnectionServiceWrapper." into... (54b1fa9a) · Commits · e / os / android_packages_services_Telecomm

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -778,12 +778,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		Session.Info sessionInfo) {
		Log.startSession(sessionInfo, "CSW.sA");

		if (mContext.checkCallingOrSelfPermission(MODIFY_PHONE_STATE)
		!= PackageManager.PERMISSION_GRANTED) {
		Log.w(this, "setAddress from caller without permission.");
		return;
		}

		long token = Binder.clearCallingIdentity();
		try {
		synchronized (mLock) {
		@@ -869,12 +863,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		callingPhoneAccountHandle.getComponentName().getPackageName());
		}

		if (mContext.checkCallingOrSelfPermission(MODIFY_PHONE_STATE)
		!= PackageManager.PERMISSION_GRANTED) {
		Log.w(this, "addExistingConnection from caller without permission!");
		return;
		}

		long token = Binder.clearCallingIdentity();
		try {
		synchronized (mLock) {