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

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

Merge "Make the FRP check return false on debug builds" into udc-dev am: 16717f74 

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



Change-Id: Ic663ed064c024952812d92f955ec97a7e02f30c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a5b5e15 16717f74

packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedControllerImpl.kt

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.dump.DumpManager 
import com.android.systemui.settings.UserTracker

import com.android.systemui.util.settings.GlobalSettings

import com.android.systemui.util.settings.SecureSettings

import com.android.systemui.util.wrapper.BuildInfo

import java.io.PrintWriter

import java.util.concurrent.Executor

import java.util.concurrent.atomic.AtomicBoolean
@@ -47,6 +48,7 @@ open class DeviceProvisionedControllerImpl @Inject constructor( 
    private val globalSettings: GlobalSettings,

    private val userTracker: UserTracker,

    private val dumpManager: DumpManager,

    private val buildInfo: BuildInfo,

    @Background private val backgroundHandler: Handler,

    @Main private val mainExecutor: Executor

) : DeviceProvisionedController,
@@ -187,7 +189,7 @@ open class DeviceProvisionedControllerImpl @Inject constructor( 
    }



    override fun isFrpActive(): Boolean {

        return frpActive.get()

        return frpActive.get() && !buildInfo.isDebuggable

    }



    override fun isUserSetup(user: Int): Boolean {

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceProvisionedControllerImplTest.kt

+7 −2
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ import com.android.systemui.settings.UserTracker 
import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.capture

import com.android.systemui.util.mockito.whenever

import com.android.systemui.util.settings.FakeSettings

import com.android.systemui.util.time.FakeSystemClock

import com.android.systemui.util.wrapper.BuildInfo

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

import org.junit.Before

import org.junit.Test
@@ -36,9 +38,9 @@ import org.junit.runner.RunWith 
import org.mockito.ArgumentCaptor

import org.mockito.Captor

import org.mockito.Mock

import org.mockito.Mockito.`when`

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when`

import org.mockito.MockitoAnnotations



@SmallTest
@@ -58,6 +60,8 @@ class DeviceProvisionedControllerImplTest : SysuiTestCase() { 
    private lateinit var dumpManager: DumpManager

    @Mock

    private lateinit var listener: DeviceProvisionedController.DeviceProvisionedListener

    @Mock

    private lateinit var buildInfo: BuildInfo

    @Captor

    private lateinit var userTrackerCallbackCaptor: ArgumentCaptor<UserTracker.Callback>
@@ -72,12 +76,13 @@ class DeviceProvisionedControllerImplTest : SysuiTestCase() { 
        mainExecutor = FakeExecutor(FakeSystemClock())

        settings = FakeSettings()

        `when`(userTracker.userId).thenReturn(START_USER)



        whenever(buildInfo.isDebuggable).thenReturn(false)

        controller = DeviceProvisionedControllerImpl(

                settings,

                settings,

                userTracker,

                dumpManager,

                buildInfo,

                Handler(testableLooper.looper),

                mainExecutor

        )