openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Resolve Test flakes" into ub-launcher3-rvc-dev

This commit is contained in:
TreeHugger Robot 2020-05-11 23:40:43 +00:00 committed by Android (Google) Code Review
parent ed31f24dbf b549819676
commit 3d668090af
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/launcher3/model/LoaderTask.java
View File

@ -851,20 +851,23 @@ public class LoaderTask implements Runnable {
}
private List<AppInfo> loadCachedPredictions() {
List<ComponentKey> componentKeys = mApp.getPredictionModel().getPredictionComponentKeys();
List<AppInfo> results = new ArrayList<>();
if (componentKeys == null) return results;
List<LauncherActivityInfo> l;
mBgDataModel.cachedPredictedItems.clear();
for (ComponentKey key : componentKeys) {
l = mLauncherApps.getActivityList(key.componentName.getPackageName(), key.user);
if (l.size() == 0) continue;
boolean quietMode = mUserManager.isQuietModeEnabled(key.user);
AppInfo info = new AppInfo(l.get(0), key.user, quietMode);
mBgDataModel.cachedPredictedItems.add(info);
mIconCache.getTitleAndIcon(info, false);
synchronized (mBgDataModel) {
List<ComponentKey> componentKeys =
mApp.getPredictionModel().getPredictionComponentKeys();
List<AppInfo> results = new ArrayList<>();
if (componentKeys == null) return results;
List<LauncherActivityInfo> l;
mBgDataModel.cachedPredictedItems.clear();
for (ComponentKey key : componentKeys) {
l = mLauncherApps.getActivityList(key.componentName.getPackageName(), key.user);
if (l.size() == 0) continue;
boolean quietMode = mUserManager.isQuietModeEnabled(key.user);
AppInfo info = new AppInfo(l.get(0), key.user, quietMode);
mBgDataModel.cachedPredictedItems.add(info);
mIconCache.getTitleAndIcon(info, false);
}
return results;
}
return results;
}
private List<LauncherActivityInfo> loadAllApps() {

11
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@ -37,6 +37,8 @@ import android.os.Debug;
import android.os.Process;
import android.os.RemoteException;
import android.os.StrictMode;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import androidx.test.InstrumentationRegistry;
@ -276,6 +278,15 @@ public abstract class AbstractLauncherUiTest {
mTargetContext = InstrumentationRegistry.getTargetContext();
mTargetPackage = mTargetContext.getPackageName();
mLauncherPid = mLauncher.getPid();
UserManager userManager = mTargetContext.getSystemService(UserManager.class);
if (userManager != null) {
for (UserHandle userHandle : userManager.getUserProfiles()) {
if (!userHandle.isSystem()) {
mDevice.executeShellCommand("pm remove-user " + userHandle.getIdentifier());
}
}
}
}
@After