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

Commit 66d6ae82 authored Aug 24, 2020 by Dave Mankoff

Fix duplicate reg. KeyguardSliceViewController in DumpManager.

If we have multiple displays, we get multiple
KeyguardSliceViewControllers. The DumpManager doesn't like that,
so give them each unique tags.

Fixes: 166181642
Test: manual
Change-Id: I827970ee9aa0d1867c26e65ea8661fd5cae95fb1

parent 2343e72b

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

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,10 @@ public class KeyguardSliceViewController implements Dumpable {
	mLiveData.observeForever(mObserver);		mLiveData.observeForever(mObserver);
	}		}
	mConfigurationController.addCallback(mConfigurationListener);		mConfigurationController.addCallback(mConfigurationListener);
	mDumpManager.registerDumpable(TAG, KeyguardSliceViewController.this);		mDumpManager.registerDumpable(
			TAG + "@" + Integer.toHexString(
			KeyguardSliceViewController.this.hashCode()),
			KeyguardSliceViewController.this);
	}		}

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

			mKeyguardStatusView.dump(fd, pw, args);
	}		}
	}		}

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3072,9 +3072,6 @@ public class NotificationPanelViewController extends PanelViewController {
	if (mKeyguardStatusBar != null) {		if (mKeyguardStatusBar != null) {
	mKeyguardStatusBar.dump(fd, pw, args);		mKeyguardStatusBar.dump(fd, pw, args);
	}		}
	if (mKeyguardStatusView != null) {
	mKeyguardStatusView.dump(fd, pw, args);
	}
	}		}

	public boolean hasActiveClearableNotifications() {		public boolean hasActiveClearableNotifications() {