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

Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-24 18:38:07 +00:00
committed by Android (Google) Code Review
parent a782ff3fb7 3531dd064b
commit b952c7557e
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/TaskSnapshotLoader.java
View File

@@ -68,7 +68,7 @@ class TaskSnapshotLoader {
final File bitmapFile = reducedResolution
? mPersister.getReducedResolutionBitmapFile(taskId, userId)
: mPersister.getBitmapFile(taskId, userId);
if (!protoFile.exists() || !bitmapFile.exists()) {
if (bitmapFile == null || !protoFile.exists() || !bitmapFile.exists()) {
return null;
}
try {

24
services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java
View File

@@ -19,6 +19,7 @@ package com.android.server.wm;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -139,6 +140,29 @@ public class TaskSnapshotPersisterLoaderTest extends TaskSnapshotPersisterTestBa
assertEquals(1, removeObsoleteFilesQueueItem.getTaskId("1_reduced.jpg"));
}
@Test
public void testLowResolutionPersistAndLoadSnapshot() {
TaskSnapshot a = createSnapshot(0.5f /* reducedResolution */);
assertTrue(a.isReducedResolution());
mPersister.persistSnapshot(1 , mTestUserId, a);
mPersister.waitForQueueEmpty();
final File[] files = new File[] { new File(sFilesDir.getPath() + "/snapshots/1.proto"),
new File(sFilesDir.getPath() + "/snapshots/1_reduced.jpg")};
final File[] nonExistsFiles = new File[] {
new File(sFilesDir.getPath() + "/snapshots/1.jpg"),
};
assertTrueForFiles(files, File::exists, " must exist");
assertTrueForFiles(nonExistsFiles, file -> !file.exists(), " must not exist");
final TaskSnapshot snapshot = mLoader.loadTask(1, mTestUserId, true /* reduced */);
assertNotNull(snapshot);
assertEquals(TEST_INSETS, snapshot.getContentInsets());
assertNotNull(snapshot.getSnapshot());
assertEquals(Configuration.ORIENTATION_PORTRAIT, snapshot.getOrientation());
final TaskSnapshot snapshotNotExist = mLoader.loadTask(1, mTestUserId, false /* reduced */);
assertNull(snapshotNotExist);
}
@Test
public void testRemoveObsoleteFiles() {
mPersister.persistSnapshot(1, mTestUserId, createSnapshot());

6
services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java
View File

@@ -80,12 +80,16 @@ class TaskSnapshotPersisterTestBase extends WindowTestsBase {
}
TaskSnapshot createSnapshot() {
return createSnapshot(1f /* scale */);
}
TaskSnapshot createSnapshot(float scale) {
final GraphicBuffer buffer = GraphicBuffer.create(100, 100, PixelFormat.RGBA_8888,
USAGE_HW_TEXTURE | USAGE_SW_READ_RARELY | USAGE_SW_READ_RARELY);
Canvas c = buffer.lockCanvas();
c.drawColor(Color.RED);
buffer.unlockCanvasAndPost(c);
return new TaskSnapshot(buffer, ORIENTATION_PORTRAIT, TEST_INSETS,
false /* reducedResolution */, 1f /* scale */);
scale < 1f /* reducedResolution */, scale);
}
}