Merge "Clear callingId before binder calls in CompatChanges" am: 45d1f67bf6 (00f11fe5) · Commits · e / os / android_frameworks_base

core/java/android/app/compat/CompatChanges.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.compat.Compatibility;
		import android.content.Context;
		import android.os.Binder;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		@@ -70,11 +71,14 @@ public final class CompatChanges {
		@NonNull UserHandle user) {
		IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface(
		ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));
		final long token = Binder.clearCallingIdentity();
		try {
		return platformCompat.isChangeEnabledByPackageName(changeId, packageName,
		user.getIdentifier());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		@@ -99,10 +103,13 @@ public final class CompatChanges {
		public static boolean isChangeEnabled(long changeId, int uid) {
		IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface(
		ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));
		final long token = Binder.clearCallingIdentity();
		try {
		return platformCompat.isChangeEnabledByUid(changeId, uid);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		}