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

Commit 6b2a4aa1 authored by Vitor Carvalho's avatar Vitor Carvalho
Browse files

Temporarily disable supervision when supervision app is no longer the profile... 

Temporarily disable supervision when supervision app is no longer the profile owner, making the sync fully 1:1 with DPM.

This is being done to enable the migration of platform code to use SupervisionService while I find out the best way to enable supervision without requiring profile ownership.

Change-Id: Iff01812421fb8b1ad1cadb466e4544b35eaabfaf
Bug: 377261590
Flag: android.app.supervision.flags.enable_sync_with_dpm
Test: atest SupervisionServiceTest
parent 5518e7f2

services/supervision/java/com/android/server/supervision/SupervisionService.java

+13 −8
Original line number Diff line number Diff line
@@ -72,13 +72,6 @@ public class SupervisionService extends ISupervisionManager.Stub { 
        mUserManagerInternal.addUserLifecycleListener(new UserLifecycleListener());

    }



    private void syncStateWithDevicePolicyManager(@UserIdInt int userId) {

        // Ensure that supervision is enabled when supervision app is the profile owner.

        if (Flags.enableSyncWithDpm() && isProfileOwner(userId)) {

            setSupervisionEnabledForUser(userId, true);

        }

    }



    @Override

    public boolean isSupervisionEnabledForUser(@UserIdInt int userId) {

        synchronized (getLockObject()) {
@@ -140,6 +133,18 @@ public class SupervisionService extends ISupervisionManager.Stub { 
        }

    }



    /** Ensures that supervision is enabled when supervision app is the profile owner. */

    private void syncStateWithDevicePolicyManager(@UserIdInt int userId) {

        if (isProfileOwner(userId)) {

            setSupervisionEnabledForUser(userId, true);

        } else {

            // TODO(b/381428475): Avoid disabling supervision when the app is not the profile owner.

            // This might only be possible after introducing specific and public APIs to enable

            // supervision.

            setSupervisionEnabledForUser(userId, false);

        }

    }



    /** Returns whether the supervision app has profile owner status. */

    private boolean isProfileOwner(@UserIdInt int userId) {

        ComponentName profileOwner = mDpmInternal.getProfileOwnerAsUser(userId);
@@ -189,7 +194,7 @@ public class SupervisionService extends ISupervisionManager.Stub { 


        @Override

        public void onUserStarting(@NonNull TargetUser user) {

            if (!user.isPreCreated()) {

            if (Flags.enableSyncWithDpm() && !user.isPreCreated()) {

                mSupervisionService.syncStateWithDevicePolicyManager(user.getUserIdentifier());

            }

        }