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

Merge "Fix device admin access with permission checks." into udc-dev

Browse Source
This commit is contained in:
Elis Elliott
2023-04-05 16:59:42 +00:00
committed by Android (Google) Code Review
parent 97506b9808 a0abafa17e
commit cea6724a1d
3 changed files with 409 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -6413,7 +6413,7 @@ public class DevicePolicyManager {
public void lockNow(@LockNowFlag int flags) { public void lockNow(@LockNowFlag int flags) {
if (mService != null) { if (mService != null) {
try { try {
mService.lockNow(flags, mParentInstance); mService.lockNow(flags, mContext.getPackageName(), mParentInstance);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

2
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -119,7 +119,7 @@ interface IDevicePolicyManager {
void setRequiredStrongAuthTimeout(in ComponentName who, String callerPackageName, long timeMs, boolean parent); void setRequiredStrongAuthTimeout(in ComponentName who, String callerPackageName, long timeMs, boolean parent);
long getRequiredStrongAuthTimeout(in ComponentName who, int userId, boolean parent); long getRequiredStrongAuthTimeout(in ComponentName who, int userId, boolean parent);
void lockNow(int flags, boolean parent); void lockNow(int flags, String callerPackageName, boolean parent);
/** /**
* @param factoryReset only applicable when `targetSdk >= U`, either tries to factoryReset/fail or removeUser/fail otherwise * @param factoryReset only applicable when `targetSdk >= U`, either tries to factoryReset/fail or removeUser/fail otherwise

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

File diff suppressed because it is too large Load Diff