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

Commit f8003e57 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

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

parents d570ce2d e137fe51

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

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

                    // 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.

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

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

                    if (keyguardShowing) {

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

                    } else {

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

                    }

                    mKeyguardStatusBarViewController.updateViewState(

                            /* alpha= */ 1f,

                            keyguardShowing ? View.VISIBLE : View.INVISIBLE);

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

+1 −1
Original line number 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) {

            return;

        }