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

Commit 9d588d2c authored by Muhammad Hasan Khan's avatar Muhammad Hasan Khan
Browse files

arc: Add support for ARC demo mode in isDemoUser 

In ARC the system property ro.boot.arc_demo_mode is set in demo mode.
Updating the isDemoUser API to account for that so apps can behave as
expected.

Bug: 301629078
Test: atest UserManagerServiceDemoModeTest
Test: run ARC in demo mode with this change and ensure Play Store is in
demo mode

BYPASS_INCLUSIVE_LANGUAGE_REASON=blocked term is part of an API

Change-Id: I98c34e7138c6ccd958a49e239d53e5143e3d89b1
parent 308771a0

services/core/java/com/android/server/pm/UserManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -2285,6 +2285,11 @@ public class UserManagerService extends IUserManager.Stub { 
            throw new SecurityException("You need MANAGE_USERS permission to query if u=" + userId

                    + " is a demo user");

        }



        if (SystemProperties.getBoolean("ro.boot.arc_demo_mode", false)) {

            return true;

        }



        synchronized (mUsersLock) {

            UserInfo userInfo = getUserInfoLU(userId);

            return userInfo != null && userInfo.isDemo();

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceDemoModeTest.kt

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.pm



import android.content.res.Configuration

import android.os.Looper

import android.os.SystemProperties

import android.os.UserHandle

import android.util.ArrayMap

import com.android.server.LockGuard

import com.android.server.extendedtestutils.wheneverStatic

import com.android.server.testutils.whenever

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

import org.junit.Before

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.JUnit4

import org.mockito.MockitoAnnotations



@RunWith(JUnit4::class)

class UserManagerServiceDemoModeTest {

    private lateinit var ums: UserManagerService



    @Rule

    @JvmField

    val rule = MockSystemRule()



    @Before

    @Throws(Exception::class)

    fun setUp() {

        MockitoAnnotations.initMocks(this)

        rule.system().stageNominalSystemState()



        if (Looper.myLooper() == null) {

            Looper.prepare()

        }



        wheneverStatic { LockGuard.installNewLock(LockGuard.INDEX_USER) }.thenReturn(Object())

        whenever(rule.mocks().systemConfig.getAndClearPackageToUserTypeWhitelist()).thenReturn(ArrayMap<String, Set<String>>())

        whenever(rule.mocks().systemConfig.getAndClearPackageToUserTypeBlacklist()).thenReturn(ArrayMap<String, Set<String>>())

        whenever(rule.mocks().resources.getStringArray(com.android.internal.R.array.config_defaultFirstUserRestrictions)).thenReturn(arrayOf<String>())

        whenever(rule.mocks().resources.configuration).thenReturn(Configuration())



        ums = UserManagerService(rule.mocks().context)

    }



    @Test

    fun isDemoUser_returnsTrue_whenSystemPropertyIsSet() {

        wheneverStatic { SystemProperties.getBoolean("ro.boot.arc_demo_mode", false) }.thenReturn(true)



        assertThat(ums.isDemoUser(0)).isTrue()

    }



    @Test

    fun isDemoUser_returnsFalse_whenSystemPropertyIsSet() {

        wheneverStatic { SystemProperties.getBoolean("ro.boot.arc_demo_mode", false) }.thenReturn(false)



        assertThat(ums.isDemoUser(0)).isFalse()

    }



    @Test

    fun isDemoUser_returnsFalse_whenSystemPropertyIsNotSet() {

        assertThat(ums.isDemoUser(0)).isFalse()

    }

}
 
 No newline at end of file