Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-03 11:49:24 +00:00
committed by Android (Google) Code Review
parent 920105c38b e21ba28bec
commit e339218972
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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);
} }
} }