Merge "Removing logs from old bug" into qt-dev am: 4410d23560 (c8fcb7dc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -1930,12 +1930,6 @@ public class KeyguardViewMediator extends SystemUI {
		+ " --> flags=0x" + Integer.toHexString(flags));
		}

		// TODO(b/113914868): investigation log for disappearing home button
		Log.d(TAG, "adjustStatusBarLocked (b/113914868): flags=" + flags
		+ "mShowing=" + mShowing + " mStatusBarManager=" + mStatusBarManager
		+ " mOccluded=" + mOccluded + " isSecure=" + isSecure()
		+ " force=" + forceHideHomeRecentsButtons);

		mStatusBarManager.disable(flags);
		}
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -285,8 +285,6 @@ public class KeyguardBouncer {
		}

		public void hide(boolean destroyView) {
		// TODO(b/113914868): investigation log for disappearing home button
		Log.i(TAG, "KeyguardBouncer.hide (b/113914868): destroyView=" + destroyView);
		if (isShowing()) {
		StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
		StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__HIDDEN);

+0 −4

Original line number	Diff line number	Diff line
		@@ -597,10 +597,6 @@ public class NavigationBarView extends FrameLayout implements
		boolean disableHome = isGesturalMode(mNavBarMode)
		\|\| ((mDisabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0);

		// TODO(b/113914868): investigation log for disappearing home button
		Log.i(TAG, "updateNavButtonIcons (b/113914868): home disabled=" + disableHome
		+ " mDisabledFlags=" + mDisabledFlags);

		// Always disable recents when alternate car mode UI is active and for secondary displays.
		boolean disableRecent = isRecentsButtonDisabled();

+0 −15

Original line number	Diff line number	Diff line
		@@ -719,21 +719,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D
		// Ensure state for the current user is applied, even if passed a non-current user.
		final int net1 = gatherDisableActionsLocked(mCurrentUserId, 1);
		final int net2 = gatherDisableActionsLocked(mCurrentUserId, 2);

		// TODO(b/113914868): investigation log for disappearing home button
		if (whichFlag == 1 && pkg != null && pkg.contains("systemui")) {
		String disabledData = "{ ";
		for (int i = 0; i < mDisableRecords.size(); i++) {
		DisableRecord tok = mDisableRecords.get(i);
		disabledData += " ([" + i + "] " + tok + "), ";
		}
		disabledData += " }";
		final UiState state = getUiState(displayId);

		Log.d(TAG, "disabledlocked (b/113914868): displayId=" + displayId + ", net1=" + net1
		+ ", mDisabled1=" + state.mDisabled1 + ", token=" + token
		+ ", mDisableRecords=" + mDisableRecords.size() + " => " + disabledData);
		}
		final UiState state = getUiState(displayId);
		if (!state.disableEquals(net1, net2)) {
		state.setDisabled(net1, net2);