Merge "Add more logs to investigate disappearing home button" (6b3cb1e3) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -1940,11 +1940,6 @@ public class KeyguardViewMediator extends SystemUI {
		mContext.getSystemService(Context.STATUS_BAR_SERVICE);
		}

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

		if (mStatusBarManager == null) {
		Log.w(TAG, "Could not get status bar manager");
		} else {
		@@ -1961,6 +1956,12 @@ 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);
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -268,6 +268,8 @@ 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);

+15 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.os.UserHandle;
		import android.service.notification.NotificationStats;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.util.Slog;

		import com.android.internal.R;
		@@ -671,6 +672,20 @@ public class StatusBarManagerService extends IStatusBarService.Stub {
		// 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.contains("systemui")) {
		String disabledData = "{ ";
		for (int i = 0; i < mDisableRecords.size(); i++) {
		DisableRecord tok = mDisableRecords.get(i);
		disabledData += " ([" + i + "] " + tok + "), ";
		}
		disabledData += " }";
		Log.d(TAG, "disabledlocked (b/113914868): net1=" + net1 + ", mDisabled1=" + mDisabled1
		+ ", token=" + token + ", mDisableRecords=" + mDisableRecords.size() + " => "
		+ disabledData);
		}

		if (net1 != mDisabled1 \|\| net2 != mDisabled2) {
		mDisabled1 = net1;
		mDisabled2 = net2;