Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28a51db7 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF)
Browse files

Revert "Clean up fully rolled out PermissionMigrationForZeroTrus..." 

Revert submission 28993807-hdop-cleaup

Reason for revert: Droidmonitor created revert due to b/363275535. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:28993807-hdop-cleaup

Change-Id: If36c509360b592bd551cb70f92235814488b9805
parent 97a06737

core/java/android/app/admin/flags/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ flag { 
  bug: "289520697"

}



flag {

  name: "permission_migration_for_zero_trust_impl_enabled"

  namespace: "enterprise"

  description: "(Implementation) Migrate existing APIs to permission based, and enable DMRH to call them to collect Zero Trust signals."

  bug: "289520697"

}



flag {

  name: "device_theft_api_enabled"

  is_exported: true

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

+26 −10
Original line number Diff line number Diff line
@@ -16765,6 +16765,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    mContext.sendBroadcastAsUser(intent, UserHandle.of(userId));

                }













                if (Flags.permissionMigrationForZeroTrustImplEnabled()) {















                    final UserHandle user = UserHandle.of(userId);















                    final String roleHolderPackage = getRoleHolderPackageNameOnUser(















                            RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT, userId);









@@ -16772,15 +16773,24 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                        broadcastExplicitIntentToPackage(intent, roleHolderPackage, user);















                    }















                }













            }















        });















    }





























    @Override















    public SystemUpdateInfo getPendingSystemUpdate(ComponentName admin, String callerPackage) {













        if (Flags.permissionMigrationForZeroTrustImplEnabled()) {















            CallerIdentity caller = getCallerIdentity(admin, callerPackage);















            enforcePermissions(new String[] {NOTIFY_PENDING_SYSTEM_UPDATE,















                    MANAGE_DEVICE_POLICY_QUERY_SYSTEM_UPDATES}, caller.getPackageName(),















                    caller.getUserId());













        } else {













            Objects.requireNonNull(admin, "ComponentName is null");

























            final CallerIdentity caller = getCallerIdentity(admin);













            Preconditions.checkCallAuthorization(













                    isDefaultDeviceOwner(caller) || isProfileOwner(caller));













        }















        return mOwners.getSystemUpdateInfo();















    }
























@@ -21362,7 +21372,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {



























        final CallerIdentity caller = getCallerIdentity(callerPackage);



























        if (Flags.permissionMigrationForZeroTrustImplEnabled()) {















            enforcePermission(MANAGE_DEVICE_POLICY_CERTIFICATES, caller.getPackageName());













        } else {













            Preconditions.checkCallAuthorization(













                    isDefaultDeviceOwner(caller) || isProfileOwner(caller)













                            || isCallerDelegate(caller, DELEGATION_CERT_INSTALL));













        }















        synchronized (getLockObject()) {















            final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(















                    caller.getUserId());