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

Commit 7025f26a authored by Selim Cinek's avatar Selim Cinek
Browse files

Removed logging for the empty keyguard 

Only logging the states in the bugreport now.

Bug: 21701756
Change-Id: I8252583300d0162b878dd217c8098c1d6b970ea4
parent 2020178f

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

+0 −19
Original line number Original line Diff line number Diff line
@@ -658,11 +658,6 @@ public abstract class PanelView extends FrameLayout { 
                        (animator.getDuration() * getCannedFlingDurationFactor()

                        (animator.getDuration() * getCannedFlingDurationFactor()

                                / collapseSpeedUpFactor));

                                / collapseSpeedUpFactor));

            }

            }

            if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD

                    && mStatusBar.getBarState() == StatusBarState.KEYGUARD) {

                Log.i(PhoneStatusBar.TAG, "Panel collapsed! Stacktrace: "

                        + Log.getStackTraceString(new Throwable()));

            }

        }

        }

        animator.addListener(new AnimatorListenerAdapter() {

        animator.addListener(new AnimatorListenerAdapter() {

            private boolean mCancelled;

            private boolean mCancelled;
@@ -777,15 +772,6 @@ public abstract class PanelView extends FrameLayout { 




    public void setExpandedFraction(float frac) {

    public void setExpandedFraction(float frac) {

        setExpandedHeight(getMaxPanelHeight() * frac);

        setExpandedHeight(getMaxPanelHeight() * frac);

        if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD

                && mStatusBar.getBarState() == StatusBarState.KEYGUARD) {

            if (frac == 0.0f) {

                Log.i(PhoneStatusBar.TAG, "Panel collapsed! Stacktrace: "

                        + Log.getStackTraceString(new Throwable()));

            } else if (frac == 1.0f) {

                mStatusBar.endWindowManagerLogging();

            }

        }

    }

    }





    public float getExpandedHeight() {

    public float getExpandedHeight() {
@@ -817,11 +803,6 @@ public abstract class PanelView extends FrameLayout { 
    }

    }





    public void collapse(boolean delayed, float speedUpFactor) {

    public void collapse(boolean delayed, float speedUpFactor) {

        if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD

                && mStatusBar.getBarState() == StatusBarState.KEYGUARD) {

            Log.i(PhoneStatusBar.TAG, "Panel collapsed! Stacktrace: "

                    + Log.getStackTraceString(new Throwable()));

        }

        if (DEBUG) logf("collapse: " + this);

        if (DEBUG) logf("collapse: " + this);

        if (mPeekPending || mPeekAnimator != null) {

        if (mPeekPending || mPeekAnimator != null) {

            mCollapseAfterPeek = true;

            mCollapseAfterPeek = true;

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+3 −9
Original line number Original line Diff line number Diff line
@@ -186,7 +186,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        HeadsUpManager.OnHeadsUpChangedListener {

        HeadsUpManager.OnHeadsUpChangedListener {

    static final String TAG = "PhoneStatusBar";

    static final String TAG = "PhoneStatusBar";

    public static final boolean DEBUG = BaseStatusBar.DEBUG;

    public static final boolean DEBUG = BaseStatusBar.DEBUG;

    public static final boolean DEBUG_EMPTY_KEYGUARD = true;

    public static final boolean SPEW = false;

    public static final boolean SPEW = false;

    public static final boolean DUMPTRUCK = true; // extra dumpsys info

    public static final boolean DUMPTRUCK = true; // extra dumpsys info

    public static final boolean DEBUG_GESTURES = false;

    public static final boolean DEBUG_GESTURES = false;
@@ -2013,10 +2012,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mStatusBarWindowManager.setPanelExpanded(isExpanded);

        mStatusBarWindowManager.setPanelExpanded(isExpanded);

    }

    }





    public void endWindowManagerLogging() {

        mStatusBarWindowManager.setLogState(false);

    }



    /**

    /**

     * All changes to the status bar and notifications funnel through here and are batched.

     * All changes to the status bar and notifications funnel through here and are batched.

     */

     */
@@ -2677,7 +2672,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            pw.print("  status bar gestures: ");

            pw.print("  status bar gestures: ");

            mGestureRec.dump(fd, pw, args);

            mGestureRec.dump(fd, pw, args);

        }

        }



        if (mStatusBarWindowManager != null) {

            mStatusBarWindowManager.dump(fd, pw, args);

        }

        if (mNetworkController != null) {

        if (mNetworkController != null) {

            mNetworkController.dump(fd, pw, args);

            mNetworkController.dump(fd, pw, args);

        }

        }
@@ -3588,9 +3585,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        // Make our window larger and the panel expanded.

        // Make our window larger and the panel expanded.

        makeExpandedVisible(true);

        makeExpandedVisible(true);

        mNotificationPanel.instantExpand();

        mNotificationPanel.instantExpand();

        if (DEBUG_EMPTY_KEYGUARD) {

            mStatusBarWindowManager.setLogState(true);

        }

    }

    }





    private void instantCollapseNotificationPanel() {

    private void instantCollapseNotificationPanel() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -20,14 +20,12 @@ import android.content.Context; 
import android.content.res.Resources;

import android.content.res.Resources;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.EventLog;

import android.util.EventLog;

import android.util.Log;

import android.view.MotionEvent;

import android.view.MotionEvent;

import android.view.View;

import android.view.View;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityEvent;





import com.android.systemui.EventLogTags;

import com.android.systemui.EventLogTags;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.statusbar.StatusBarState;





public class PhoneStatusBarView extends PanelBar {

public class PhoneStatusBarView extends PanelBar {

    private static final String TAG = "PhoneStatusBarView";

    private static final String TAG = "PhoneStatusBarView";
@@ -118,11 +116,6 @@ public class PhoneStatusBarView extends PanelBar { 
    @Override

    @Override

    public void onAllPanelsCollapsed() {

    public void onAllPanelsCollapsed() {

        super.onAllPanelsCollapsed();

        super.onAllPanelsCollapsed();

        if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD

                && mBar.getBarState() == StatusBarState.KEYGUARD) {

            Log.i(PhoneStatusBar.TAG, "Panel collapsed! Stacktrace: "

                    + Log.getStackTraceString(new Throwable()));

        }

        // Close the status bar in the next frame so we can show the end of the animation.

        // Close the status bar in the next frame so we can show the end of the animation.

        postOnAnimation(mHideExpandedRunnable);

        postOnAnimation(mHideExpandedRunnable);

        mLastFullyOpenedPanel = null;

        mLastFullyOpenedPanel = null;

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java

+5 −18
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.pm.ActivityInfo; 
import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.PixelFormat;

import android.graphics.PixelFormat;

import android.os.SystemProperties;

import android.os.SystemProperties;

import android.util.Log;

import android.view.Gravity;

import android.view.Gravity;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;
@@ -32,6 +31,8 @@ import com.android.systemui.keyguard.KeyguardViewMediator; 
import com.android.systemui.statusbar.BaseStatusBar;

import com.android.systemui.statusbar.BaseStatusBar;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.StatusBarState;





import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.reflect.Field;

import java.lang.reflect.Field;





/**

/**
@@ -48,7 +49,6 @@ public class StatusBarWindowManager { 
    private final boolean mKeyguardScreenRotation;

    private final boolean mKeyguardScreenRotation;





    private final State mCurrentState = new State();

    private final State mCurrentState = new State();

    private boolean mLogState;





    public StatusBarWindowManager(Context context) {

    public StatusBarWindowManager(Context context) {

        mContext = context;

        mContext = context;
@@ -183,9 +183,6 @@ public class StatusBarWindowManager { 
        applyFitsSystemWindows(state);

        applyFitsSystemWindows(state);

        applyModalFlag(state);

        applyModalFlag(state);

        if (mLp.copyFrom(mLpChanged) != 0) {

        if (mLp.copyFrom(mLpChanged) != 0) {

            if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD && mLogState) {

                logCurrentState();

            }

            mWindowManager.updateViewLayout(mStatusBarView, mLp);

            mWindowManager.updateViewLayout(mStatusBarView, mLp);

        }

        }

    }

    }
@@ -282,19 +279,9 @@ public class StatusBarWindowManager { 
        apply(mCurrentState);

        apply(mCurrentState);

    }

    }





    public void setLogState(boolean logState) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        mLogState = logState;

        pw.println("StatusBarWindowManager state:");

        if (logState) {

        pw.println(mCurrentState);

            Log.w(PhoneStatusBar.TAG, "===== Started logging WM state changes =====");

            logCurrentState();

        } else {

            Log.w(PhoneStatusBar.TAG, "===== Finished logging WM state changes =====");

        }

    }



    private void logCurrentState() {

        Log.i(PhoneStatusBar.TAG, mCurrentState.toString()

                + "\n  Expanded: " + isExpanded(mCurrentState));

    }

    }





    private static class State {

    private static class State {