Removing DeferredHandler and using a simple Handler to post callbacks
DeferredHandler was added when we were posting each icon separately, to prevent starvation. But since then we have moved to binding batct items during bind. Also fixing waitForIdle not waiting the second time. waitForIdle was using a global variable to maintain state, and was not waiting properly when its called the second time before binding deep shortcuts Original Change-Id: I9c1289cb3bfb74f86e53ec7ac6dd76bb39666b2d Change-Id: I9e6b3ae65fbd3aec3a46092efc5249c4525efedf
This commit is contained in:
@@ -16,7 +16,6 @@ import android.test.ProviderTestCase2;
|
||||
import com.android.launcher3.AllAppsList;
|
||||
import com.android.launcher3.AppFilter;
|
||||
import com.android.launcher3.AppInfo;
|
||||
import com.android.launcher3.DeferredHandler;
|
||||
import com.android.launcher3.IconCache;
|
||||
import com.android.launcher3.InvariantDeviceProfile;
|
||||
import com.android.launcher3.ItemInfo;
|
||||
@@ -36,6 +35,7 @@ import java.io.InputStreamReader;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.Executor;
|
||||
|
||||
import static org.mockito.Matchers.anyBoolean;
|
||||
import static org.mockito.Mockito.atLeast;
|
||||
@@ -102,14 +102,14 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP
|
||||
f.setAccessible(true);
|
||||
f.set(task, mockModel);
|
||||
|
||||
DeferredHandler mockHandler = mock(DeferredHandler.class);
|
||||
f = BaseModelUpdateTask.class.getDeclaredField("mUiHandler");
|
||||
Executor mockExecutor = mock(Executor.class);
|
||||
f = BaseModelUpdateTask.class.getDeclaredField("mUiExecutor");
|
||||
f.setAccessible(true);
|
||||
f.set(task, mockHandler);
|
||||
f.set(task, mockExecutor);
|
||||
|
||||
task.execute(appState, bgDataModel, allAppsList);
|
||||
ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
|
||||
verify(mockHandler, atLeast(0)).post(captor.capture());
|
||||
verify(mockExecutor, atLeast(0)).execute(captor.capture());
|
||||
|
||||
return captor.getAllValues();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user