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

Merge "Use Correct feature flag for isLockTaskPermitted" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-13 12:09:00 +00:00
committed by Android (Google) Code Review
parent 86a02228f6 3cad2606a8
commit cc3a74b4b3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
View File

@@ -792,7 +792,7 @@ final class DevicePolicyEngine {
admin.getUserId()); admin.getUserId());
if (receivers.isEmpty()) { if (receivers.isEmpty()) {
Log.i(TAG, "Couldn't find any receivers that handle ACTION_DEVICE_POLICY_SET_RESULT" Log.i(TAG, "Couldn't find any receivers that handle ACTION_DEVICE_POLICY_SET_RESULT"
+ "in package " + admin.getPackageName()); + " in package " + admin.getPackageName());
return; return;
} }
@@ -845,7 +845,7 @@ final class DevicePolicyEngine {
admin.getUserId()); admin.getUserId());
if (receivers.isEmpty()) { if (receivers.isEmpty()) {
Log.i(TAG, "Couldn't find any receivers that handle ACTION_DEVICE_POLICY_CHANGED" Log.i(TAG, "Couldn't find any receivers that handle ACTION_DEVICE_POLICY_CHANGED"
+ "in package " + admin.getPackageName()); + " in package " + admin.getPackageName());
return; return;
} }
@@ -868,7 +868,7 @@ final class DevicePolicyEngine {
for (ResolveInfo resolveInfo : receivers) { for (ResolveInfo resolveInfo : receivers) {
if (!Manifest.permission.BIND_DEVICE_ADMIN.equals( if (!Manifest.permission.BIND_DEVICE_ADMIN.equals(
resolveInfo.activityInfo.permission)) { resolveInfo.activityInfo.permission)) {
Log.w(TAG, "Receiver " + resolveInfo.activityInfo + " is not protected by" Log.w(TAG, "Receiver " + resolveInfo.activityInfo + " is not protected by "
+ "BIND_DEVICE_ADMIN permission!"); + "BIND_DEVICE_ADMIN permission!");
continue; continue;
} }

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

@@ -14725,7 +14725,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
final int userId = mInjector.userHandleGetCallingUserId(); final int userId = mInjector.userHandleGetCallingUserId();
if (isPermissionCheckFlagEnabled()) { if (isPolicyEngineForFinanceFlagEnabled()) {
LockTaskPolicy policy = mDevicePolicyEngine.getResolvedPolicy( LockTaskPolicy policy = mDevicePolicyEngine.getResolvedPolicy(
PolicyDefinition.LOCK_TASK, userId); PolicyDefinition.LOCK_TASK, userId);
if (policy == null) { if (policy == null) {
@@ -16145,7 +16145,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
final UserManager.EnforcingUser enforcingUser = sources.get(0); final UserManager.EnforcingUser enforcingUser = sources.get(0);
final int sourceType = enforcingUser.getUserRestrictionSource(); final int sourceType = enforcingUser.getUserRestrictionSource();
if (sourceType == UserManager.RESTRICTION_SOURCE_PROFILE_OWNER if (sourceType == UserManager.RESTRICTION_SOURCE_PROFILE_OWNER
|| sourceType == UserManager.RESTRICTION_SOURCE_DEVICE_OWNER ) { || sourceType == UserManager.RESTRICTION_SOURCE_DEVICE_OWNER) {
ActiveAdmin admin = getMostProbableDPCAdminForLocalPolicy(userId); ActiveAdmin admin = getMostProbableDPCAdminForLocalPolicy(userId);
if (admin != null) { if (admin != null) {
result = new Bundle(); result = new Bundle();