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

Commit d6de4dcb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix duplicate reg. KeyguardSliceViewController in DumpManager."

parents db02000f 66d6ae82

packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java

+6 −1
Original line number Diff line number Diff line
@@ -86,7 +86,10 @@ public class KeyguardSliceViewController implements Dumpable { 
                        mLiveData.observeForever(mObserver);

                    }

                    mConfigurationController.addCallback(mConfigurationListener);

                    mDumpManager.registerDumpable(TAG, KeyguardSliceViewController.this);

                    mDumpManager.registerDumpable(

                            TAG + "@" + Integer.toHexString(

                                    KeyguardSliceViewController.this.hashCode()),

                            KeyguardSliceViewController.this);

                }



                @Override
@@ -230,5 +233,7 @@ public class KeyguardSliceViewController implements Dumpable { 
    public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {

        pw.println("  mSlice: " + mSlice);

        pw.println("  mClickActions: " + mClickActions);



        mKeyguardStatusView.dump(fd, pw, args);

    }

}

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

+0 −3
Original line number Diff line number Diff line
@@ -3072,9 +3072,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        if (mKeyguardStatusBar != null) {

            mKeyguardStatusBar.dump(fd, pw, args);

        }

        if (mKeyguardStatusView != null) {

            mKeyguardStatusView.dump(fd, pw, args);

        }

    }



    public boolean hasActiveClearableNotifications() {