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

Merge "Removing logs from old bug" into qt-dev

Browse Source 
am: 4410d23560

Change-Id: I1436ee10f53fc6d34412389d21a67d01afac3f09
This commit is contained in:
Winson Chung
2019-05-31 10:40:22 -07:00
committed by android-build-merger
parent f9c9ab4540 4410d23560
commit b1794de32b
4 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -1930,12 +1930,6 @@ public class KeyguardViewMediator extends SystemUI {
+ " --> flags=0x" + Integer.toHexString(flags)); + " --> 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); mStatusBarManager.disable(flags);
} }
} }

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
View File

@@ -285,8 +285,6 @@ public class KeyguardBouncer {
} }
public void hide(boolean destroyView) { 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()) { if (isShowing()) {
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__HIDDEN); StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__HIDDEN);

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -597,10 +597,6 @@ public class NavigationBarView extends FrameLayout implements
boolean disableHome = isGesturalMode(mNavBarMode) boolean disableHome = isGesturalMode(mNavBarMode)
|| ((mDisabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0); || ((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. // Always disable recents when alternate car mode UI is active and for secondary displays.
boolean disableRecent = isRecentsButtonDisabled(); boolean disableRecent = isRecentsButtonDisabled();

15
services/core/java/com/android/server/statusbar/StatusBarManagerService.java
View File

@@ -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. // Ensure state for the current user is applied, even if passed a non-current user.
final int net1 = gatherDisableActionsLocked(mCurrentUserId, 1); final int net1 = gatherDisableActionsLocked(mCurrentUserId, 1);
final int net2 = gatherDisableActionsLocked(mCurrentUserId, 2); 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); final UiState state = getUiState(displayId);
if (!state.disableEquals(net1, net2)) { if (!state.disableEquals(net1, net2)) {
state.setDisabled(net1, net2); state.setDisabled(net1, net2);