Merge "Clear binder identity before checking with compat service" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-03-03 11:49:24 +00:00
committed by Android (Google) Code Review

View File

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