fix: Conflict incoming changes from 15-dev
This commit is contained in:
1 parent
14e352c827
commit
2e76c99dad
1726 files changed
+146970
-95027
No files matched your search
@@ -15,59 +15,10 @@
|
||||
*/
|
||||
package com.android.launcher3.util;
|
||||
|
||||
import static android.content.pm.PackageInstaller.SessionParams.MODE_FULL_INSTALL;
|
||||
|
||||
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
|
||||
|
||||
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
|
||||
import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
|
||||
import static com.android.launcher3.util.TestUtil.grantWriteSecurePermission;
|
||||
import static com.android.launcher3.util.TestUtil.runOnExecutorSync;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
import android.content.ContentProvider;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageInstaller;
|
||||
import android.content.pm.PackageInstaller.SessionParams;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ProviderInfo;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Bitmap.Config;
|
||||
import android.graphics.Color;
|
||||
import android.net.Uri;
|
||||
import android.os.ParcelFileDescriptor;
|
||||
import android.os.ParcelFileDescriptor.AutoCloseOutputStream;
|
||||
import android.provider.Settings;
|
||||
import android.test.mock.MockContentResolver;
|
||||
import android.util.ArrayMap;
|
||||
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.launcher3.InvariantDeviceProfile;
|
||||
import com.android.launcher3.LauncherAppState;
|
||||
import com.android.launcher3.LauncherModel;
|
||||
import com.android.launcher3.dagger.LauncherBaseAppComponent;
|
||||
import com.android.launcher3.model.BgDataModel;
|
||||
import com.android.launcher3.model.BgDataModel.Callbacks;
|
||||
import com.android.launcher3.model.ModelDbController;
|
||||
import com.android.launcher3.testing.TestInformationProvider;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
/**
|
||||
* Utility class to help manage Launcher Model and related objects for test.
|
||||
@@ -106,238 +57,4 @@ public class LauncherModelHelper {
|
||||
TEST_ACTIVITY13,
|
||||
TEST_ACTIVITY14
|
||||
);
|
||||
|
||||
// Authority for providing a test default-workspace-layout data.
|
||||
private static final String TEST_PROVIDER_AUTHORITY =
|
||||
LauncherModelHelper.class.getName().toLowerCase();
|
||||
private static final int DEFAULT_BITMAP_SIZE = 10;
|
||||
private static final int DEFAULT_GRID_SIZE = 4;
|
||||
|
||||
public final SandboxModelContext sandboxContext;
|
||||
|
||||
private final RunnableList mDestroyTask = new RunnableList();
|
||||
|
||||
private BgDataModel mDataModel;
|
||||
|
||||
public LauncherModelHelper() {
|
||||
sandboxContext = new SandboxModelContext();
|
||||
}
|
||||
|
||||
public void setupProvider(String authority, ContentProvider provider) {
|
||||
sandboxContext.setupProvider(authority, provider);
|
||||
}
|
||||
|
||||
public LauncherModel getModel() {
|
||||
return LauncherAppState.getInstance(sandboxContext).getModel();
|
||||
}
|
||||
|
||||
public synchronized BgDataModel getBgDataModel() {
|
||||
if (mDataModel == null) {
|
||||
getModel().enqueueModelUpdateTask((taskController, dataModel, apps) ->
|
||||
mDataModel = dataModel);
|
||||
runOnExecutorSync(Executors.MODEL_EXECUTOR, () -> { });
|
||||
}
|
||||
return mDataModel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a installer session for the provided package.
|
||||
*/
|
||||
public int createInstallerSession(String pkg) throws IOException {
|
||||
SessionParams sp = new SessionParams(MODE_FULL_INSTALL);
|
||||
sp.setAppPackageName(pkg);
|
||||
Bitmap icon = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
|
||||
icon.eraseColor(Color.RED);
|
||||
sp.setAppIcon(icon);
|
||||
sp.setAppLabel(pkg);
|
||||
sp.setInstallerPackageName(ApplicationProvider.getApplicationContext().getPackageName());
|
||||
PackageInstaller pi = ApplicationProvider.getApplicationContext().getPackageManager()
|
||||
.getPackageInstaller();
|
||||
int sessionId = pi.createSession(sp);
|
||||
mDestroyTask.add(() -> pi.abandonSession(sessionId));
|
||||
return sessionId;
|
||||
}
|
||||
|
||||
public void destroy() {
|
||||
// When destroying the context, make sure that the model thread is blocked, so that no
|
||||
// new jobs get posted while we are cleaning up
|
||||
CountDownLatch l1 = new CountDownLatch(1);
|
||||
CountDownLatch l2 = new CountDownLatch(1);
|
||||
MODEL_EXECUTOR.execute(() -> {
|
||||
l1.countDown();
|
||||
waitOrThrow(l2);
|
||||
});
|
||||
waitOrThrow(l1);
|
||||
sandboxContext.onDestroy();
|
||||
l2.countDown();
|
||||
|
||||
mDestroyTask.executeAllAndDestroy();
|
||||
}
|
||||
|
||||
private void waitOrThrow(CountDownLatch latch) {
|
||||
try {
|
||||
latch.await();
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets up a mock provider to load the provided layout by default, next time the layout loads
|
||||
*/
|
||||
public LauncherModelHelper setupDefaultLayoutProvider(LauncherLayoutBuilder builder)
|
||||
throws Exception {
|
||||
grantWriteSecurePermission();
|
||||
|
||||
InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(sandboxContext);
|
||||
if (idp.numRows == 0 && idp.numColumns == 0) {
|
||||
idp.numRows = idp.numColumns = idp.numDatabaseHotseatIcons = DEFAULT_GRID_SIZE;
|
||||
}
|
||||
if (idp.iconBitmapSize == 0) {
|
||||
idp.iconBitmapSize = DEFAULT_BITMAP_SIZE;
|
||||
}
|
||||
|
||||
Settings.Secure.putString(sandboxContext.getContentResolver(), "launcher3.layout.provider",
|
||||
TEST_PROVIDER_AUTHORITY);
|
||||
|
||||
// TODO: use a wrapper class to differentiate the behavior
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
builder.build(new OutputStreamWriter(bos));
|
||||
ContentProvider cp = new TestInformationProvider() {
|
||||
|
||||
@Override
|
||||
public ParcelFileDescriptor openFile(Uri uri, String mode)
|
||||
throws FileNotFoundException {
|
||||
try {
|
||||
ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
|
||||
AutoCloseOutputStream outputStream = new AutoCloseOutputStream(pipe[1]);
|
||||
outputStream.write(bos.toByteArray());
|
||||
outputStream.flush();
|
||||
outputStream.close();
|
||||
return pipe[0];
|
||||
} catch (Exception e) {
|
||||
throw new FileNotFoundException(e.getMessage());
|
||||
}
|
||||
}
|
||||
};
|
||||
setupProvider(TEST_PROVIDER_AUTHORITY, cp);
|
||||
RoboApiWrapper.INSTANCE.registerInputStream(sandboxContext.getContentResolver(),
|
||||
ModelDbController.getLayoutUri(TEST_PROVIDER_AUTHORITY, sandboxContext),
|
||||
()-> new ByteArrayInputStream(bos.toByteArray()));
|
||||
|
||||
mDestroyTask.add(() -> runOnExecutorSync(MODEL_EXECUTOR, () ->
|
||||
Settings.Secure.putString(sandboxContext.getContentResolver(),
|
||||
"launcher3.layout.provider", "")));
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the model in memory synchronously
|
||||
*/
|
||||
public void loadModelSync() throws ExecutionException, InterruptedException {
|
||||
Callbacks mockCb = new Callbacks() { };
|
||||
MAIN_EXECUTOR.submit(() -> getModel().addCallbacksAndLoad(mockCb)).get();
|
||||
|
||||
Executors.MODEL_EXECUTOR.submit(() -> { }).get();
|
||||
getInstrumentation().waitForIdleSync();
|
||||
MAIN_EXECUTOR.submit(() -> getModel().removeCallbacks(mockCb)).get();
|
||||
}
|
||||
|
||||
public static class SandboxModelContext extends SandboxContext {
|
||||
|
||||
private final MockContentResolver mMockResolver = new MockContentResolver();
|
||||
private final ArrayMap<String, Object> mSpiedServices = new ArrayMap<>();
|
||||
private final PackageManager mPm;
|
||||
private final File mDbDir;
|
||||
|
||||
public SandboxModelContext() {
|
||||
this(ApplicationProvider.getApplicationContext());
|
||||
}
|
||||
|
||||
public SandboxModelContext(Context context) {
|
||||
super(context);
|
||||
|
||||
// System settings cache content provider. Ensure that they are statically initialized
|
||||
Settings.Secure.getString(context.getContentResolver(), "test");
|
||||
Settings.System.getString(context.getContentResolver(), "test");
|
||||
Settings.Global.getString(context.getContentResolver(), "test");
|
||||
|
||||
mPm = spy(getBaseContext().getPackageManager());
|
||||
mDbDir = new File(getCacheDir(), UUID.randomUUID().toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public File getDatabasePath(String name) {
|
||||
if (!mDbDir.exists()) {
|
||||
mDbDir.mkdirs();
|
||||
}
|
||||
return new File(mDbDir, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ContentResolver getContentResolver() {
|
||||
return mMockResolver;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void cleanUpObjects() {
|
||||
if (deleteContents(mDbDir)) {
|
||||
mDbDir.delete();
|
||||
}
|
||||
super.cleanUpObjects();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PackageManager getPackageManager() {
|
||||
return mPm;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getSystemService(String name) {
|
||||
Object service = mSpiedServices.get(name);
|
||||
return service != null ? service : super.getSystemService(name);
|
||||
}
|
||||
|
||||
public <T> T spyService(Class<T> tClass) {
|
||||
String name = getSystemServiceName(tClass);
|
||||
Object service = mSpiedServices.get(name);
|
||||
if (service != null) {
|
||||
return (T) service;
|
||||
}
|
||||
|
||||
T result = spy(getSystemService(tClass));
|
||||
mSpiedServices.put(name, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
public void setupProvider(String authority, ContentProvider provider) {
|
||||
ProviderInfo providerInfo = new ProviderInfo();
|
||||
providerInfo.authority = authority;
|
||||
providerInfo.applicationInfo = getApplicationInfo();
|
||||
provider.attachInfo(this, providerInfo);
|
||||
mMockResolver.addProvider(providerInfo.authority, provider);
|
||||
doReturn(providerInfo).when(mPm).resolveContentProvider(eq(authority), anyInt());
|
||||
}
|
||||
|
||||
private static boolean deleteContents(File dir) {
|
||||
File[] files = dir.listFiles();
|
||||
boolean success = true;
|
||||
if (files != null) {
|
||||
for (File file : files) {
|
||||
if (file.isDirectory()) {
|
||||
success &= deleteContents(file);
|
||||
}
|
||||
if (!file.delete()) {
|
||||
success = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initDaggerComponent(LauncherBaseAppComponent.Builder componentBuilder) {
|
||||
super.initDaggerComponent(componentBuilder.iconsDbName(null));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user