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

Commit b859a490 authored by Sherry Zhou's avatar Sherry Zhou Committed by Automerger Merge Worker
Browse files

Merge "Make getClocks OpenForTesting to test ClockCustomDemoFragment" into... 

Merge "Make getClocks OpenForTesting to test ClockCustomDemoFragment" into tm-qpr-dev am: de97db3a

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



Change-Id: I2969cd9e9e4a0297f2ca6a46ca51f205dde0c8ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b601b9b de97db3a

packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.net.Uri 
import android.os.Handler

import android.provider.Settings

import android.util.Log

import androidx.annotation.OpenForTesting

import com.android.internal.annotations.Keep

import com.android.systemui.plugins.ClockController

import com.android.systemui.plugins.ClockId
@@ -157,7 +158,8 @@ open class ClockRegistry( 
        }

    }



    fun getClocks(): List<ClockMetadata> {

    @OpenForTesting

    open fun getClocks(): List<ClockMetadata> {

        if (!isEnabled) {

            return listOf(availableClocks[DEFAULT_CLOCK_ID]!!.metadata)

        }