aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Check NPE and log error condition for enableTransientTaskbar in test harness." into tm-qpr-dev am: c3fc8da433

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20493898

Change-Id: Ic1bf71066475770d2a86b6880cfad73323e5d54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jon Miranda
2022-11-16 20:58:48 +00:00
committed by Automerger Merge Worker
parent c1ee357b6b c3fc8da433
commit ee5baf1555
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
View File

@@ -1,5 +1,6 @@
package com.android.quickstep;
import static com.android.launcher3.testing.shared.TestProtocol.NPE_TRANSIENT_TASKBAR;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
import android.app.Activity;
@@ -7,6 +8,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.graphics.Rect;
import android.os.Bundle;
import android.util.Log;
import androidx.annotation.Nullable;
@@ -184,9 +186,15 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
private void enableTransientTaskbar(
TouchInteractionService.TISBinder tisBinder, boolean enable) {
// Allow null-pointer to catch illegal states.
TaskbarActivityContext context = tisBinder.getTaskbarManager().getCurrentActivityContext();
DisplayController.INSTANCE.get(context).enableTransientTaskbarForTests(enable);
if (context == null) {
if (TestProtocol.sDebugTracing) {
Log.d(NPE_TRANSIENT_TASKBAR, "enableTransientTaskbar: enable=" + enable,
new Exception());
}
} else {
DisplayController.INSTANCE.get(context).enableTransientTaskbarForTests(enable);
}
}
/**

1
src/com/android/launcher3/testing/shared/TestProtocol.java
View File

@@ -148,6 +148,7 @@ public final class TestProtocol {
public static final String MISSING_PROMISE_ICON = "b/202985412";
public static final String TASKBAR_IN_APP_STATE = "b/227657604";
public static final String INCORRECT_INFO_UPDATED = "b/239465630";
public static final String NPE_TRANSIENT_TASKBAR = "b/257549303";
public static final String REQUEST_EMULATE_DISPLAY = "emulate-display";
public static final String REQUEST_STOP_EMULATE_DISPLAY = "stop-emulate-display";