Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix duplicate reg. KeyguardSliceViewController in DumpManager."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-25 03:23:42 +00:00
committed by Android (Google) Code Review
parent db02000f83 66d6ae823c
commit d6de4dcbd4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java
View File

@@ -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);
}
}

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

@@ -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() {