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

Commit f9326ccd authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23921015',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23921015', 'googleplex-android-review.googlesource.com/23982203'] into udc-release.

Change-Id: Id0f5b39b7f8179a89b337b102d00b10af34f1ea5
parents 3339534e 69449474

libs/dream/lowlight/src/com/android/dream/lowlight/LowLightTransitionCoordinator.kt

+8 −2
Original line number Diff line number Diff line
@@ -111,8 +111,14 @@ class LowLightTransitionCoordinator @Inject constructor() { 
            }

            animator.addListener(listener)

            continuation.invokeOnCancellation {

                try {

                    animator.removeListener(listener)

                    animator.cancel()

                } catch (exception: IndexOutOfBoundsException) {

                    // TODO(b/285666217): remove this try/catch once a proper fix is implemented.

                    // Cancelling the animator can cause an exception since we may be removing a

                    // listener during the cancellation. See b/285666217 for more details.

                }

            }

        }

}

packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.java

+2 −4
Original line number Diff line number Diff line
@@ -240,10 +240,8 @@ public class StatusBarWindowController { 
                    Insets.of(0, safeTouchRegionHeight, 0, 0));

        }

        lp.providedInsets = new InsetsFrameProvider[] {

                new InsetsFrameProvider(mInsetsSourceOwner, 0, statusBars())

                        .setInsetsSize(Insets.of(0, height, 0, 0)),

                new InsetsFrameProvider(mInsetsSourceOwner, 0, tappableElement())

                        .setInsetsSize(Insets.of(0, height, 0, 0)),

                new InsetsFrameProvider(mInsetsSourceOwner, 0, statusBars()),

                new InsetsFrameProvider(mInsetsSourceOwner, 0, tappableElement()),

                gestureInsetsProvider

        };

        return lp;