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

Commit 681b4ef5 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix a bug that ripple might get readded to WM and cause crash." into sc-dev am: d7217299 

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

Change-Id: I534fb2ebc9c6a9be1f930c14cbf5f6918f023f21
parents e09c1ec9 d7217299

packages/SystemUI/src/com/android/systemui/statusbar/charging/WiredChargingRippleController.kt

+4 −1
Original line number Diff line number Diff line
@@ -103,7 +103,10 @@ class WiredChargingRippleController @Inject constructor( 
    }



    fun startRipple() {

        if (rippleView.rippleInProgress) {

        if (rippleView.rippleInProgress || rippleView.parent != null) {

            // Skip if ripple is still playing, or not playing but already added the parent

            // (which might happen just before the animation starts or right after

            // the animation ends.)

            return

        }

        val mWM = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager