From 94c1b01e6e3ee86484f4c281a0ca6c3b8b0dea19 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Wed, 13 Jan 2021 11:19:27 -0800
Subject: [PATCH] Finish incomplete merge

Bug: 177440160
Test: builds
Change-Id: Idfb134838e44a72e2c1eef31740e0e2eea47b6b8
---
 .../src/com/android/wm/shell/TestShellExecutor.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TestShellExecutor.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TestShellExecutor.java
index 88b8498f27123..9eb13fb1c5e78 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TestShellExecutor.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TestShellExecutor.java
@@ -16,6 +16,8 @@
 
 package com.android.wm.shell;
 
+import android.os.Looper;
+
 import com.android.wm.shell.common.ShellExecutor;
 
 import java.util.ArrayList;
@@ -42,6 +44,16 @@ public class TestShellExecutor implements ShellExecutor {
         mRunnables.remove(r);
     }
 
+    @Override
+    public boolean hasCallback(Runnable r) {
+        return !mRunnables.isEmpty();
+    }
+
+    @Override
+    public Looper getLooper() {
+        return null;
+    }
+
     public void flushAll() {
         for (int i = mRunnables.size() - 1; i >= 0; --i) {
             mRunnables.get(i).run();