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

Commit b8e9934b authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Prevent null argument from crashing ClockEventController" into... 

Merge "Prevent null argument from crashing ClockEventController" into tm-qpr-dev am: 7b08f905 am: dd7e88dc am: 55094cc2 am: 97692923

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



Change-Id: I17ffc4c27e1419a1f88bbde3add0d14e0a503f8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9f9e651 97692923

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ constructor( 
                largeTimeListener?.update(shouldTimeListenerRun)

            }



            override fun onTimeFormatChanged(timeFormat: String) {

            override fun onTimeFormatChanged(timeFormat: String?) {

                clock?.events?.onTimeFormatChanged(DateFormat.is24HourFormat(context))

            }