Merge "Clear calling id before binder call" (2bbd85ce) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1878,6 +1878,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	return false;		return false;
	}		}

			final long token = Binder.clearCallingIdentity();
	try {		try {
	if (permName.equals(Manifest.permission.ACCESS_BACKGROUND_LOCATION)		if (permName.equals(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
	&& mPlatformCompat.isChangeEnabledByPackageName(BACKGROUND_RATIONALE_CHANGE_ID,		&& mPlatformCompat.isChangeEnabledByPackageName(BACKGROUND_RATIONALE_CHANGE_ID,
	@@ -1886,6 +1887,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Unable to check if compatibility change is enabled.", e);		Log.e(TAG, "Unable to check if compatibility change is enabled.", e);
			} finally {
			Binder.restoreCallingIdentity(token);
	}		}

	return (flags & PackageManager.FLAG_PERMISSION_USER_SET) != 0;		return (flags & PackageManager.FLAG_PERMISSION_USER_SET) != 0;