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

Merge "7/ Clean up some usage of getLooper" into sc-dev

Browse Source
This commit is contained in:
Winson Chung
2021-01-29 17:14:59 +00:00
committed by Android (Google) Code Review
parent db10b7cb56 9211706490
commit a7e151f01a
10 changed files with 46 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TestShellExecutor.java
View File

@@ -39,6 +39,11 @@ public class TestShellExecutor implements ShellExecutor {
mRunnables.add(r);
}
@Override
public void removeAllCallbacks() {
mRunnables.clear();
}
@Override
public void removeCallbacks(Runnable r) {
mRunnables.remove(r);
@@ -49,11 +54,6 @@ public class TestShellExecutor implements ShellExecutor {
return mRunnables.contains(r);
}
@Override
public Looper getLooper() {
return null;
}
public void flushAll() {
for (Runnable r : mRunnables) {
r.run();

33
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedTimeoutHandlerTest.java
View File

@@ -33,6 +33,7 @@ import android.testing.TestableLooper;
import androidx.test.filters.SmallTest;
import com.android.wm.shell.TestShellExecutor;
import com.android.wm.shell.common.ShellExecutor;
import org.junit.Before;
@@ -48,7 +49,7 @@ import java.util.ArrayList;
@RunWith(AndroidTestingRunner.class)
public class OneHandedTimeoutHandlerTest extends OneHandedTestCase {
private OneHandedTimeoutHandler mTimeoutHandler;
private ShellExecutor mMainExecutor;
private TestShellExecutor mMainExecutor;
@Before
public void setUp() throws Exception {
@@ -104,34 +105,4 @@ public class OneHandedTimeoutHandlerTest extends OneHandedTestCase {
mTimeoutHandler.resetTimer();
assertTrue(mTimeoutHandler.hasScheduledTimeout());
}
private class TestShellExecutor implements ShellExecutor {
private ArrayList<Runnable> mExecuted = new ArrayList<>();
private ArrayList<Runnable> mDelayed = new ArrayList<>();
@Override
public void execute(Runnable runnable) {
mExecuted.add(runnable);
}
@Override
public void executeDelayed(Runnable r, long delayMillis) {
mDelayed.add(r);
}
@Override
public void removeCallbacks(Runnable r) {
mDelayed.remove(r);
}
@Override
public boolean hasCallback(Runnable r) {
return mDelayed.contains(r);
}
@Override
public Looper getLooper() {
return Looper.myLooper();
}
}
}