Merge "Clear calling identity when executing the callback" (4f46725a) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/euicc/EuiccCardManager.java

+136 −22

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.content.Context;
		import android.os.Binder;
		import android.os.RemoteException;
		import android.service.euicc.EuiccProfileInfo;
		import android.telephony.TelephonyFrameworkInitializer;
		@@ -168,7 +169,12 @@ public class EuiccCardManager {
		new IGetAllProfilesCallback.Stub() {
		@Override
		public void onComplete(int resultCode, EuiccProfileInfo[] profiles) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, profiles));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -192,7 +198,12 @@ public class EuiccCardManager {
		new IGetProfileCallback.Stub() {
		@Override
		public void onComplete(int resultCode, EuiccProfileInfo profile) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, profile));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -217,7 +228,12 @@ public class EuiccCardManager {
		refresh, new IDisableProfileCallback.Stub() {
		@Override
		public void onComplete(int resultCode) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, null));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -243,7 +259,12 @@ public class EuiccCardManager {
		refresh, new ISwitchToProfileCallback.Stub() {
		@Override
		public void onComplete(int resultCode, EuiccProfileInfo profile) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, profile));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -268,7 +289,12 @@ public class EuiccCardManager {
		nickname, new ISetNicknameCallback.Stub() {
		@Override
		public void onComplete(int resultCode) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, null));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -292,7 +318,12 @@ public class EuiccCardManager {
		new IDeleteProfileCallback.Stub() {
		@Override
		public void onComplete(int resultCode) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, null));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -317,7 +348,12 @@ public class EuiccCardManager {
		new IResetMemoryCallback.Stub() {
		@Override
		public void onComplete(int resultCode) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, null));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -340,7 +376,12 @@ public class EuiccCardManager {
		new IGetDefaultSmdpAddressCallback.Stub() {
		@Override
		public void onComplete(int resultCode, String address) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, address));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -363,7 +404,12 @@ public class EuiccCardManager {
		new IGetSmdsAddressCallback.Stub() {
		@Override
		public void onComplete(int resultCode, String address) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, address));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -388,7 +434,12 @@ public class EuiccCardManager {
		new ISetDefaultSmdpAddressCallback.Stub() {
		@Override
		public void onComplete(int resultCode) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, null));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -411,7 +462,12 @@ public class EuiccCardManager {
		new IGetRulesAuthTableCallback.Stub() {
		@Override
		public void onComplete(int resultCode, EuiccRulesAuthTable rat) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, rat));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -434,7 +490,12 @@ public class EuiccCardManager {
		new IGetEuiccChallengeCallback.Stub() {
		@Override
		public void onComplete(int resultCode, byte[] challenge) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, challenge));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -457,7 +518,12 @@ public class EuiccCardManager {
		new IGetEuiccInfo1Callback.Stub() {
		@Override
		public void onComplete(int resultCode, byte[] info) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, info));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -480,7 +546,12 @@ public class EuiccCardManager {
		new IGetEuiccInfo2Callback.Stub() {
		@Override
		public void onComplete(int resultCode, byte[] info) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, info));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -522,7 +593,12 @@ public class EuiccCardManager {
		new IAuthenticateServerCallback.Stub() {
		@Override
		public void onComplete(int resultCode, byte[] response) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, response));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -561,7 +637,12 @@ public class EuiccCardManager {
		new IPrepareDownloadCallback.Stub() {
		@Override
		public void onComplete(int resultCode, byte[] response) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, response));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -589,7 +670,12 @@ public class EuiccCardManager {
		new ILoadBoundProfilePackageCallback.Stub() {
		@Override
		public void onComplete(int resultCode, byte[] response) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, response));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -619,7 +705,12 @@ public class EuiccCardManager {
		new ICancelSessionCallback.Stub() {
		@Override
		public void onComplete(int resultCode, byte[] response) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, response));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -643,7 +734,13 @@ public class EuiccCardManager {
		new IListNotificationsCallback.Stub() {
		@Override
		public void onComplete(int resultCode, EuiccNotification[] notifications) {
		executor.execute(() -> callback.onComplete(resultCode, notifications));
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(
		resultCode, notifications));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -667,7 +764,13 @@ public class EuiccCardManager {
		events, new IRetrieveNotificationListCallback.Stub() {
		@Override
		public void onComplete(int resultCode, EuiccNotification[] notifications) {
		executor.execute(() -> callback.onComplete(resultCode, notifications));
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(
		resultCode, notifications));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -691,7 +794,13 @@ public class EuiccCardManager {
		seqNumber, new IRetrieveNotificationCallback.Stub() {
		@Override
		public void onComplete(int resultCode, EuiccNotification notification) {
		executor.execute(() -> callback.onComplete(resultCode, notification));
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(
		resultCode, notification));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {
		@@ -718,7 +827,12 @@ public class EuiccCardManager {
		new IRemoveNotificationFromListCallback.Stub() {
		@Override
		public void onComplete(int resultCode) {
		final long token = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> callback.onComplete(resultCode, null));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		} catch (RemoteException e) {