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

Commit b393d426 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Fix PrivacyChip not visible issue" into sc-dev am: b40db93c am:...

Merge "Fix PrivacyChip not visible issue" into sc-dev am: b40db93c am: 31f92bcd am: 182640fb am: c28b9ad9

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



Change-Id: Id58a7deb735f3d40daeed129c51966a7739321fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents acfbfe05 c28b9ad9
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -112,9 +112,7 @@ class PrivacyEvent(override val showAnimation: Boolean = true) : StatusEvent {
    }

    override fun shouldUpdateFromEvent(other: StatusEvent?): Boolean {
        return other is PrivacyEvent &&
                (other.privacyItems != privacyItems ||
                other.contentDescription != contentDescription)
        return other is PrivacyEvent
    }

    override fun updateFromEvent(other: StatusEvent?) {