From 780fc519dc6f1d1962cf02b660bd5b0eafbfc77f Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 30 May 2019 21:03:49 -0700 Subject: [PATCH] Removing logs from old bug Bug: 134106231 Test: None, only log removal Change-Id: I6503f38ac25d1b2784a181182de026ec0f96e125 --- .../systemui/keyguard/KeyguardViewMediator.java | 6 ------ .../systemui/statusbar/phone/KeyguardBouncer.java | 2 -- .../statusbar/phone/NavigationBarView.java | 4 ---- .../server/statusbar/StatusBarManagerService.java | 15 --------------- 4 files changed, 27 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index ec6cfe9d8e553..9616f0a290216 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -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); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index bbae62e935c56..0b994ff46f290 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 8a895e187b317..3ec16090ea871 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -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(); diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 112104d073b06..828f79007b959 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -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);