Merge "Do not use hidden withCleanCallingIdentity" (8da132d7) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ims/ImsMmTelManager.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -161,9 +161,13 @@ public class ImsMmTelManager implements RegistrationManager {
		public void onCapabilitiesStatusChanged(int config) {
		if (mLocalCallback == null) return;

		Binder.withCleanCallingIdentity(() ->
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() -> mLocalCallback.onCapabilitiesStatusChanged(
		new MmTelFeature.MmTelCapabilities(config))));
		new MmTelFeature.MmTelCapabilities(config)));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		@Override

telephony/java/android/telephony/ims/ImsRcsManager.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -67,9 +67,13 @@ public class ImsRcsManager implements RegistrationManager {
		public void onCapabilitiesStatusChanged(int config) {
		if (mLocalCallback == null) return;

		Binder.withCleanCallingIdentity(() ->
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() -> mLocalCallback.onAvailabilityChanged(
		new RcsFeature.RcsImsCapabilities(config))));
		new RcsFeature.RcsImsCapabilities(config)));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		@Override

telephony/java/android/telephony/ims/ProvisioningManager.java

+14 −7

Original line number	Diff line number	Diff line
		@@ -136,17 +136,24 @@ public class ProvisioningManager {

		@Override
		public final void onIntConfigChanged(int item, int value) {
		Binder.withCleanCallingIdentity(() ->
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() ->
		mLocalConfigurationCallback.onProvisioningIntChanged(item, value)));
		mLocalConfigurationCallback.onProvisioningIntChanged(item, value));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		@Override
		public final void onStringConfigChanged(int item, String value) {
		Binder.withCleanCallingIdentity(() ->
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() ->
		mLocalConfigurationCallback.onProvisioningStringChanged(item,
		value)));
		mLocalConfigurationCallback.onProvisioningStringChanged(item, value));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		private void setExecutor(Executor executor) {

telephony/java/android/telephony/ims/RcsUceAdapter.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -245,15 +245,22 @@ public class RcsUceAdapter {
		IRcsUceControllerCallback internalCallback = new IRcsUceControllerCallback.Stub() {
		@Override
		public void onCapabilitiesReceived(List<RcsContactUceCapability> contactCapabilities) {
		Binder.withCleanCallingIdentity(() ->
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		executor.execute(() ->
		c.onCapabilitiesReceived(contactCapabilities)));
		c.onCapabilitiesReceived(contactCapabilities));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}
		@Override
		public void onError(int errorCode) {
		Binder.withCleanCallingIdentity(() ->
		executor.execute(() ->
		c.onError(errorCode)));
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> c.onError(errorCode));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}
		};

telephony/java/android/telephony/ims/RegistrationManager.java

+33 −12

Original line number	Diff line number	Diff line
		@@ -110,42 +110,63 @@ public interface RegistrationManager {
		public void onRegistered(int imsRadioTech) {
		if (mLocalCallback == null) return;

		Binder.withCleanCallingIdentity(() -> mExecutor.execute(() ->
		mLocalCallback.onRegistered(getAccessType(imsRadioTech))));
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() ->
		mLocalCallback.onRegistered(getAccessType(imsRadioTech)));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		@Override
		public void onRegistering(int imsRadioTech) {
		if (mLocalCallback == null) return;

		Binder.withCleanCallingIdentity(() -> mExecutor.execute(() ->
		mLocalCallback.onRegistering(getAccessType(imsRadioTech))));
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() ->
		mLocalCallback.onRegistering(getAccessType(imsRadioTech)));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		@Override
		public void onDeregistered(ImsReasonInfo info) {
		if (mLocalCallback == null) return;

		Binder.withCleanCallingIdentity(() ->
		mExecutor.execute(() -> mLocalCallback.onUnregistered(info)));
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() -> mLocalCallback.onUnregistered(info));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		@Override
		public void onTechnologyChangeFailed(int imsRadioTech, ImsReasonInfo info) {
		if (mLocalCallback == null) return;

		Binder.withCleanCallingIdentity(() ->
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() -> mLocalCallback.onTechnologyChangeFailed(
		getAccessType(imsRadioTech), info)));
		getAccessType(imsRadioTech), info));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		@Override
		public void onSubscriberAssociatedUriChanged(Uri[] uris) {
		if (mLocalCallback == null) return;

		Binder.withCleanCallingIdentity(() ->
		mExecutor.execute(() ->
		mLocalCallback.onSubscriberAssociatedUriChanged(uris)));
		long callingIdentity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() -> mLocalCallback.onSubscriberAssociatedUriChanged(uris));
		} finally {
		restoreCallingIdentity(callingIdentity);
		}
		}

		private void setExecutor(Executor executor) {