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

Commit 8ed88cf6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Push profile owners into DeviceStateCache on boot" into udc-dev am:... 

Merge "Push profile owners into DeviceStateCache on boot" into udc-dev am: 9397e311 am: caf10458

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21851681



Change-Id: I77b49712cbc330e231e7b2b40bd3ebe46a7478dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0a8f502 caf10458

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -120,7 +120,9 @@ class Owners { 
                } else {

                } else {

                    mDeviceStateCache.setDeviceOwnerType(NO_DEVICE_OWNER);

                    mDeviceStateCache.setDeviceOwnerType(NO_DEVICE_OWNER);

                }

                }



                for (int userId : usersIds) {

                    mDeviceStateCache.setHasProfileOwner(userId, hasProfileOwner(userId));

                }

            } else {

            } else {

                mUserManagerInternal.setDeviceManaged(hasDeviceOwner());

                mUserManagerInternal.setDeviceManaged(hasDeviceOwner());

                for (int userId : usersIds) {

                for (int userId : usersIds) {

services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java

+11 −2
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED; 
import static android.app.admin.SystemUpdatePolicy.TYPE_INSTALL_WINDOWED;

import static android.app.admin.SystemUpdatePolicy.TYPE_INSTALL_WINDOWED;





import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertWithMessage;





import android.content.ComponentName;

import android.content.ComponentName;

import android.os.IpcDataCache;

import android.os.IpcDataCache;
@@ -43,6 +44,7 @@ import org.junit.runner.RunWith; 
@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

public class OwnersTest extends DpmTestBase {

public class OwnersTest extends DpmTestBase {





    private static final int TEST_PO_USER = 10;

    private static final String TESTDPC_PACKAGE = "com.afwsamples.testdpc";

    private static final String TESTDPC_PACKAGE = "com.afwsamples.testdpc";

    private final DeviceStateCacheImpl mDeviceStateCache = new DeviceStateCacheImpl();

    private final DeviceStateCacheImpl mDeviceStateCache = new DeviceStateCacheImpl();
@@ -55,11 +57,11 @@ public class OwnersTest extends DpmTestBase { 




    @Test

    @Test

    public void loadProfileOwner() throws Exception {

    public void loadProfileOwner() throws Exception {

        getServices().addUsers(10);

        getServices().addUsers(TEST_PO_USER);





        final Owners owners = makeOwners();

        final Owners owners = makeOwners();





        DpmTestUtils.writeToFile(owners.getProfileOwnerFile(10),

        DpmTestUtils.writeToFile(owners.getProfileOwnerFile(TEST_PO_USER),

                DpmTestUtils.readAsset(mRealTestContext, "OwnersTest/profile_owner_1.xml"));

                DpmTestUtils.readAsset(mRealTestContext, "OwnersTest/profile_owner_1.xml"));





        owners.load();

        owners.load();
@@ -71,6 +73,9 @@ public class OwnersTest extends DpmTestBase { 
        assertThat(owners.getProfileOwnerComponent(10))

        assertThat(owners.getProfileOwnerComponent(10))

                .isEqualTo(new ComponentName(TESTDPC_PACKAGE,

                .isEqualTo(new ComponentName(TESTDPC_PACKAGE,

                        "com.afwsamples.testdpc.DeviceAdminReceiver"));

                        "com.afwsamples.testdpc.DeviceAdminReceiver"));



        assertWithMessage("Profile owner data in DeviceStateCache wasn't populated")

                .that(mDeviceStateCache.isUserOrganizationManaged(TEST_PO_USER)).isTrue();

    }

    }





    @Test

    @Test
@@ -90,6 +95,10 @@ public class OwnersTest extends DpmTestBase { 
                        "com.afwsamples.testdpc.DeviceAdminReceiver"));

                        "com.afwsamples.testdpc.DeviceAdminReceiver"));





        assertThat(owners.getSystemUpdatePolicy().getPolicyType()).isEqualTo(TYPE_INSTALL_WINDOWED);

        assertThat(owners.getSystemUpdatePolicy().getPolicyType()).isEqualTo(TYPE_INSTALL_WINDOWED);



        assertWithMessage("Device owner data in DeviceStateCache wasn't populated")

                .that(mDeviceStateCache.isUserOrganizationManaged(owners.getDeviceOwnerUserId()))

                .isTrue();

    }

    }





    @Test

    @Test