Merge "Clear binder identity before checking with compat service" into rvc-dev... (cdfbfac4) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11814,12 +11814,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	}		}

	private boolean isSetSecureSettingLocationModeCheckEnabled(String packageName, int userId) {		private boolean isSetSecureSettingLocationModeCheckEnabled(String packageName, int userId) {
			long ident = mInjector.binderClearCallingIdentity();
	try {		try {
	return mIPlatformCompat.isChangeEnabledByPackageName(USE_SET_LOCATION_ENABLED,		return mIPlatformCompat.isChangeEnabledByPackageName(USE_SET_LOCATION_ENABLED,
	packageName, userId);		packageName, userId);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(LOG_TAG, "Failed to get a response from PLATFORM_COMPAT_SERVICE", e);		Log.e(LOG_TAG, "Failed to get a response from PLATFORM_COMPAT_SERVICE", e);
	return getTargetSdk(packageName, userId) > Build.VERSION_CODES.Q;		return getTargetSdk(packageName, userId) > Build.VERSION_CODES.Q;
			} finally {
			mInjector.binderRestoreCallingIdentity(ident);
	}		}
	}		}