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

Commit 3726e9b3 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Fix CompileTimeConstant ErrorProne findings in SystemUI" into tm-qpr-dev am: f8003e57 

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



Change-Id: I35c91d047796e1181543963f19467e0038c184b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8662d3ed f8003e57

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -5499,8 +5499,11 @@ public final class NotificationPanelViewController implements Dumpable { 
                if (!animatingUnlockedShadeToKeyguard) {

                if (!animatingUnlockedShadeToKeyguard) {

                    // Only make the status bar visible if we're not animating the screen off, since

                    // Only make the status bar visible if we're not animating the screen off, since

                    // we only want to be showing the clock/notifications during the animation.

                    // we only want to be showing the clock/notifications during the animation.

                    mShadeLog.v("Updating keyguard status bar state to "

                    if (keyguardShowing) {

                            + (keyguardShowing ? "visible" : "invisible"));

                        mShadeLog.v("Updating keyguard status bar state to visible");

                    } else {

                        mShadeLog.v("Updating keyguard status bar state to invisible");

                    }

                    mKeyguardStatusBarViewController.updateViewState(

                    mKeyguardStatusBarViewController.updateViewState(

                            /* alpha= */ 1f,

                            /* alpha= */ 1f,

                            keyguardShowing ? View.VISIBLE : View.INVISIBLE);

                            keyguardShowing ? View.VISIBLE : View.INVISIBLE);

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3733,7 +3733,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        }

        }

    }

    }





    private void debugLog(@CompileTimeConstant String s) {

    private void debugLog(@CompileTimeConstant final String s) {

        if (mLogger == null) {

        if (mLogger == null) {

            return;

            return;

        }

        }