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

Commit a9119a32 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Fix kotlin nullable errors in TrustTests am: 5f70c172 

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



Change-Id: I56ea6a1ed4b337bccf5c78d93455684419c94b32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48dcb188 5f70c172

tests/TrustTests/src/android/trust/test/lib/LockStateTrackingRule.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import org.junit.runners.model.Statement 
 */

class LockStateTrackingRule : TestRule {

    private val context: Context = getApplicationContext()

    private val windowManager = WindowManagerGlobal.getWindowManagerService()

    private val windowManager = checkNotNull(WindowManagerGlobal.getWindowManagerService())



    @Volatile lateinit var lockState: LockState

        private set

tests/TrustTests/src/android/trust/test/lib/ScreenLockRule.kt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import org.junit.runners.model.Statement 
class ScreenLockRule : TestRule {

    private val context: Context = getApplicationContext()

    private val uiDevice = UiDevice.getInstance(getInstrumentation())

    private val windowManager = WindowManagerGlobal.getWindowManagerService()

    private val windowManager = checkNotNull(WindowManagerGlobal.getWindowManagerService())

    private val lockPatternUtils = LockPatternUtils(context)

    private var instantLockSavedValue = false