Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make the FRP check return false on debug builds" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-03-28 15:39:22 +00:00
committed by Android (Google) Code Review
parent 3f88c15585 f039d7c3af
commit 16717f7461
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {

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

@@ -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
)