Merge "Finish incomplete merge"

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();