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

Commit 77e56953 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[Demo Mode] Don't persist demo mode across restarts." into tm-qpr-dev...

Merge "[Demo Mode] Don't persist demo mode across restarts." into tm-qpr-dev am: b3e23779 am: 49d715d6

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



Change-Id: I5911ddc4bf1021e648cc6e604b6ed83de5b2cc8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c07dfae 49d715d6
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ class DemoModeController constructor(
    private val receiverMap: Map<String, MutableList<DemoMode>>

    init {
        // Don't persist demo mode across restarts.
        requestFinishDemoMode()

        val m = mutableMapOf<String, MutableList<DemoMode>>()
        DemoMode.COMMANDS.map { command ->
            m.put(command, mutableListOf())
@@ -74,7 +77,6 @@ class DemoModeController constructor(
        // content changes to know if the setting turned on or off
        tracker.startTracking()

        // TODO: We should probably exit demo mode if we booted up with it on
        isInDemoMode = tracker.isInDemoMode

        val demoFilter = IntentFilter()