Merge "Introduce FontFamily and its builder"
diff --git a/api/test-current.txt b/api/test-current.txt
index 1d08da5..9dc61ee 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -314,9 +314,6 @@
public final class SQLiteDebug {
method public static void dump(android.util.Printer, java.lang.String[]);
method public static android.database.sqlite.SQLiteDebug.PagerStats getDatabaseInfo();
- field public static final boolean DEBUG_SQL_LOG;
- field public static final boolean DEBUG_SQL_STATEMENTS;
- field public static final boolean DEBUG_SQL_TIME;
}
public static class SQLiteDebug.DbStats {
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt
index 0b94c27..3fdf1b4 100644
--- a/config/hiddenapi-light-greylist.txt
+++ b/config/hiddenapi-light-greylist.txt
@@ -6049,7 +6049,6 @@
Landroid/view/ViewHierarchyEncoder;->addProperty(Ljava/lang/String;Z)V
Landroid/view/ViewOverlay;->getOverlayView()Landroid/view/ViewGroup;
Landroid/view/ViewOverlay;->isEmpty()Z
-Landroid/view/ViewPropertyAnimator;->mRTBackend:Landroid/view/ViewPropertyAnimatorRT;
Landroid/view/ViewRootImpl$CalledFromWrongThreadException;-><init>(Ljava/lang/String;)V
Landroid/view/ViewRootImpl;->addConfigCallback(Landroid/view/ViewRootImpl$ConfigChangedCallback;)V
Landroid/view/ViewRootImpl;->cancelInvalidate(Landroid/view/View;)V
diff --git a/core/java/android/app/ActivityTaskManager.java b/core/java/android/app/ActivityTaskManager.java
index 398644af..2f18b89 100644
--- a/core/java/android/app/ActivityTaskManager.java
+++ b/core/java/android/app/ActivityTaskManager.java
@@ -204,6 +204,19 @@
}
/**
+ * Removes all visible recent tasks from the system.
+ * @hide
+ */
+ @RequiresPermission(android.Manifest.permission.REMOVE_TASKS)
+ public void removeAllVisibleRecentTasks() {
+ try {
+ getService().removeAllVisibleRecentTasks();
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Return the maximum number of recents entries that we will maintain and show.
* @hide
*/
diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl
index ece7f83..46664c6 100644
--- a/core/java/android/app/IActivityTaskManager.aidl
+++ b/core/java/android/app/IActivityTaskManager.aidl
@@ -139,6 +139,7 @@
ComponentName getCallingActivity(in IBinder token);
void setFocusedTask(int taskId);
boolean removeTask(int taskId);
+ void removeAllVisibleRecentTasks();
List<ActivityManager.RunningTaskInfo> getTasks(int maxNum);
List<ActivityManager.RunningTaskInfo> getFilteredTasks(int maxNum, int ignoreActivityType,
int ignoreWindowingMode);
diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java
index df6447a7..3597260 100644
--- a/core/java/android/database/sqlite/SQLiteConnection.java
+++ b/core/java/android/database/sqlite/SQLiteConnection.java
@@ -19,6 +19,7 @@
import android.database.Cursor;
import android.database.CursorWindow;
import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteDebug.Consts;
import android.database.sqlite.SQLiteDebug.DbStats;
import android.os.CancellationSignal;
import android.os.OperationCanceledException;
@@ -34,7 +35,6 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.Map;
@@ -90,8 +90,6 @@
private static final String TAG = "SQLiteConnection";
private static final boolean DEBUG = false;
- public static volatile boolean sLocalDebug = false;
-
private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
@@ -212,7 +210,7 @@
private void open() {
mConnectionPtr = nativeOpen(mConfiguration.path, mConfiguration.openFlags,
mConfiguration.label,
- SQLiteDebug.DEBUG_SQL_STATEMENTS, SQLiteDebug.DEBUG_SQL_TIME,
+ SQLiteDebug.Consts.DEBUG_SQL_STATEMENTS, SQLiteDebug.Consts.DEBUG_SQL_TIME,
mConfiguration.lookasideSlotSize, mConfiguration.lookasideSlotCount);
setPageSize();
setForeignKeyModeFromConfiguration();
@@ -993,10 +991,6 @@
}
private void bindArguments(PreparedStatement statement, Object[] bindArgs) {
- if (sLocalDebug) {
- Log.v(TAG, statement.mSql + " with args " + Arrays.toString(bindArgs));
- }
-
final int count = bindArgs != null ? bindArgs.length : 0;
if (count != statement.mNumParameters) {
throw new SQLiteBindOrColumnIndexOutOfRangeException(
@@ -1097,7 +1091,7 @@
printer.println(" isPrimaryConnection: " + mIsPrimaryConnection);
printer.println(" onlyAllowReadOnlyOperations: " + mOnlyAllowReadOnlyOperations);
- mRecentOperations.dump(printer, verbose);
+ mRecentOperations.dump(printer);
if (verbose) {
mPreparedStatementCache.dump(printer);
@@ -1407,7 +1401,7 @@
operation.mFinished = true;
final long execTime = operation.mEndTime - operation.mStartTime;
mPool.onStatementExecuted(execTime);
- return SQLiteDebug.DEBUG_LOG_SLOW_QUERIES && SQLiteDebug.shouldLogSlowQuery(
+ return SQLiteDebug.Consts.DEBUG_LOG_SLOW_QUERIES && SQLiteDebug.shouldLogSlowQuery(
execTime);
}
return false;
@@ -1416,7 +1410,7 @@
private void logOperationLocked(int cookie, String detail) {
final Operation operation = getOperationLocked(cookie);
StringBuilder msg = new StringBuilder();
- operation.describe(msg, false);
+ operation.describe(msg, true);
if (detail != null) {
msg.append(", ").append(detail);
}
@@ -1446,7 +1440,7 @@
}
}
- public void dump(Printer printer, boolean verbose) {
+ public void dump(Printer printer) {
synchronized (mOperations) {
printer.println(" Most recently executed operations:");
int index = mIndex;
@@ -1463,7 +1457,7 @@
String formattedStartTime = opDF.format(new Date(operation.mStartWallTime));
msg.append(formattedStartTime);
msg.append("] ");
- operation.describe(msg, verbose);
+ operation.describe(msg, false); // Never dump bingargs in a bugreport
printer.println(msg.toString());
if (index > 0) {
@@ -1498,7 +1492,7 @@
public Exception mException;
public int mCookie;
- public void describe(StringBuilder msg, boolean verbose) {
+ public void describe(StringBuilder msg, boolean allowBindArgsLog) {
msg.append(mKind);
if (mFinished) {
msg.append(" took ").append(mEndTime - mStartTime).append("ms");
@@ -1510,7 +1504,8 @@
if (mSql != null) {
msg.append(", sql=\"").append(trimSqlForDisplay(mSql)).append("\"");
}
- if (verbose && mBindArgs != null && mBindArgs.size() != 0) {
+ if (allowBindArgsLog && Consts.DEBUG_LOG_BIND_ARGS
+ && mBindArgs != null && mBindArgs.size() != 0) {
msg.append(", bindArgs=[");
final int count = mBindArgs.size();
for (int i = 0; i < count; i++) {
diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java
index d392521..790af6a 100644
--- a/core/java/android/database/sqlite/SQLiteDebug.java
+++ b/core/java/android/database/sqlite/SQLiteDebug.java
@@ -18,6 +18,7 @@
import android.annotation.TestApi;
import android.os.Build;
+import android.os.Process;
import android.os.SystemProperties;
import android.util.Log;
import android.util.Printer;
@@ -34,35 +35,53 @@
private static native void nativeGetPagerStats(PagerStats stats);
/**
- * Controls the printing of informational SQL log messages.
+ * Inner class to avoid getting the value frozen in zygote.
*
- * Enable using "adb shell setprop log.tag.SQLiteLog VERBOSE".
+ * {@hide}
*/
- public static final boolean DEBUG_SQL_LOG =
- Log.isLoggable("SQLiteLog", Log.VERBOSE);
+ public static final class Consts {
+ /**
+ * Controls the printing of informational SQL log messages.
+ *
+ * Enable using "adb shell setprop log.tag.SQLiteLog VERBOSE".
+ */
+ public static final boolean DEBUG_SQL_LOG =
+ Log.isLoggable("SQLiteLog", Log.VERBOSE);
- /**
- * Controls the printing of SQL statements as they are executed.
- *
- * Enable using "adb shell setprop log.tag.SQLiteStatements VERBOSE".
- */
- public static final boolean DEBUG_SQL_STATEMENTS =
- Log.isLoggable("SQLiteStatements", Log.VERBOSE);
+ /**
+ * Controls the printing of SQL statements as they are executed.
+ *
+ * Enable using "adb shell setprop log.tag.SQLiteStatements VERBOSE".
+ */
+ public static final boolean DEBUG_SQL_STATEMENTS =
+ Log.isLoggable("SQLiteStatements", Log.VERBOSE);
- /**
- * Controls the printing of wall-clock time taken to execute SQL statements
- * as they are executed.
- *
- * Enable using "adb shell setprop log.tag.SQLiteTime VERBOSE".
- */
- public static final boolean DEBUG_SQL_TIME =
- Log.isLoggable("SQLiteTime", Log.VERBOSE);
+ /**
+ * Controls the printing of wall-clock time taken to execute SQL statements
+ * as they are executed.
+ *
+ * Enable using "adb shell setprop log.tag.SQLiteTime VERBOSE".
+ */
+ public static final boolean DEBUG_SQL_TIME =
+ Log.isLoggable("SQLiteTime", Log.VERBOSE);
- /**
- * True to enable database performance testing instrumentation.
- * @hide
- */
- public static final boolean DEBUG_LOG_SLOW_QUERIES = Build.IS_DEBUGGABLE;
+
+ /**
+ * True to enable database performance testing instrumentation.
+ */
+ public static final boolean DEBUG_LOG_SLOW_QUERIES = Build.IS_DEBUGGABLE;
+
+ private static final String SLOW_QUERY_THRESHOLD_PROP = "db.log.slow_query_threshold";
+
+ private static final String SLOW_QUERY_THRESHOLD_UID_PROP =
+ SLOW_QUERY_THRESHOLD_PROP + "." + Process.myUid();
+
+ /**
+ * Whether to log bind args in slow query log or not.
+ */
+ public static final boolean DEBUG_LOG_BIND_ARGS = Build.IS_DEBUGGABLE
+ && SystemProperties.getBoolean("db.log.bindargs", false);
+ }
private SQLiteDebug() {
}
@@ -75,14 +94,19 @@
* be considered slow. If the value does not exist or is negative, then no queries will
* be considered slow.
*
+ * To enable it for a specific UID, "db.log.slow_query_threshold.UID" could also be used.
+ *
* This value can be changed dynamically while the system is running.
* For example, "adb shell setprop db.log.slow_query_threshold 200" will
* log all queries that take 200ms or longer to run.
* @hide
*/
- public static final boolean shouldLogSlowQuery(long elapsedTimeMillis) {
- int slowQueryMillis = SystemProperties.getInt("db.log.slow_query_threshold", -1);
- return slowQueryMillis >= 0 && elapsedTimeMillis >= slowQueryMillis;
+ public static boolean shouldLogSlowQuery(long elapsedTimeMillis) {
+ final int slowQueryMillis = Math.min(
+ SystemProperties.getInt(Consts.SLOW_QUERY_THRESHOLD_PROP, Integer.MAX_VALUE),
+ SystemProperties.getInt(Consts.SLOW_QUERY_THRESHOLD_UID_PROP,
+ Integer.MAX_VALUE));
+ return elapsedTimeMillis >= slowQueryMillis;
}
/**
diff --git a/core/java/android/view/ViewPropertyAnimator.java b/core/java/android/view/ViewPropertyAnimator.java
index 6c84b63..e3e2069 100644
--- a/core/java/android/view/ViewPropertyAnimator.java
+++ b/core/java/android/view/ViewPropertyAnimator.java
@@ -109,11 +109,6 @@
private ValueAnimator mTempValueAnimator;
/**
- * A RenderThread-driven backend that may intercept startAnimation
- */
- private ViewPropertyAnimatorRT mRTBackend;
-
- /**
* This listener is the mechanism by which the underlying Animator causes changes to the
* properties currently being animated, as well as the cleanup after an animation is
* complete.
@@ -434,9 +429,6 @@
mPendingOnStartAction = null;
mPendingOnEndAction = null;
mView.removeCallbacks(mAnimationStarter);
- if (mRTBackend != null) {
- mRTBackend.cancelAll();
- }
}
/**
@@ -859,9 +851,6 @@
* value accordingly.
*/
private void startAnimation() {
- if (mRTBackend != null && mRTBackend.startAnimation(this)) {
- return;
- }
mView.setHasTransientState(true);
ValueAnimator animator = ValueAnimator.ofFloat(1.0f);
ArrayList<NameValuesHolder> nameValueList =
diff --git a/core/java/android/view/ViewPropertyAnimatorRT.java b/core/java/android/view/ViewPropertyAnimatorRT.java
deleted file mode 100644
index de96887..0000000
--- a/core/java/android/view/ViewPropertyAnimatorRT.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.view;
-
-import android.animation.TimeInterpolator;
-import android.view.ViewPropertyAnimator.NameValuesHolder;
-import android.view.animation.Interpolator;
-import android.view.animation.LinearInterpolator;
-
-import com.android.internal.view.animation.FallbackLUTInterpolator;
-
-import java.util.ArrayList;
-
-
-/**
- * This is a RenderThread driven backend for ViewPropertyAnimator.
- */
-class ViewPropertyAnimatorRT {
-
- private static final Interpolator sLinearInterpolator = new LinearInterpolator();
-
- private final View mView;
-
- private RenderNodeAnimator mAnimators[] = new RenderNodeAnimator[RenderNodeAnimator.LAST_VALUE + 1];
-
- ViewPropertyAnimatorRT(View view) {
- mView = view;
- }
-
- /**
- * @return true if ViewPropertyAnimatorRT handled the animation,
- * false if ViewPropertyAnimator needs to handle it
- */
- public boolean startAnimation(ViewPropertyAnimator parent) {
- cancelAnimators(parent.mPendingAnimations);
- if (!canHandleAnimator(parent)) {
- return false;
- }
- doStartAnimation(parent);
- return true;
- }
-
- public void cancelAll() {
- for (int i = 0; i < mAnimators.length; i++) {
- if (mAnimators[i] != null) {
- mAnimators[i].cancel();
- mAnimators[i] = null;
- }
- }
- }
-
- private void doStartAnimation(ViewPropertyAnimator parent) {
- int size = parent.mPendingAnimations.size();
-
- long startDelay = parent.getStartDelay();
- long duration = parent.getDuration();
- TimeInterpolator interpolator = parent.getInterpolator();
- if (interpolator == null) {
- // Documented to be LinearInterpolator in ValueAnimator.setInterpolator
- interpolator = sLinearInterpolator;
- }
- if (!RenderNodeAnimator.isNativeInterpolator(interpolator)) {
- interpolator = new FallbackLUTInterpolator(interpolator, duration);
- }
- for (int i = 0; i < size; i++) {
- NameValuesHolder holder = parent.mPendingAnimations.get(i);
- int property = RenderNodeAnimator.mapViewPropertyToRenderProperty(holder.mNameConstant);
-
- final float finalValue = holder.mFromValue + holder.mDeltaValue;
- RenderNodeAnimator animator = new RenderNodeAnimator(property, finalValue);
- animator.setStartDelay(startDelay);
- animator.setDuration(duration);
- animator.setInterpolator(interpolator);
- animator.setTarget(mView);
- animator.start();
-
- mAnimators[property] = animator;
- }
-
- parent.mPendingAnimations.clear();
- }
-
- private boolean canHandleAnimator(ViewPropertyAnimator parent) {
- // TODO: Can we eliminate this entirely?
- // If RenderNode.animatorProperties() can be toggled to point at staging
- // instead then RNA can be used as the animators for software as well
- // as the updateListener fallback paths. If this can be toggled
- // at the top level somehow, combined with requiresUiRedraw, we could
- // ensure that RT does not self-animate, allowing for safe driving of
- // the animators from the UI thread using the same mechanisms
- // ViewPropertyAnimator does, just with everything sitting on a single
- // animator subsystem instead of multiple.
-
- if (parent.getUpdateListener() != null) {
- return false;
- }
- if (parent.getListener() != null) {
- // TODO support
- return false;
- }
- if (!mView.isHardwareAccelerated()) {
- // TODO handle this maybe?
- return false;
- }
- if (parent.hasActions()) {
- return false;
- }
- // Here goes nothing...
- return true;
- }
-
- private void cancelAnimators(ArrayList<NameValuesHolder> mPendingAnimations) {
- int size = mPendingAnimations.size();
- for (int i = 0; i < size; i++) {
- NameValuesHolder holder = mPendingAnimations.get(i);
- int property = RenderNodeAnimator.mapViewPropertyToRenderProperty(holder.mNameConstant);
- if (mAnimators[property] != null) {
- mAnimators[property].cancel();
- mAnimators[property] = null;
- }
- }
- }
-
-}
diff --git a/core/jni/android/graphics/Camera.cpp b/core/jni/android/graphics/Camera.cpp
index 76d6851..da95497 100644
--- a/core/jni/android/graphics/Camera.cpp
+++ b/core/jni/android/graphics/Camera.cpp
@@ -96,10 +96,12 @@
}
static void Camera_applyToCanvas(JNIEnv* env, jobject obj, jlong canvasHandle) {
- SkCanvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle)->asSkCanvas();
+ android::Canvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle);
jlong viewHandle = env->GetLongField(obj, gNativeInstanceFieldID);
Sk3DView* v = reinterpret_cast<Sk3DView*>(viewHandle);
- v->applyToCanvas(canvas);
+ SkMatrix matrix;
+ v->getMatrix(&matrix);
+ canvas->concat(matrix);
}
static jfloat Camera_dotWithNormal(JNIEnv* env, jobject obj,
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 6a3487c1..f9d81ba 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3256,6 +3256,13 @@
<permission android:name="android.permission.MODIFY_AUDIO_ROUTING"
android:protectionLevel="signature|privileged" />
+ <!-- Allows an application to modify what effects are applied to all audio
+ (matching certain criteria) from any application.
+ <p>Not for use by third-party applications.</p>
+ @hide -->
+ <permission android:name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"
+ android:protectionLevel="signature|privileged" />
+
<!-- @SystemApi Allows an application to capture video output.
<p>Not for use by third-party applications.</p> -->
<permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT"
diff --git a/graphics/java/android/graphics/Camera.java b/graphics/java/android/graphics/Camera.java
index 3388941..cbd4ead 100644
--- a/graphics/java/android/graphics/Camera.java
+++ b/graphics/java/android/graphics/Camera.java
@@ -24,8 +24,6 @@
* {@link Canvas}.
*/
public class Camera {
- private Matrix mMatrix;
-
/**
* Creates a new camera, with empty transformations.
*/
@@ -151,13 +149,7 @@
* @param canvas The Canvas to set the transform matrix onto
*/
public void applyToCanvas(Canvas canvas) {
- if (canvas.isHardwareAccelerated()) {
- if (mMatrix == null) mMatrix = new Matrix();
- getMatrix(mMatrix);
- canvas.concat(mMatrix);
- } else {
- nativeApplyToCanvas(canvas.getNativeCanvasWrapper());
- }
+ nativeApplyToCanvas(canvas.getNativeCanvasWrapper());
}
public native float dotWithNormal(float dx, float dy, float dz);
diff --git a/media/java/android/media/audiofx/DefaultEffect.java b/media/java/android/media/audiofx/DefaultEffect.java
new file mode 100644
index 0000000..a919868
--- /dev/null
+++ b/media/java/android/media/audiofx/DefaultEffect.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media.audiofx;
+
+/**
+ * DefaultEffect is the base class for controlling default audio effects linked into the
+ * Android audio framework.
+ * <p>DefaultEffects are effects that get attached automatically to all AudioTracks,
+ * AudioRecords, and MediaPlayer instances meeting some criteria.
+ * <p>Applications should not use the DefaultEffect class directly but one of its derived classes
+ * to control specific types of defaults:
+ * <ul>
+ * <li> {@link android.media.audiofx.StreamDefaultEffect}</li>
+ * </ul>
+ * <p>Creating a DefaultEffect object will register the corresponding effect engine as a default
+ * for the specified criteria. Whenever an audio session meets the criteria, an AudioEffect will
+ * be created and attached to it using the specified priority.
+ * @hide
+ */
+
+public abstract class DefaultEffect {
+ /**
+ * System wide unique default effect ID.
+ */
+ int mId;
+}
diff --git a/media/java/android/media/audiofx/StreamDefaultEffect.java b/media/java/android/media/audiofx/StreamDefaultEffect.java
new file mode 100644
index 0000000..9b1a21a
--- /dev/null
+++ b/media/java/android/media/audiofx/StreamDefaultEffect.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media.audiofx;
+
+import android.annotation.RequiresPermission;
+import android.app.ActivityThread;
+import android.util.Log;
+import java.util.UUID;
+
+/**
+ * StreamDefaultEffect is a default effect that attaches automatically to all AudioTracks and
+ * MediaPlayer instances of a given stream type.
+ * <p>see {@link android.media.audiofx.DefaultEffect} class for more details on default effects.
+ * @hide
+ */
+
+public class StreamDefaultEffect extends DefaultEffect {
+ static {
+ System.loadLibrary("audioeffect_jni");
+ }
+
+ private final static String TAG = "StreamDefaultEffect-JAVA";
+
+ /**
+ * Class constructor.
+ *
+ * @param type type of effect engine to be default. This parameter is ignored if uuid is set,
+ * and can be set to {@link android.media.audiofx.AudioEffect#EFFECT_TYPE_NULL}
+ * in that case.
+ * @param uuid unique identifier of a particular effect implementation to be default. This
+ * parameter can be set to
+ * {@link android.media.audiofx.AudioEffect#EFFECT_TYPE_NULL}, in which case only
+ * the type will be used to select the effect.
+ * @param priority the priority level requested by the application for controlling the effect
+ * engine. As the same engine can be shared by several applications, this parameter
+ * indicates how much the requesting application needs control of effect parameters.
+ * The normal priority is 0, above normal is a positive number, below normal a
+ * negative number.
+ * @param streamUsage a USAGE_* constant from {@link android.media.AudioAttributes} indicating
+ * what streams the given effect should attach to by default. Note that similar
+ * usages may share defaults.
+ *
+ * @throws java.lang.IllegalArgumentException
+ * @throws java.lang.UnsupportedOperationException
+ * @throws java.lang.RuntimeException
+ */
+ @RequiresPermission(value = android.Manifest.permission.MODIFY_DEFAULT_AUDIO_EFFECTS,
+ conditional = true) // Android Things uses an alternate permission.
+ public StreamDefaultEffect(UUID type, UUID uuid, int priority, int streamUsage) {
+ int[] id = new int[1];
+ int initResult = native_setup(type.toString(),
+ uuid.toString(),
+ priority,
+ streamUsage,
+ ActivityThread.currentOpPackageName(),
+ id);
+ if (initResult != AudioEffect.SUCCESS) {
+ Log.e(TAG, "Error code " + initResult + " when initializing StreamDefaultEffect");
+ switch (initResult) {
+ case AudioEffect.ERROR_BAD_VALUE:
+ throw (new IllegalArgumentException(
+ "Stream usage, type uuid, or implementation uuid not supported."));
+ case AudioEffect.ERROR_INVALID_OPERATION:
+ throw (new UnsupportedOperationException(
+ "Effect library not loaded"));
+ default:
+ throw (new RuntimeException(
+ "Cannot initialize effect engine for type: " + type
+ + " Error: " + initResult));
+ }
+ }
+
+ mId = id[0];
+ }
+
+
+ /**
+ * Releases the native StreamDefaultEffect resources. It is a good practice to
+ * release the default effect when done with use as control can be returned to
+ * other applications or the native resources released.
+ */
+ public void release() {
+ native_release(mId);
+ }
+
+ @Override
+ protected void finalize() {
+ release();
+ }
+
+ // ---------------------------------------------------------
+ // Native methods called from the Java side
+ // --------------------
+
+ private native final int native_setup(String type,
+ String uuid,
+ int priority,
+ int streamUsage,
+ String opPackageName,
+ int[] id);
+
+ private native final void native_release(int id);
+}
diff --git a/media/jni/audioeffect/Android.bp b/media/jni/audioeffect/Android.bp
index 2aca0c1..0063c11 100644
--- a/media/jni/audioeffect/Android.bp
+++ b/media/jni/audioeffect/Android.bp
@@ -3,6 +3,7 @@
srcs: [
"android_media_AudioEffect.cpp",
+ "android_media_StreamDefaultEffect.cpp",
"android_media_Visualizer.cpp",
],
diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp
index 51b080a3..d3ba9f2 100644
--- a/media/jni/audioeffect/android_media_AudioEffect.cpp
+++ b/media/jni/audioeffect/android_media_AudioEffect.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include "android_media_AudioEffect.h"
+
#include <stdio.h>
//#define LOG_NDEBUG 0
@@ -71,7 +73,7 @@
};
-static jint translateError(int code) {
+jint AudioEffectJni::translateNativeErrorToJava(int code) {
switch(code) {
case NO_ERROR:
return AUDIOEFFECT_SUCCESS;
@@ -81,6 +83,10 @@
return AUDIOEFFECT_ERROR_NO_INIT;
case BAD_VALUE:
return AUDIOEFFECT_ERROR_BAD_VALUE;
+ case NAME_NOT_FOUND:
+ // Name not found means the client tried to create an effect not found on the system,
+ // which is a form of bad value.
+ return AUDIOEFFECT_ERROR_BAD_VALUE;
case INVALID_OPERATION:
return AUDIOEFFECT_ERROR_INVALID_OPERATION;
case NO_MEMORY:
@@ -359,7 +365,7 @@
goto setup_failure;
}
- lStatus = translateError(lpAudioEffect->initCheck());
+ lStatus = AudioEffectJni::translateNativeErrorToJava(lpAudioEffect->initCheck());
if (lStatus != AUDIOEFFECT_SUCCESS && lStatus != AUDIOEFFECT_ERROR_ALREADY_EXISTS) {
ALOGE("AudioEffect initCheck failed %d", lStatus);
goto setup_failure;
@@ -495,7 +501,7 @@
return AUDIOEFFECT_ERROR_NO_INIT;
}
- return (jint) translateError(lpAudioEffect->setEnabled(enabled));
+ return AudioEffectJni::translateNativeErrorToJava(lpAudioEffect->setEnabled(enabled));
}
static jboolean
@@ -590,7 +596,7 @@
if (lpValue != NULL) {
env->ReleasePrimitiveArrayCritical(pJavaValue, lpValue, 0);
}
- return (jint) translateError(lStatus);
+ return AudioEffectJni::translateNativeErrorToJava(lStatus);
}
static jint
@@ -658,7 +664,7 @@
if (lStatus == NO_ERROR) {
return vsize;
}
- return (jint) translateError(lStatus);
+ return AudioEffectJni::translateNativeErrorToJava(lStatus);
}
static jint android_media_AudioEffect_native_command(JNIEnv *env, jobject thiz,
@@ -697,11 +703,12 @@
}
}
- lStatus = translateError(lpAudioEffect->command((uint32_t)cmdCode,
- (uint32_t)cmdSize,
- pCmdData,
- (uint32_t *)&replySize,
- pReplyData));
+ lStatus = AudioEffectJni::translateNativeErrorToJava(
+ lpAudioEffect->command((uint32_t)cmdCode,
+ (uint32_t)cmdSize,
+ pCmdData,
+ (uint32_t *)&replySize,
+ pReplyData));
command_Exit:
@@ -900,6 +907,7 @@
// ----------------------------------------------------------------------------
+extern int register_android_media_StreamDefaultEffect(JNIEnv *env);
extern int register_android_media_visualizer(JNIEnv *env);
int register_android_media_AudioEffect(JNIEnv *env)
@@ -924,6 +932,11 @@
goto bail;
}
+ if (register_android_media_StreamDefaultEffect(env) < 0) {
+ ALOGE("ERROR: StreamDefaultEffect native registration failed\n");
+ goto bail;
+ }
+
if (register_android_media_visualizer(env) < 0) {
ALOGE("ERROR: Visualizer native registration failed\n");
goto bail;
@@ -935,4 +948,3 @@
bail:
return result;
}
-
diff --git a/media/jni/audioeffect/android_media_AudioEffect.h b/media/jni/audioeffect/android_media_AudioEffect.h
new file mode 100644
index 0000000..1d7d75d
--- /dev/null
+++ b/media/jni/audioeffect/android_media_AudioEffect.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _ANDROID_MEDIA_AUDIO_EFFECT_H_
+#define _ANDROID_MEDIA_AUDIO_EFFECT_H_
+
+#include <jni.h>
+
+namespace android {
+
+class AudioEffectJni {
+public:
+ // Convert from native error code to AudioEffect.java error code.
+ static jint translateNativeErrorToJava(int code);
+private:
+ // Static methods only, so private constructor.
+ AudioEffectJni() = default;
+};
+
+} // namespace android
+
+#endif // _ANDROID_MEDIA_AUDIO_EFFECT_H_
diff --git a/media/jni/audioeffect/android_media_StreamDefaultEffect.cpp b/media/jni/audioeffect/android_media_StreamDefaultEffect.cpp
new file mode 100644
index 0000000..accdddb
--- /dev/null
+++ b/media/jni/audioeffect/android_media_StreamDefaultEffect.cpp
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//#define LOG_NDEBUG 0
+#define LOG_TAG "StreamDefaultEffect-JNI"
+
+#include <utils/Errors.h>
+#include <utils/Log.h>
+#include <jni.h>
+#include <nativehelper/JNIHelp.h>
+#include <android_runtime/AndroidRuntime.h>
+#include "media/AudioEffect.h"
+
+#include <nativehelper/ScopedUtfChars.h>
+
+#include "android_media_AudioEffect.h"
+
+using namespace android;
+
+static const char* const kClassPathName = "android/media/audiofx/StreamDefaultEffect";
+
+static jint android_media_StreamDefaultEffect_native_setup(JNIEnv *env,
+ jobject /*thiz*/,
+ jstring type,
+ jstring uuid,
+ jint priority,
+ jint streamUsage,
+ jstring opPackageName,
+ jintArray jId)
+{
+ ALOGV("android_media_StreamDefaultEffect_native_setup");
+ status_t lStatus = NO_ERROR;
+ jint* nId = NULL;
+ const char *typeStr = NULL;
+ const char *uuidStr = NULL;
+
+ ScopedUtfChars opPackageNameStr(env, opPackageName);
+
+ if (type != NULL) {
+ typeStr = env->GetStringUTFChars(type, NULL);
+ if (typeStr == NULL) { // Out of memory
+ lStatus = NO_MEMORY;
+ jniThrowException(env, "java/lang/RuntimeException", "Out of memory");
+ goto setup_exit;
+ }
+ }
+
+ if (uuid != NULL) {
+ uuidStr = env->GetStringUTFChars(uuid, NULL);
+ if (uuidStr == NULL) { // Out of memory
+ lStatus = NO_MEMORY;
+ jniThrowException(env, "java/lang/RuntimeException", "Out of memory");
+ goto setup_exit;
+ }
+ }
+
+ if (typeStr == NULL && uuidStr == NULL) {
+ lStatus = BAD_VALUE;
+ goto setup_exit;
+ }
+
+ nId = reinterpret_cast<jint *>(env->GetPrimitiveArrayCritical(jId, NULL));
+ if (nId == NULL) {
+ ALOGE("setup: Error retrieving id pointer");
+ lStatus = BAD_VALUE;
+ goto setup_exit;
+ }
+
+ // create the native StreamDefaultEffect.
+ audio_unique_id_t id;
+ lStatus = AudioEffect::addStreamDefaultEffect(typeStr,
+ String16(opPackageNameStr.c_str()),
+ uuidStr,
+ priority,
+ static_cast<audio_usage_t>(streamUsage),
+ &id);
+ if (lStatus != NO_ERROR) {
+ ALOGE("setup: Error adding StreamDefaultEffect");
+ goto setup_exit;
+ }
+
+ nId[0] = static_cast<jint>(id);
+
+setup_exit:
+ // Final cleanup and return.
+
+ if (nId != NULL) {
+ env->ReleasePrimitiveArrayCritical(jId, nId, 0);
+ nId = NULL;
+ }
+
+ if (uuidStr != NULL) {
+ env->ReleaseStringUTFChars(uuid, uuidStr);
+ uuidStr = NULL;
+ }
+
+ if (typeStr != NULL) {
+ env->ReleaseStringUTFChars(type, typeStr);
+ typeStr = NULL;
+ }
+
+ return AudioEffectJni::translateNativeErrorToJava(lStatus);
+}
+
+static void android_media_StreamDefaultEffect_native_release(JNIEnv */*env*/,
+ jobject /*thiz*/,
+ jint id) {
+ status_t lStatus = AudioEffect::removeStreamDefaultEffect(id);
+ if (lStatus != NO_ERROR) {
+ ALOGW("Error releasing StreamDefaultEffect: %d", lStatus);
+ }
+}
+
+// ----------------------------------------------------------------------------
+
+// Dalvik VM type signatures
+static const JNINativeMethod gMethods[] = {
+ {"native_setup", "(Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;[I)I",
+ (void *)android_media_StreamDefaultEffect_native_setup},
+ {"native_release", "(I)V", (void *)android_media_StreamDefaultEffect_native_release},
+};
+
+
+// ----------------------------------------------------------------------------
+
+int register_android_media_StreamDefaultEffect(JNIEnv *env)
+{
+ return AndroidRuntime::registerNativeMethods(env, kClassPathName, gMethods, NELEM(gMethods));
+}
diff --git a/packages/PackageInstaller/.gitignore b/packages/PackageInstaller/.gitignore
deleted file mode 100644
index 7866e9e..0000000
--- a/packages/PackageInstaller/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/
-gen/
-*.iml
-.project
-.classpath
-project.properties
diff --git a/packages/PackageInstaller/Android.bp b/packages/PackageInstaller/Android.bp
new file mode 100644
index 0000000..bc06cab
--- /dev/null
+++ b/packages/PackageInstaller/Android.bp
@@ -0,0 +1,14 @@
+android_app {
+ name: "PackageInstaller",
+
+ srcs: ["src/**/*.java"],
+
+ static_libs: [
+ "androidx.leanback_leanback",
+ "xz-java",
+ ],
+
+ certificate: "platform",
+ privileged: true,
+ platform_apis: true,
+}
\ No newline at end of file
diff --git a/packages/PackageInstaller/Android.mk b/packages/PackageInstaller/Android.mk
deleted file mode 100644
index f556b48..0000000
--- a/packages/PackageInstaller/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src)
-
-LOCAL_STATIC_ANDROID_LIBRARIES += \
- androidx.leanback_leanback
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- xz-java \
- androidx.annotation_annotation
-
-LOCAL_PACKAGE_NAME := PackageInstaller
-
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-include $(BUILD_PACKAGE)
diff --git a/packages/PackageInstaller/AndroidManifest.xml b/packages/PackageInstaller/AndroidManifest.xml
index f4b9cef..513c862 100644
--- a/packages/PackageInstaller/AndroidManifest.xml
+++ b/packages/PackageInstaller/AndroidManifest.xml
@@ -17,6 +17,7 @@
<application android:name=".PackageInstallerApplication"
android:label="@string/app_name"
+ android:icon="@drawable/ic_app_icon"
android:allowBackup="false"
android:theme="@style/DialogWhenLarge"
android:supportsRtl="true"
diff --git a/packages/PackageInstaller/res/drawable/app_icon_foreground.xml b/packages/PackageInstaller/res/drawable/app_icon_foreground.xml
new file mode 100644
index 0000000..b1f40c1
--- /dev/null
+++ b/packages/PackageInstaller/res/drawable/app_icon_foreground.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<inset
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:insetTop="12dp"
+ android:insetRight="12dp"
+ android:insetBottom="12dp"
+ android:insetLeft="12dp">
+
+ <vector
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ </vector>
+</inset>
diff --git a/packages/PackageInstaller/res/drawable/ic_app_icon.xml b/packages/PackageInstaller/res/drawable/ic_app_icon.xml
new file mode 100644
index 0000000..82c18e0
--- /dev/null
+++ b/packages/PackageInstaller/res/drawable/ic_app_icon.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@*android:color/accent_device_default_light"/>
+ <foreground android:drawable="@drawable/app_icon_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/EventResultPersister.java b/packages/PackageInstaller/src/com/android/packageinstaller/EventResultPersister.java
index 0e62889..3a94fdc 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/EventResultPersister.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/EventResultPersister.java
@@ -16,12 +16,12 @@
package com.android.packageinstaller;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInstaller;
import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.AtomicFile;
import android.util.Log;
import android.util.SparseArray;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallEventReceiver.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallEventReceiver.java
index b7d32e9..c70d7db 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallEventReceiver.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallEventReceiver.java
@@ -16,10 +16,10 @@
package com.android.packageinstaller;
+import android.annotation.NonNull;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import androidx.annotation.NonNull;
/**
* Receives install events and perists them using a {@link EventResultPersister}.
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallFailed.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallFailed.java
index 56dc71d..5ba2d32 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallFailed.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallFailed.java
@@ -16,6 +16,7 @@
package com.android.packageinstaller;
+import android.annotation.Nullable;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -28,7 +29,6 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.util.Log;
import android.widget.TextView;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java
index 22b1336..c2dd740 100755
--- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java
@@ -18,6 +18,7 @@
import static android.content.pm.PackageInstaller.SessionParams.UID_UNKNOWN;
+import android.annotation.Nullable;
import android.app.Activity;
import android.app.PendingIntent;
import android.content.Intent;
@@ -32,8 +33,6 @@
import android.widget.Button;
import android.widget.ProgressBar;
-import androidx.annotation.Nullable;
-
import com.android.internal.content.PackageHelper;
import java.io.File;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallStaging.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallStaging.java
index bf72b65..1bc9dbd 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallStaging.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallStaging.java
@@ -16,6 +16,7 @@
package com.android.packageinstaller;
+import android.annotation.Nullable;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -27,7 +28,6 @@
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.util.Log;
import java.io.File;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
index 96c6c2f..b3f1105 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
@@ -19,6 +19,7 @@
import static com.android.packageinstaller.PackageUtil.getMaxTargetSdkVersionForUid;
import android.Manifest;
+import android.annotation.Nullable;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.AppGlobals;
@@ -35,8 +36,6 @@
import android.os.RemoteException;
import android.util.Log;
-import androidx.annotation.Nullable;
-
/**
* Select which activity is the first visible activity of the installation and forward the intent to
* it.
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java
index ae902d3..94f6b31 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java
@@ -16,6 +16,7 @@
package com.android.packageinstaller;
+import android.annotation.Nullable;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Intent;
@@ -24,7 +25,6 @@
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.util.Log;
import android.widget.Button;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java b/packages/PackageInstaller/src/com/android/packageinstaller/OverlayTouchActivity.java
similarity index 85%
rename from packages/PackageInstaller/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java
rename to packages/PackageInstaller/src/com/android/packageinstaller/OverlayTouchActivity.java
index 8aa158b..1fdbd97 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/OverlayTouchActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.packageinstaller.permission.ui;
+package com.android.packageinstaller;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.app.Activity;
import android.os.Bundle;
-public class OverlayTouchActivity extends Activity {
+class OverlayTouchActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
index 83c91ea..97bafe7 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -17,6 +17,8 @@
package com.android.packageinstaller;
import android.Manifest;
+import android.annotation.NonNull;
+import android.annotation.StringRes;
import android.app.AlertDialog;
import android.app.AppGlobals;
import android.app.AppOpsManager;
@@ -47,11 +49,6 @@
import android.widget.Button;
import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
-
-import com.android.packageinstaller.permission.ui.OverlayTouchActivity;
-
import java.io.File;
/**
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java b/packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java
index 68daed7..ba4bf8a 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java
@@ -17,6 +17,8 @@
package com.android.packageinstaller;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.Activity;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -27,8 +29,6 @@
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/TemporaryFileManager.java b/packages/PackageInstaller/src/com/android/packageinstaller/TemporaryFileManager.java
index 66e93b3..f77318c 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/TemporaryFileManager.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/TemporaryFileManager.java
@@ -16,11 +16,11 @@
package com.android.packageinstaller;
+import android.annotation.NonNull;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.SystemClock;
-import androidx.annotation.NonNull;
import android.util.Log;
import java.io.File;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallEventReceiver.java b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallEventReceiver.java
index ad3cd4c..c3e9c23 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallEventReceiver.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallEventReceiver.java
@@ -16,10 +16,10 @@
package com.android.packageinstaller;
+import android.annotation.NonNull;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import androidx.annotation.NonNull;
/**
* Receives uninstall events and persists them using a {@link EventResultPersister}.
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallFinish.java b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallFinish.java
index 8282c83..5a51ac2 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallFinish.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallFinish.java
@@ -16,6 +16,7 @@
package com.android.packageinstaller;
+import android.annotation.NonNull;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
@@ -35,7 +36,6 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
-import androidx.annotation.NonNull;
import android.util.Log;
import android.widget.Toast;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallUninstalling.java b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallUninstalling.java
index e27186b..1c0aec1 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallUninstalling.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallUninstalling.java
@@ -16,6 +16,7 @@
package com.android.packageinstaller;
+import android.annotation.Nullable;
import android.app.Activity;
import android.app.ActivityThread;
import android.app.AlertDialog;
@@ -34,7 +35,6 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.os.UserHandle;
-import androidx.annotation.Nullable;
import android.util.Log;
import android.widget.Toast;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java
index d5df9f5..1a01dc0 100755
--- a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java
@@ -21,6 +21,8 @@
import static com.android.packageinstaller.PackageUtil.getMaxTargetSdkVersionForUid;
import android.Manifest;
+import android.annotation.NonNull;
+import android.annotation.StringRes;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityThread;
@@ -52,8 +54,6 @@
import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
-import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
import android.util.Log;
import com.android.packageinstaller.handheld.ErrorDialogFragment;
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/television/UninstallAppProgressFragment.java b/packages/PackageInstaller/src/com/android/packageinstaller/television/UninstallAppProgressFragment.java
index 7402a7d..af6d9c5 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/television/UninstallAppProgressFragment.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/television/UninstallAppProgressFragment.java
@@ -16,11 +16,11 @@
package com.android.packageinstaller.television;
+import android.annotation.Nullable;
import android.app.Fragment;
import android.content.Intent;
import android.os.Bundle;
import android.provider.Settings;
-import androidx.annotation.Nullable;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/packages/SystemUI/res-keyguard/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml
index 62cd4ef..db7923d 100644
--- a/packages/SystemUI/res-keyguard/values-fa/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fa/strings.xml
@@ -99,8 +99,8 @@
<string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="2162434417489128282">"<xliff:g id="NUMBER_0">%1$d</xliff:g> تلاش ناموفق برای باز کردن قفل تلفن داشتهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق دیگر، نمایه کاری پاک میشود که با آن همه دادههای نمایه حذف میشود."</string>
<string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="8966727588974691544">"<xliff:g id="NUMBER">%d</xliff:g> تلاش ناموفق برای باز کردن قفل رایانه لوحی داشتهاید. نمایه کاری پاک میشود که با آن همه دادههای نمایه حذف میشود."</string>
<string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="8476407539834855">"<xliff:g id="NUMBER">%d</xliff:g> تلاش ناموفق برای باز کردن قفل تلفن داشتهاید. نمایه کاری پاک میشود که با آن همه دادههای نمایه حذف میشود."</string>
- <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="956706236554092172">"شما الگوی باز کردن قفل را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. بعد از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب رایانامه قفل رایانه لوحی خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string>
- <string name="kg_failed_attempts_almost_at_login" product="default" msgid="8364140853305528449">"شما الگوی باز کردن قفل را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب رایانامه قفل تلفن را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="956706236554092172">"شما الگوی باز کردن قفل را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. بعد از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل رایانه لوحی خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="8364140853305528449">"شما الگوی باز کردن قفل را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل تلفن را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string>
<string name="kg_password_wrong_pin_code_pukked" msgid="3389829202093674267">"کد پین سیمکارت اشتباه است، اکنون برای باز کردن قفل دستگاهتان باید با شرکت مخابراتی تماس بگیرید."</string>
<plurals name="kg_password_wrong_pin_code" formatted="false" msgid="4314341367727055967">
<item quantity="one">کد پین سیمکارت اشتباه است، <xliff:g id="NUMBER_1">%d</xliff:g> بار دیگر میتوانید تلاش کنید.</item>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 364156a2..9c82b70 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -62,11 +62,11 @@
<string name="label_view" msgid="6304565553218192990">"Mostra"</string>
<string name="always_use_device" msgid="4015357883336738417">"Obre sempre <xliff:g id="APPLICATION">%1$s</xliff:g> quan es connecti <xliff:g id="USB_DEVICE">%2$s</xliff:g>"</string>
<string name="always_use_accessory" msgid="3257892669444535154">"Obre sempre <xliff:g id="APPLICATION">%1$s</xliff:g> quan es connecti <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>"</string>
- <string name="usb_debugging_title" msgid="4513918393387141949">"Vols permetre la depuració USB?"</string>
+ <string name="usb_debugging_title" msgid="4513918393387141949">"Vols permetre la depuració per USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"L\'empremta digital de la clau de l\'RSA de l\'equip és:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Dona sempre permís des d\'aquest equip"</string>
- <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"No es permet la depuració USB"</string>
- <string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"L\'usuari que té iniciada la sessió al dispositiu en aquest moment no pot activar la depuració USB. Per utilitzar aquesta funció, cal canviar a l\'usuari principal."</string>
+ <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"No es permet la depuració per USB"</string>
+ <string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"L\'usuari que té iniciada la sessió al dispositiu en aquest moment no pot activar la depuració per USB. Per utilitzar aquesta funció, cal canviar a l\'usuari principal."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom per omplir pantalla"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Estira per omplir pant."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captura de pantalla"</string>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index d72b1d1..5b99dd4 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -64,11 +64,11 @@
<string name="label_view" msgid="6304565553218192990">"Zobrazit"</string>
<string name="always_use_device" msgid="4015357883336738417">"Když bude připojeno zařízení <xliff:g id="USB_DEVICE">%2$s</xliff:g>, vždy otevřít <xliff:g id="APPLICATION">%1$s</xliff:g>"</string>
<string name="always_use_accessory" msgid="3257892669444535154">"Když bude připojeno zařízení <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>, vždy otevřít <xliff:g id="APPLICATION">%1$s</xliff:g>"</string>
- <string name="usb_debugging_title" msgid="4513918393387141949">"Povolit ladění USB?"</string>
+ <string name="usb_debugging_title" msgid="4513918393387141949">"Povolit ladění přes USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Digitální otisk RSA počítače je:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Vždy povolit z tohoto počítače"</string>
- <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ladění USB není povoleno"</string>
- <string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Uživatel aktuálně přihlášený k tomuto zařízení nemůže zapnout ladění USB. Chcete-li tuto funkci použít, přepněte na primárního uživatele."</string>
+ <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ladění přes USB není povoleno"</string>
+ <string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Uživatel aktuálně přihlášený k tomuto zařízení nemůže zapnout ladění přes USB. Chcete-li tuto funkci použít, přepněte na primárního uživatele."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Přiblížit na celou obrazovku"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Na celou obrazovku"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Snímek obrazovky"</string>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index 34ab46f..db393c0 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -472,28 +472,28 @@
<string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"سازمان شما مرجع گواهینامهای در نمایه کاری شما نصب کرده است. ممکن است ترافیک امن شبکه شما پایش یا تغییر داده شود."</string>
<string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"مرجع گواهینامهای در این دستگاه نصب شده است. ممکن است ترافیک امن شبکه شما پایش یا تغییر داده شود."</string>
<string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"سرپرست سیستم شما گزارشگیری از شبکه را (که ترافیک دستگاه شما را پایش میکند) روشن کرده است."</string>
- <string name="monitoring_description_named_vpn" msgid="7403457334088909254">"به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل شدهاید، که میتواند فعالیت شبکه شما را (ازجمله رایانامهها، برنامهها و وبسایتها) پایش کند."</string>
- <string name="monitoring_description_two_named_vpns" msgid="4198511413729213802">"به <xliff:g id="VPN_APP_0">%1$s</xliff:g> و <xliff:g id="VPN_APP_1">%2$s</xliff:g> متصل شدهاید، که میتوانند فعالیت شما را در شبکه (ازجمله رایانامهها، برنامهها و وبسایتها) پایش کنند."</string>
- <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"نمایه کاری شما به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل است، که میتواند فعالیت شما در شبکه (ازجمله رایانامهها، برنامهها و وبسایتها) را پایش کند."</string>
- <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"نمایه شخصی شما به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل شده است، که میتواند فعالیت شما در شبکه (ازجمله رایانامهها، برنامهها و وبسایتها) را پایش کند."</string>
+ <string name="monitoring_description_named_vpn" msgid="7403457334088909254">"به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل شدهاید، که میتواند فعالیت شبکه شما را (ازجمله ایمیلها، برنامهها و وبسایتها) پایش کند."</string>
+ <string name="monitoring_description_two_named_vpns" msgid="4198511413729213802">"به <xliff:g id="VPN_APP_0">%1$s</xliff:g> و <xliff:g id="VPN_APP_1">%2$s</xliff:g> متصل شدهاید، که میتوانند فعالیت شما را در شبکه (ازجمله ایمیلها، برنامهها و وبسایتها) پایش کنند."</string>
+ <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"نمایه کاری شما به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل است، که میتواند فعالیت شما در شبکه (ازجمله ایمیلها، برنامهها و وبسایتها) را پایش کند."</string>
+ <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"نمایه شخصی شما به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل شده است، که میتواند فعالیت شما در شبکه (ازجمله ایمیلها، برنامهها و وبسایتها) را پایش کند."</string>
<string name="monitoring_description_do_header_generic" msgid="96588491028288691">"<xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g> دستگاه شما را مدیریت میکند."</string>
<string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> با استفاده از <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> دستگاهتان را مدیریت میکند."</string>
<string name="monitoring_description_do_body" msgid="3639594537660975895">"سرپرست سیستم شما میتواند تنظیمات، دسترسی شرکتی، برنامهها، دادههای مرتبط با دستگاه و اطلاعات مکان دستگاه شما را مدیریت کند و بر آنها نظارت داشته باشد."</string>
<string name="monitoring_description_do_learn_more_separator" msgid="3785251953067436862">" "</string>
<string name="monitoring_description_do_learn_more" msgid="1849514470437907421">"بیشتر بدانید"</string>
- <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"به <xliff:g id="VPN_APP">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شما را (ازجمله رایانامهها، برنامهها و وبسایتها) کنترل کند."</string>
+ <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"به <xliff:g id="VPN_APP">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شما را (ازجمله ایمیلها، برنامهها و وبسایتها) کنترل کند."</string>
<string name="monitoring_description_vpn_settings_separator" msgid="1933186756733474388">" "</string>
<string name="monitoring_description_vpn_settings" msgid="6434859242636063861">"باز کردن تنظیمات VPN"</string>
<string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string>
<string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"باز کردن اعتبارنامه مورداعتماد"</string>
<string name="monitoring_description_network_logging" msgid="7223505523384076027">"سرپرست سیستم شما گزارشگیری شبکه را (که بر ترافیک دستگاهتان نظارت میکند) روشن کرده است.\n\nبرای اطلاعات بیشتر، با سرپرست خود تماس بگیرید."</string>
- <string name="monitoring_description_vpn" msgid="4445150119515393526">"شما به برنامهای برای تنظیم اتصال VPN اجازه دادید.\n\n این برنامه میتواند دستگاه و فعالیت شبکهتان را کنترل کند، از جمله رایانامه، برنامه و وبسایتها."</string>
- <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"نمایه کاری شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود.\n\nسرپرست سیستم شما میتواند بر فعالیت شبکه شما (ازجمله رایانامهها، برنامهها و وبسایتها) نظارت داشته باشد.\n\nبرای اطلاعات بیشتر، با سرپرست خود تماس بگیرید.\n\nهمچنین به VPN متصل هستید که میتواند بر فعالیت شبکه شما نظارت داشته باشد."</string>
+ <string name="monitoring_description_vpn" msgid="4445150119515393526">"شما به برنامهای برای تنظیم اتصال VPN اجازه دادید.\n\n این برنامه میتواند دستگاه و فعالیت شبکهتان را کنترل کند، از جمله ایمیل، برنامه و وبسایتها."</string>
+ <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"نمایه کاری شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود.\n\nسرپرست سیستم شما میتواند بر فعالیت شبکه شما (ازجمله ایمیلها، برنامهها و وبسایتها) نظارت داشته باشد.\n\nبرای اطلاعات بیشتر، با سرپرست خود تماس بگیرید.\n\nهمچنین به VPN متصل هستید که میتواند بر فعالیت شبکه شما نظارت داشته باشد."</string>
<string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string>
- <string name="monitoring_description_app" msgid="1828472472674709532">"شما به <xliff:g id="APPLICATION">%1$s</xliff:g> متصل هستید، که میتواند فعالیت شما در شبکه (ازجمله رایانامه، برنامه و وبسایتها) را پایش کند."</string>
- <string name="monitoring_description_app_personal" msgid="484599052118316268">"شما به <xliff:g id="APPLICATION">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شخصی شما از جمله رایانامه، برنامه و وبسایتها را کنترل کند."</string>
- <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"به <xliff:g id="APPLICATION">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شخصی شما را (ازجمله رایانامهها، برنامهها و وبسایتها) کنترل کند."</string>
- <string name="monitoring_description_app_work" msgid="4612997849787922906">"نمایه کاری شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود. این نمایه به <xliff:g id="APPLICATION">%2$s</xliff:g> متصل است که میتواند فعالیت شما در شبکه (ازجمله رایانامهها، برنامهها و وبسایتها) را پایش کند.\n\nبرای اطلاعات بیشتر، با سرپرست سیستم تماس بگیرید."</string>
+ <string name="monitoring_description_app" msgid="1828472472674709532">"شما به <xliff:g id="APPLICATION">%1$s</xliff:g> متصل هستید، که میتواند فعالیت شما در شبکه (ازجمله ایمیل، برنامه و وبسایتها) را پایش کند."</string>
+ <string name="monitoring_description_app_personal" msgid="484599052118316268">"شما به <xliff:g id="APPLICATION">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شخصی شما از جمله ایمیل، برنامه و وبسایتها را کنترل کند."</string>
+ <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"به <xliff:g id="APPLICATION">%1$s</xliff:g> وصل شدهاید که میتواند فعالیت شبکه شخصی شما را (ازجمله ایمیلها، برنامهها و وبسایتها) کنترل کند."</string>
+ <string name="monitoring_description_app_work" msgid="4612997849787922906">"نمایه کاری شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود. این نمایه به <xliff:g id="APPLICATION">%2$s</xliff:g> متصل است که میتواند فعالیت شما در شبکه (ازجمله ایمیلها، برنامهها و وبسایتها) را پایش کند.\n\nبرای اطلاعات بیشتر، با سرپرست سیستم تماس بگیرید."</string>
<string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"نمایه کاریتان توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود. این نمایه به <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> متصل است که میتواند تنظیمات، دسترسی شرکتی، برنامهها، دادههای مرتبط با دستگاه و اطلاعات مکان دستگاه شما را پایش کند.\n\nشما همچنین به <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> متصل هستید که میتواند فعالیت خصوصی شما را در شبکه پایش کند."</string>
<string name="keyguard_indication_trust_granted" msgid="4985003749105182372">"قفل برای <xliff:g id="USER_NAME">%1$s</xliff:g> باز شد"</string>
<string name="keyguard_indication_trust_managed" msgid="8319646760022357585">"<xliff:g id="TRUST_AGENT">%1$s</xliff:g> درحال اجرا است"</string>
@@ -681,7 +681,7 @@
<string name="keyboard_shortcut_group_applications_assist" msgid="9095441910537146013">"دستیار"</string>
<string name="keyboard_shortcut_group_applications_browser" msgid="6465985474000766533">"مرورگر"</string>
<string name="keyboard_shortcut_group_applications_contacts" msgid="2064197111278436375">"مخاطبین"</string>
- <string name="keyboard_shortcut_group_applications_email" msgid="6257036897441939004">"رایانامه"</string>
+ <string name="keyboard_shortcut_group_applications_email" msgid="6257036897441939004">"ایمیل"</string>
<string name="keyboard_shortcut_group_applications_sms" msgid="638701213803242744">"پیامک"</string>
<string name="keyboard_shortcut_group_applications_music" msgid="4775559515850922780">"موسیقی"</string>
<string name="keyboard_shortcut_group_applications_youtube" msgid="6555453761294723317">"YouTube"</string>
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java
index dce72b4..0ded963 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java
@@ -394,6 +394,22 @@
}
/**
+ * Removes all the recent tasks.
+ */
+ public void removeAllRecentTasks() {
+ mBackgroundExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ ActivityTaskManager.getService().removeAllVisibleRecentTasks();
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed to remove all tasks", e);
+ }
+ }
+ });
+ }
+
+ /**
* Cancels the current window transtion to/from Recents for the given task id.
*/
public void cancelWindowTransition(int taskId) {
diff --git a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
index 4bb4c24..3c44eb4 100644
--- a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
+++ b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
@@ -340,7 +340,8 @@
boolean bound = false;
try {
bound = mContext.bindServiceAsUser(launcherServiceIntent,
- mOverviewServiceConnection, Context.BIND_AUTO_CREATE,
+ mOverviewServiceConnection,
+ Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,
UserHandle.of(mDeviceProvisionedController.getCurrentUser()));
} catch (SecurityException e) {
Log.e(TAG_OPS, "Unable to bind because of security error", e);
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index d1585cf..609ad75 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3230,12 +3230,12 @@
}
@Override
- public void onRecentTaskRemoved(TaskRecord task, boolean wasTrimmed) {
+ public void onRecentTaskRemoved(TaskRecord task, boolean wasTrimmed, boolean killProcess) {
if (wasTrimmed) {
// Task was trimmed from the recent tasks list -- remove the active task record as well
// since the user won't really be able to go back to it
- removeTaskByIdLocked(task.taskId, false /* killProcess */,
- false /* removeFromRecents */, !PAUSE_IMMEDIATELY, "recent-task-trimmed");
+ removeTaskByIdLocked(task.taskId, killProcess, false /* removeFromRecents */,
+ !PAUSE_IMMEDIATELY, "recent-task-trimmed");
}
task.removedFromRecents();
}
diff --git a/services/core/java/com/android/server/am/ActivityTaskManagerService.java b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
index 748b2d2..54c2ee5 100644
--- a/services/core/java/com/android/server/am/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
@@ -27,6 +27,7 @@
import static android.Manifest.permission.START_TASKS_FROM_RECENTS;
import static android.Manifest.permission.STOP_APP_SWITCHES;
import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
+import static android.content.pm.PackageManager.FEATURE_PC;
import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
import static android.provider.Settings.Global.HIDE_ERROR_DIALOGS;
import static android.provider.Settings.System.FONT_SCALE;
@@ -541,6 +542,7 @@
final boolean forceRtl = Settings.Global.getInt(resolver, DEVELOPMENT_FORCE_RTL, 0) != 0;
final boolean forceResizable = Settings.Global.getInt(
resolver, DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, 0) != 0;
+ final boolean isPc = mContext.getPackageManager().hasSystemFeature(FEATURE_PC);
// Transfer any global setting for forcing RTL layout, into a System Property
SystemProperties.set(DEVELOPMENT_FORCE_RTL, forceRtl ? "1":"0");
@@ -573,6 +575,8 @@
}
mWindowManager.setForceResizableTasks(mForceResizableActivities);
mWindowManager.setSupportsPictureInPicture(mSupportsPictureInPicture);
+ mWindowManager.setSupportsFreeformWindowManagement(mSupportsFreeformWindowManagement);
+ mWindowManager.setIsPc(isPc);
// This happens before any activities are started, so we can change global configuration
// in-place.
updateConfigurationLocked(configuration, null, true);
@@ -1668,6 +1672,19 @@
}
@Override
+ public void removeAllVisibleRecentTasks() {
+ enforceCallerIsRecentsOrHasPermission(REMOVE_TASKS, "removeAllVisibleRecentTasks()");
+ synchronized (mGlobalLock) {
+ final long ident = Binder.clearCallingIdentity();
+ try {
+ getRecentTasks().removeAllVisibleTasks();
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
+ }
+ }
+
+ @Override
public boolean shouldUpRecreateTask(IBinder token, String destAffinity) {
synchronized (mGlobalLock) {
final ActivityRecord srec = ActivityRecord.forTokenLocked(token);
diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index fb6b5c1..e11e003 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -106,7 +106,6 @@
private static final String TAG = TAG_WITH_CLASS_NAME ? "RecentTasks" : TAG_AM;
private static final String TAG_RECENTS = TAG + POSTFIX_RECENTS;
private static final String TAG_TASKS = TAG + POSTFIX_TASKS;
- private static final boolean TRIMMED = true;
private static final int DEFAULT_INITIAL_CAPACITY = 5;
@@ -134,7 +133,7 @@
/**
* Called when a task is removed from the recent tasks list.
*/
- void onRecentTaskRemoved(TaskRecord task, boolean wasTrimmed);
+ void onRecentTaskRemoved(TaskRecord task, boolean wasTrimmed, boolean killProcess);
}
/**
@@ -322,9 +321,9 @@
}
}
- private void notifyTaskRemoved(TaskRecord task, boolean wasTrimmed) {
+ private void notifyTaskRemoved(TaskRecord task, boolean wasTrimmed, boolean killProcess) {
for (int i = 0; i < mCallbacks.size(); i++) {
- mCallbacks.get(i).onRecentTaskRemoved(task, wasTrimmed);
+ mCallbacks.get(i).onRecentTaskRemoved(task, wasTrimmed, killProcess);
}
}
@@ -547,6 +546,16 @@
}
}
+ void removeAllVisibleTasks() {
+ for (int i = mTasks.size() - 1; i >= 0; --i) {
+ final TaskRecord tr = mTasks.get(i);
+ if (isVisibleRecentTask(tr)) {
+ mTasks.remove(i);
+ notifyTaskRemoved(tr, true /* wasTrimmed */, true /* killProcess */);
+ }
+ }
+ }
+
void cleanupDisabledPackageTasksLocked(String packageName, Set<String> filterByClasses,
int userId) {
for (int i = mTasks.size() - 1; i >= 0; --i) {
@@ -1048,7 +1057,7 @@
*/
void remove(TaskRecord task) {
mTasks.remove(task);
- notifyTaskRemoved(task, !TRIMMED);
+ notifyTaskRemoved(task, false /* wasTrimmed */, false /* killProcess */);
}
/**
@@ -1060,7 +1069,7 @@
// Remove from the end of the list until we reach the max number of recents
while (recentsCount > mGlobalMaxNumTasks) {
final TaskRecord tr = mTasks.remove(recentsCount - 1);
- notifyTaskRemoved(tr, TRIMMED);
+ notifyTaskRemoved(tr, true /* wasTrimmed */, false /* killProcess */);
recentsCount--;
if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "Trimming over max-recents task=" + tr
+ " max=" + mGlobalMaxNumTasks);
@@ -1114,7 +1123,7 @@
// Task is no longer active, trim it from the list
mTasks.remove(task);
- notifyTaskRemoved(task, TRIMMED);
+ notifyTaskRemoved(task, true /* wasTrimmed */, false /* killProcess */);
notifyTaskPersisterLocked(task, false /* flush */);
}
}
@@ -1268,7 +1277,7 @@
// callbacks here.
final TaskRecord removedTask = mTasks.remove(removeIndex);
if (removedTask != task) {
- notifyTaskRemoved(removedTask, !TRIMMED);
+ notifyTaskRemoved(removedTask, false /* wasTrimmed */, false /* killProcess */);
if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "Trimming task=" + removedTask
+ " for addition of task=" + task);
}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index d7d5cf8..4ab06a2 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1389,9 +1389,7 @@
final int dw = displayInfo.logicalWidth;
final int dh = displayInfo.logicalHeight;
config.orientation = (dw <= dh) ? ORIENTATION_PORTRAIT : ORIENTATION_LANDSCAPE;
- // TODO: Probably best to set this based on some setting in the display content object,
- // so the display can be configured for things like fullscreen.
- config.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
+ config.windowConfiguration.setWindowingMode(getWindowingMode());
final float density = mDisplayMetrics.density;
config.screenWidthDp =
diff --git a/services/core/java/com/android/server/wm/DisplaySettings.java b/services/core/java/com/android/server/wm/DisplaySettings.java
index 97b64dc..bbb690f 100644
--- a/services/core/java/com/android/server/wm/DisplaySettings.java
+++ b/services/core/java/com/android/server/wm/DisplaySettings.java
@@ -19,12 +19,19 @@
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
+import android.app.WindowConfiguration;
+import android.content.Context;
+import android.content.pm.PackageManager;
import android.graphics.Rect;
import android.os.Environment;
+import android.provider.Settings;
import android.util.AtomicFile;
import android.util.Slog;
import android.util.Xml;
+import android.view.Display;
+import android.view.DisplayInfo;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.XmlUtils;
@@ -43,37 +50,48 @@
/**
* Current persistent settings about a display
*/
-public class DisplaySettings {
+class DisplaySettings {
private static final String TAG = TAG_WITH_CLASS_NAME ? "DisplaySettings" : TAG_WM;
+ private final WindowManagerService mService;
private final AtomicFile mFile;
private final HashMap<String, Entry> mEntries = new HashMap<String, Entry>();
- public static class Entry {
- public final String name;
- public int overscanLeft;
- public int overscanTop;
- public int overscanRight;
- public int overscanBottom;
+ private static class Entry {
+ private final String name;
+ private int overscanLeft;
+ private int overscanTop;
+ private int overscanRight;
+ private int overscanBottom;
+ private int windowingMode = WindowConfiguration.WINDOWING_MODE_UNDEFINED;
- public Entry(String _name) {
+ private Entry(String _name) {
name = _name;
}
}
- public DisplaySettings() {
- File dataDir = Environment.getDataDirectory();
- File systemDir = new File(dataDir, "system");
- mFile = new AtomicFile(new File(systemDir, "display_settings.xml"), "wm-displays");
+ DisplaySettings(WindowManagerService service) {
+ this(service, new File(Environment.getDataDirectory(), "system"));
}
- public void getOverscanLocked(String name, String uniqueId, Rect outRect) {
+ @VisibleForTesting
+ DisplaySettings(WindowManagerService service, File folder) {
+ mService = service;
+ mFile = new AtomicFile(new File(folder, "display_settings.xml"), "wm-displays");
+ }
+
+ private Entry getEntry(String name, String uniqueId) {
// Try to get the entry with the unique if possible.
// Else, fall back on the display name.
Entry entry;
if (uniqueId == null || (entry = mEntries.get(uniqueId)) == null) {
entry = mEntries.get(name);
}
+ return entry;
+ }
+
+ private void getOverscanLocked(String name, String uniqueId, Rect outRect) {
+ final Entry entry = getEntry(name, uniqueId);
if (entry != null) {
outRect.left = entry.overscanLeft;
outRect.top = entry.overscanTop;
@@ -84,7 +102,7 @@
}
}
- public void setOverscanLocked(String uniqueId, String name, int left, int top, int right,
+ void setOverscanLocked(String uniqueId, String name, int left, int top, int right,
int bottom) {
if (left == 0 && top == 0 && right == 0 && bottom == 0) {
// Right now all we are storing is overscan; if there is no overscan,
@@ -105,7 +123,47 @@
entry.overscanBottom = bottom;
}
- public void readSettingsLocked() {
+ private int getWindowingModeLocked(String name, String uniqueId, int displayId) {
+ final Entry entry = getEntry(name, uniqueId);
+ int windowingMode = entry != null ? entry.windowingMode
+ : WindowConfiguration.WINDOWING_MODE_UNDEFINED;
+ // This display used to be in freeform, but we don't support freeform anymore, so fall
+ // back to fullscreen.
+ if (windowingMode == WindowConfiguration.WINDOWING_MODE_FREEFORM
+ && !mService.mSupportsFreeformWindowManagement) {
+ return WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
+ }
+ // No record is present so use default windowing mode policy.
+ if (windowingMode == WindowConfiguration.WINDOWING_MODE_UNDEFINED) {
+ if (displayId == Display.DEFAULT_DISPLAY) {
+ windowingMode = (mService.mIsPc && mService.mSupportsFreeformWindowManagement)
+ ? WindowConfiguration.WINDOWING_MODE_FREEFORM
+ : WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
+ } else {
+ windowingMode = mService.mSupportsFreeformWindowManagement
+ ? WindowConfiguration.WINDOWING_MODE_FREEFORM
+ : WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
+ }
+ }
+ return windowingMode;
+ }
+
+ void applySettingsToDisplayLocked(DisplayContent dc) {
+ final DisplayInfo displayInfo = dc.getDisplayInfo();
+
+ // Setting windowing mode first, because it may override overscan values later.
+ dc.setWindowingMode(getWindowingModeLocked(displayInfo.name, displayInfo.uniqueId,
+ dc.getDisplayId()));
+
+ final Rect rect = new Rect();
+ getOverscanLocked(displayInfo.name, displayInfo.uniqueId, rect);
+ displayInfo.overscanLeft = rect.left;
+ displayInfo.overscanTop = rect.top;
+ displayInfo.overscanRight = rect.right;
+ displayInfo.overscanBottom = rect.bottom;
+ }
+
+ void readSettingsLocked() {
FileInputStream stream;
try {
stream = mFile.openRead();
@@ -169,11 +227,15 @@
}
private int getIntAttribute(XmlPullParser parser, String name) {
+ return getIntAttribute(parser, name, 0 /* defaultValue */);
+ }
+
+ private int getIntAttribute(XmlPullParser parser, String name, int defaultValue) {
try {
String str = parser.getAttributeValue(null, name);
- return str != null ? Integer.parseInt(str) : 0;
+ return str != null ? Integer.parseInt(str) : defaultValue;
} catch (NumberFormatException e) {
- return 0;
+ return defaultValue;
}
}
@@ -186,12 +248,14 @@
entry.overscanTop = getIntAttribute(parser, "overscanTop");
entry.overscanRight = getIntAttribute(parser, "overscanRight");
entry.overscanBottom = getIntAttribute(parser, "overscanBottom");
+ entry.windowingMode = getIntAttribute(parser, "windowingMode",
+ WindowConfiguration.WINDOWING_MODE_UNDEFINED);
mEntries.put(name, entry);
}
XmlUtils.skipCurrentTag(parser);
}
- public void writeSettingsLocked() {
+ void writeSettingsLocked() {
FileOutputStream stream;
try {
stream = mFile.startWrite();
@@ -221,6 +285,9 @@
if (entry.overscanBottom != 0) {
out.attribute(null, "overscanBottom", Integer.toString(entry.overscanBottom));
}
+ if (entry.windowingMode != WindowConfiguration.WINDOWING_MODE_UNDEFINED) {
+ out.attribute(null, "windowingMode", Integer.toString(entry.windowingMode));
+ }
out.endTag(null, "display");
}
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index ca4fa64..a6bda37 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -224,16 +224,11 @@
if (DEBUG_DISPLAY) Slog.v(TAG_WM, "Adding display=" + display);
- final DisplayInfo displayInfo = dc.getDisplayInfo();
- final Rect rect = new Rect();
- mService.mDisplaySettings.getOverscanLocked(displayInfo.name, displayInfo.uniqueId, rect);
- displayInfo.overscanLeft = rect.left;
- displayInfo.overscanTop = rect.top;
- displayInfo.overscanRight = rect.right;
- displayInfo.overscanBottom = rect.bottom;
+ mService.mDisplaySettings.applySettingsToDisplayLocked(dc);
+
if (mService.mDisplayManagerInternal != null) {
mService.mDisplayManagerInternal.setDisplayInfoOverrideFromWindowManager(
- displayId, displayInfo);
+ displayId, dc.getDisplayInfo());
dc.configureDisplayPolicy();
// Tap Listeners are supported for:
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index ea68e17..ab735af 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -565,6 +565,8 @@
boolean mForceResizableTasks = false;
boolean mSupportsPictureInPicture = false;
+ boolean mSupportsFreeformWindowManagement = false;
+ boolean mIsPc = false;
boolean mDisableTransitionAnimation = false;
@@ -953,7 +955,7 @@
com.android.internal.R.bool.config_disableTransitionAnimation);
mInputManager = inputManager; // Must be before createDisplayContentLocked.
mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
- mDisplaySettings = new DisplaySettings();
+ mDisplaySettings = new DisplaySettings(this);
mDisplaySettings.readSettingsLocked();
mPolicy = policy;
@@ -6910,6 +6912,18 @@
}
}
+ public void setSupportsFreeformWindowManagement(boolean supportsFreeformWindowManagement) {
+ synchronized (mWindowMap) {
+ mSupportsFreeformWindowManagement = supportsFreeformWindowManagement;
+ }
+ }
+
+ public void setIsPc(boolean isPc) {
+ synchronized (mWindowMap) {
+ mIsPc = isPc;
+ }
+ }
+
static int dipToPixel(int dip, DisplayMetrics displayMetrics) {
return (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dip, displayMetrics);
}
diff --git a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
index 227a70f..ee484d6 100644
--- a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
@@ -17,6 +17,7 @@
package com.android.server.am;
import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
+import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
@@ -43,6 +44,7 @@
import android.app.ActivityManager.RecentTaskInfo;
import android.app.ActivityManager.RunningTaskInfo;
import android.app.ActivityTaskManager;
+import android.app.WindowConfiguration;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -51,7 +53,6 @@
import android.content.res.Configuration;
import android.graphics.Rect;
import android.os.Bundle;
-import android.os.Debug;
import android.os.Looper;
import android.os.RemoteException;
import android.os.SystemClock;
@@ -276,13 +277,11 @@
public void testAddTaskCompatibleActivityType_expectRemove() throws Exception {
// Test with undefined activity type since the type is not persisted by the task persister
// and we want to ensure that a new task will match a restored task
- Configuration config1 = new Configuration();
- config1.windowConfiguration.setActivityType(ACTIVITY_TYPE_UNDEFINED);
TaskRecord task1 = createTaskBuilder(".Task1")
.setFlags(FLAG_ACTIVITY_NEW_TASK)
.setStack(mStack)
.build();
- task1.onConfigurationChanged(config1);
+ setTaskActivityType(task1, ACTIVITY_TYPE_UNDEFINED);
assertTrue(task1.getActivityType() == ACTIVITY_TYPE_UNDEFINED);
mRecentTasks.add(task1);
mCallbacksRecorder.clear();
@@ -302,14 +301,12 @@
@Test
public void testAddTaskCompatibleActivityTypeDifferentUser_expectNoRemove() throws Exception {
- Configuration config1 = new Configuration();
- config1.windowConfiguration.setActivityType(ACTIVITY_TYPE_UNDEFINED);
TaskRecord task1 = createTaskBuilder(".Task1")
.setFlags(FLAG_ACTIVITY_NEW_TASK)
.setStack(mStack)
.setUserId(TEST_USER_0_ID)
.build();
- task1.onConfigurationChanged(config1);
+ setTaskActivityType(task1, ACTIVITY_TYPE_UNDEFINED);
assertTrue(task1.getActivityType() == ACTIVITY_TYPE_UNDEFINED);
mRecentTasks.add(task1);
mCallbacksRecorder.clear();
@@ -329,24 +326,20 @@
@Test
public void testAddTaskCompatibleWindowingMode_expectRemove() throws Exception {
- Configuration config1 = new Configuration();
- config1.windowConfiguration.setWindowingMode(WINDOWING_MODE_UNDEFINED);
TaskRecord task1 = createTaskBuilder(".Task1")
.setFlags(FLAG_ACTIVITY_NEW_TASK)
.setStack(mStack)
.build();
- task1.onConfigurationChanged(config1);
+ setTaskWindowingMode(task1, WINDOWING_MODE_UNDEFINED);
assertTrue(task1.getWindowingMode() == WINDOWING_MODE_UNDEFINED);
mRecentTasks.add(task1);
mCallbacksRecorder.clear();
- Configuration config2 = new Configuration();
- config2.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
TaskRecord task2 = createTaskBuilder(".Task1")
.setFlags(FLAG_ACTIVITY_NEW_TASK)
.setStack(mStack)
.build();
- task2.onConfigurationChanged(config2);
+ setTaskWindowingMode(task2, WINDOWING_MODE_FULLSCREEN);
assertTrue(task2.getWindowingMode() == WINDOWING_MODE_FULLSCREEN);
mRecentTasks.add(task2);
@@ -359,23 +352,19 @@
@Test
public void testAddTaskIncompatibleWindowingMode_expectNoRemove() throws Exception {
- Configuration config1 = new Configuration();
- config1.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
TaskRecord task1 = createTaskBuilder(".Task1")
.setFlags(FLAG_ACTIVITY_NEW_TASK)
.setStack(mStack)
.build();
- task1.onConfigurationChanged(config1);
+ setTaskWindowingMode(task1, WINDOWING_MODE_FULLSCREEN);
assertTrue(task1.getWindowingMode() == WINDOWING_MODE_FULLSCREEN);
mRecentTasks.add(task1);
- Configuration config2 = new Configuration();
- config2.windowConfiguration.setWindowingMode(WINDOWING_MODE_PINNED);
TaskRecord task2 = createTaskBuilder(".Task1")
.setFlags(FLAG_ACTIVITY_NEW_TASK)
.setStack(mStack)
.build();
- task2.onConfigurationChanged(config2);
+ setTaskWindowingMode(task2, WINDOWING_MODE_PINNED);
assertTrue(task2.getWindowingMode() == WINDOWING_MODE_PINNED);
mRecentTasks.add(task2);
@@ -644,6 +633,43 @@
}
@Test
+ public void testRemoveAllVisibleTasks() throws Exception {
+ mRecentTasks.setParameters(-1 /* min */, 3 /* max */, 100 /* ms */);
+
+ // Create some set of tasks, some of which are visible and some are not
+ TaskRecord t1 = createTaskBuilder("com.android.pkg1", ".Task1").build();
+ mRecentTasks.add(t1);
+ mRecentTasks.add(setTaskActivityType(
+ createTaskBuilder("com.android.pkg1", ".HomeTask").build(),
+ ACTIVITY_TYPE_HOME));
+ TaskRecord t2 = createTaskBuilder("com.android.pkg2", ".Task2").build();
+ mRecentTasks.add(t2);
+ mRecentTasks.add(setTaskWindowingMode(
+ createTaskBuilder("com.android.pkg1", ".PipTask").build(),
+ WINDOWING_MODE_PINNED));
+ TaskRecord t3 = createTaskBuilder("com.android.pkg3", ".Task3").build();
+ mRecentTasks.add(t3);
+
+ // Create some more tasks that are out of visible range, but are still visible
+ TaskRecord t4 = createTaskBuilder("com.android.pkg3", ".Task4").build();
+ mRecentTasks.add(t4);
+ TaskRecord t5 = createTaskBuilder("com.android.pkg3", ".Task5").build();
+ mRecentTasks.add(t5);
+
+ // Create some more tasks that are out of the active session range, but are still visible
+ TaskRecord t6 = createTaskBuilder("com.android.pkg3", ".Task6").build();
+ t6.lastActiveTime = SystemClock.elapsedRealtime() - 200;
+ mRecentTasks.add(t6);
+ TaskRecord t7 = createTaskBuilder("com.android.pkg3", ".Task7").build();
+ t7.lastActiveTime = SystemClock.elapsedRealtime() - 200;
+ mRecentTasks.add(t7);
+
+ // Remove all the visible tasks and ensure that they are removed
+ mRecentTasks.removeAllVisibleTasks();
+ assertTrimmed(t1, t2, t3, t4, t5, t6, t7);
+ }
+
+ @Test
public void testNotRecentsComponent_denyApiAccess() throws Exception {
doReturn(PackageManager.PERMISSION_DENIED).when(mService)
.checkGetTasksPermission(anyString(), anyInt(), anyInt());
@@ -754,6 +780,22 @@
return task;
}
+ private TaskRecord setTaskActivityType(TaskRecord task,
+ @WindowConfiguration.ActivityType int activityType) {
+ Configuration config1 = new Configuration();
+ config1.windowConfiguration.setActivityType(activityType);
+ task.onConfigurationChanged(config1);
+ return task;
+ }
+
+ private TaskRecord setTaskWindowingMode(TaskRecord task,
+ @WindowConfiguration.WindowingMode int windowingMode) {
+ Configuration config1 = new Configuration();
+ config1.windowConfiguration.setWindowingMode(windowingMode);
+ task.onConfigurationChanged(config1);
+ return task;
+ }
+
private boolean arrayContainsUser(int[] userIds, int targetUserId) {
Arrays.sort(userIds);
return Arrays.binarySearch(userIds, targetUserId) >= 0;
@@ -880,7 +922,7 @@
}
@Override
- public void onRecentTaskRemoved(TaskRecord task, boolean wasTrimmed) {
+ public void onRecentTaskRemoved(TaskRecord task, boolean wasTrimmed, boolean killProcess) {
if (wasTrimmed) {
trimmed.add(task);
}
diff --git a/services/tests/servicestests/src/com/android/server/wm/DisplaySettingsTests.java b/services/tests/servicestests/src/com/android/server/wm/DisplaySettingsTests.java
new file mode 100644
index 0000000..0ea56ed
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/wm/DisplaySettingsTests.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.server.wm;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import android.app.WindowConfiguration;
+import android.platform.test.annotations.Presubmit;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Display;
+import android.view.DisplayInfo;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+
+@SmallTest
+@Presubmit
+@RunWith(AndroidJUnit4.class)
+public class DisplaySettingsTests extends WindowTestsBase {
+
+ private File mTestFolder;
+ private DisplaySettings mTarget;
+
+ private DisplayContent mPrimaryDisplay;
+ private DisplayContent mSecondaryDisplay;
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ mTestFolder = InstrumentationRegistry.getContext().getCacheDir();
+ deleteRecursively(mTestFolder);
+
+ sWm.setSupportsFreeformWindowManagement(false);
+ sWm.setIsPc(false);
+
+ mTarget = new DisplaySettings(sWm, mTestFolder);
+ mTarget.readSettingsLocked();
+
+ mPrimaryDisplay = sWm.getDefaultDisplayContentLocked();
+ mSecondaryDisplay = createNewDisplay();
+ assertNotEquals(Display.DEFAULT_DISPLAY, mSecondaryDisplay.getDisplayId());
+ }
+
+ @Test
+ public void testPrimaryDisplayDefaultToFullscreenWithoutFreeformSupport() {
+ mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
+
+ assertEquals(WindowConfiguration.WINDOWING_MODE_FULLSCREEN,
+ mPrimaryDisplay.getWindowingMode());
+ }
+
+ @Test
+ public void testPrimaryDisplayDefaultToFullscreenWithFreeformSupportNonPc() {
+ sWm.setSupportsFreeformWindowManagement(true);
+
+ mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
+
+ assertEquals(WindowConfiguration.WINDOWING_MODE_FULLSCREEN,
+ mPrimaryDisplay.getWindowingMode());
+ }
+
+ @Test
+ public void testPrimaryDisplayDefaultToFreeformWithFreeformIsPc() {
+ sWm.setSupportsFreeformWindowManagement(true);
+ sWm.setIsPc(true);
+
+ mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
+
+ assertEquals(WindowConfiguration.WINDOWING_MODE_FREEFORM,
+ mPrimaryDisplay.getWindowingMode());
+ }
+
+ @Test
+ public void testSecondaryDisplayDefaultToFullscreenWithoutFreeformSupport() {
+ mTarget.applySettingsToDisplayLocked(mSecondaryDisplay);
+
+ assertEquals(WindowConfiguration.WINDOWING_MODE_FULLSCREEN,
+ mSecondaryDisplay.getWindowingMode());
+ }
+
+ @Test
+ public void testSecondaryDisplayDefaultToFreeformWithFreeformSupportNonPc() {
+ sWm.setSupportsFreeformWindowManagement(true);
+
+ mTarget.applySettingsToDisplayLocked(mSecondaryDisplay);
+
+ assertEquals(WindowConfiguration.WINDOWING_MODE_FREEFORM,
+ mSecondaryDisplay.getWindowingMode());
+ }
+
+ @Test
+ public void testSecondaryDisplayDefaultToFreeformWithFreeformSupportIsPc() {
+ sWm.setSupportsFreeformWindowManagement(true);
+ sWm.setIsPc(true);
+
+ mTarget.applySettingsToDisplayLocked(mSecondaryDisplay);
+
+ assertEquals(WindowConfiguration.WINDOWING_MODE_FREEFORM,
+ mSecondaryDisplay.getWindowingMode());
+ }
+
+ @Test
+ public void testDefaultToZeroOverscan() {
+ mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
+
+ assertOverscan(mPrimaryDisplay, 0 /* left */, 0 /* top */, 0 /* right */, 0 /* bottom */);
+ }
+
+ @Test
+ public void testPersistOverscanInSameInstance() {
+ final DisplayInfo info = mPrimaryDisplay.getDisplayInfo();
+ mTarget.setOverscanLocked(info.uniqueId, info.name, 1 /* left */, 2 /* top */,
+ 3 /* right */, 4 /* bottom */);
+
+ mTarget.applySettingsToDisplayLocked(mPrimaryDisplay);
+
+ assertOverscan(mPrimaryDisplay, 1 /* left */, 2 /* top */, 3 /* right */, 4 /* bottom */);
+ }
+
+ @Test
+ public void testPersistOverscanAcrossInstances() {
+ final DisplayInfo info = mPrimaryDisplay.getDisplayInfo();
+ mTarget.setOverscanLocked(info.uniqueId, info.name, 1 /* left */, 2 /* top */,
+ 3 /* right */, 4 /* bottom */);
+ mTarget.writeSettingsLocked();
+
+ DisplaySettings target = new DisplaySettings(sWm, mTestFolder);
+ target.readSettingsLocked();
+
+ target.applySettingsToDisplayLocked(mPrimaryDisplay);
+
+ assertOverscan(mPrimaryDisplay, 1 /* left */, 2 /* top */, 3 /* right */, 4 /* bottom */);
+ }
+
+ private static void assertOverscan(DisplayContent display, int left, int top, int right,
+ int bottom) {
+ final DisplayInfo info = display.getDisplayInfo();
+
+ assertEquals(left, info.overscanLeft);
+ assertEquals(top, info.overscanTop);
+ assertEquals(right, info.overscanRight);
+ assertEquals(bottom, info.overscanBottom);
+ }
+
+ private static boolean deleteRecursively(File file) {
+ if (file.isFile()) {
+ return file.delete();
+ }
+
+ boolean fullyDeleted = true;
+ final File[] files = file.listFiles();
+ for (File child : files) {
+ fullyDeleted &= deleteRecursively(child);
+ }
+ fullyDeleted &= file.delete();
+ return fullyDeleted;
+ }
+}
diff --git a/tests/FlickerTests/Android.mk b/tests/FlickerTests/Android.mk
new file mode 100644
index 0000000..3c70f8b
--- /dev/null
+++ b/tests/FlickerTests/Android.mk
@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := FlickerTests
+LOCAL_MODULE_TAGS := tests optional
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_PRIVATE_PLATFORM_APIS := true
+LOCAL_CERTIFICATE := platform
+LOCAL_COMPATIBILITY_SUITE := device-tests
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ flickertestapplib \
+ flickerlib \
+ truth-prebuilt \
+ app-helpers-core
+
+include $(BUILD_PACKAGE)
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/tests/FlickerTests/AndroidManifest.xml b/tests/FlickerTests/AndroidManifest.xml
new file mode 100644
index 0000000..ba63940
--- /dev/null
+++ b/tests/FlickerTests/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.server.wm.flicker">
+
+ <uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27"/>
+ <!-- Read and write traces from external storage -->
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <!-- Capture screen contents -->
+ <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />
+ <!-- Run layers trace -->
+ <uses-permission android:name="android.permission.HARDWARE_TEST"/>
+ <application>
+ <uses-library android:name="android.test.runner"/>
+ </application>
+
+ <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.server.wm.flicker"
+ android:label="WindowManager Flicker Tests">
+ </instrumentation>
+</manifest>
\ No newline at end of file
diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml
new file mode 100644
index 0000000..b31235b
--- /dev/null
+++ b/tests/FlickerTests/AndroidTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ -->
+<configuration description="Runs WindowManager Flicker Tests">
+ <option name="test-tag" value="FlickerTests" />
+ <target_preparer class="com.google.android.tradefed.targetprep.GoogleDeviceSetup">
+ <!-- keeps the screen on during tests -->
+ <option name="screen-always-on" value="on" />
+ <!-- prevents the phone from restarting -->
+ <option name="force-skip-system-props" value="true" />
+ </target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true"/>
+ <option name="test-file-name" value="FlickerTests.apk"/>
+ <option name="test-file-name" value="FlickerTestApp.apk" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+ <option name="package" value="com.android.server.wm.flicker"/>
+ <option name="shell-timeout" value="6600s" />
+ <option name="test-timeout" value="6000s" />
+ <option name="hidden-api-checks" value="false" />
+ </test>
+ <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
+ <option name="directory-keys" value="/sdcard/flicker" />
+ <option name="collect-on-run-ended-only" value="true" />
+ </metrics_collector>
+</configuration>
diff --git a/tests/FlickerTests/README.md b/tests/FlickerTests/README.md
new file mode 100644
index 0000000..a7c9e20
--- /dev/null
+++ b/tests/FlickerTests/README.md
@@ -0,0 +1,146 @@
+# Flicker Test Library
+
+## Motivation
+Detect *flicker* — any discontinuous, or unpredictable behavior seen during UI transitions that is not due to performance. This is often the result of a logic error in the code and difficult to identify because the issue is transient and at times difficult to reproduce. This library helps create integration tests between `SurfaceFlinger`, `WindowManager` and `SystemUI` to identify flicker.
+
+## Adding a Test
+The library builds and runs UI transitions, captures Winscope traces and exposes common assertions that can be tested against each trace.
+
+### Building Transitions
+Start by defining common or error prone transitions using `TransitionRunner`.
+```java
+// Example: Build a transition that cold launches an app from launcher
+TransitionRunner transition = TransitionRunner.newBuilder()
+ // Specify a tag to identify the transition (optional)
+ .withTag("OpenAppCold_" + testApp.getLauncherName())
+
+ // Specify preconditions to setup the device
+ // Wake up device and go to home screen
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+
+ // Setup transition under test
+ // Press the home button and close the app to test a cold start
+ .runBefore(device::pressHome)
+ .runBefore(testApp::exit)
+
+ // Run the transition under test
+ // Open the app and wait for UI to be idle
+ // This is the part of the transition that will be tested.
+ .run(testApp::open)
+ .run(device::waitForIdle)
+
+ // Perform any tear downs
+ // Close the app
+ .runAfterAll(testApp::exit)
+
+ // Number of times to repeat the transition to catch any flaky issues
+ .repeat(5);
+```
+
+
+Run the transition to get a list of `TransitionResult` for each time the transition is repeated.
+```java
+ List<TransitionResult> results = transition.run();
+```
+`TransitionResult` contains paths to test artifacts such as Winscope traces and screen recordings.
+
+
+### Checking Assertions
+Each `TransitionResult` can be tested using an extension of the Google Truth library, `LayersTraceSubject` and `WmTraceSubject`. They try to balance test principles set out by Google Truth (not supporting nested assertions, keeping assertions simple) with providing support for common assertion use cases.
+
+Each trace can be represented as a ordered collection of trace entries, with an associated timestamp. Each trace entry has common assertion checks. The trace subjects expose methods to filter the range of entries and test for changing assertions.
+
+```java
+ TransitionResult result = results.get(0);
+ Rect displayBounds = getDisplayBounds();
+
+ // check all trace entries
+ assertThat(result).coversRegion(displayBounds).forAllEntries();
+
+ // check a range of entries
+ assertThat(result).coversRegion(displayBounds).forRange(startTime, endTime);
+
+ // check first entry
+ assertThat(result).coversRegion(displayBounds).inTheBeginning();
+
+ // check last entry
+ assertThat(result).coversRegion(displayBounds).atTheEnd();
+
+ // check a change in assertions, e.g. wallpaper window is visible,
+ // then wallpaper window becomes and stays invisible
+ assertThat(result)
+ .showsBelowAppWindow("wallpaper")
+ .then()
+ .hidesBelowAppWindow("wallpaper")
+ .forAllEntries();
+```
+
+All assertions return `Result` which contains a `success` flag, `assertionName` string identifier, and `reason` string to provide actionable details to the user. The `reason` string is build along the way with all the details as to why the assertions failed and any hints which might help the user determine the root cause. Failed assertion message will also contain a path to the trace that was tested. Example of a failed test:
+
+```
+ java.lang.AssertionError: Not true that <com.android.server.wm.flicker.LayersTrace@65da4cc>
+ Layers Trace can be found in: /layers_trace_emptyregion.pb
+ Timestamp: 2308008331271
+ Assertion: coversRegion
+ Reason: Region to test: Rect(0, 0 - 1440, 2880)
+ first empty point: 0, 99
+ visible regions:
+ StatusBar#0Rect(0, 0 - 1440, 98)
+ NavigationBar#0Rect(0, 2712 - 1440, 2880)
+ ScreenDecorOverlay#0Rect(0, 0 - 1440, 91)
+ ...
+ at com.google.common.truth.FailureStrategy.fail(FailureStrategy.java:24)
+ ...
+```
+
+---
+
+## Running Tests
+
+The tests can be run as any other Android JUnit tests. `platform_testing/tests/flicker` uses the library to test common UI transitions. Run `atest FlickerTest` to execute these tests.
+
+---
+
+## Other Topics
+### Monitors
+Monitors capture test artifacts for each transition run. They are started before each iteration of the test transition (after the `runBefore` calls) and stopped after the transition is completed. Each iteration will produce a new test artifact. The following monitors are available:
+
+#### LayersTraceMonitor
+Captures Layers trace. This monitor is started by default. Build a transition with `skipLayersTrace()` to disable this monitor.
+#### WindowManagerTraceMonitor
+Captures Window Manager trace. This monitor is started by default. Build a transition with `skipWindowManagerTrace()` to disable this monitor.
+#### WindowAnimationFrameStatsMonitor
+Captures WindowAnimationFrameStats for the transition. This monitor is started by default and is used to eliminate *janky* runs. If an iteration has skipped frames, as determined by WindowAnimationFrameStats, the results for the iteration is skipped. If the list of results is empty after all iterations are completed, then the test should fail. Build a transition with `includeJankyRuns()` to disable this monitor.
+#### ScreenRecorder
+Captures screen to a video file. This monitor is disabled by default. Build a transition with `recordEachRun()` to capture each transition or build with `recordAllRuns()` to capture every transition including setup and teardown.
+
+---
+
+### Extending Assertions
+
+To add a new assertion, add a function to one of the trace entry classes, `LayersTrace.Entry` or `WindowManagerTrace.Entry`.
+
+```java
+ // Example adds an assertion to the check if layer is hidden by parent.
+ Result isHiddenByParent(String layerName) {
+ // Result should contain a details if assertion fails for any reason
+ // such as if layer is not found or layer is not hidden by parent
+ // or layer has no parent.
+ // ...
+ }
+```
+Then add a function to the trace subject `LayersTraceSubject` or `WmTraceSubject` which will add the assertion for testing. When the assertion is evaluated, the trace will first be filtered then the assertion will be applied to the remaining entries.
+
+```java
+ public LayersTraceSubject isHiddenByParent(String layerName) {
+ mChecker.add(entry -> entry.isHiddenByParent(layerName),
+ "isHiddenByParent(" + layerName + ")");
+ return this;
+ }
+```
+
+To use the new assertion:
+```java
+ // Check if "Chrome" layer is hidden by parent in the first trace entry.
+ assertThat(result).isHiddenByParent("Chrome").inTheBeginning();
+```
\ No newline at end of file
diff --git a/tests/FlickerTests/TEST_MAPPING b/tests/FlickerTests/TEST_MAPPING
new file mode 100644
index 0000000..55a6147
--- /dev/null
+++ b/tests/FlickerTests/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "postsubmit": [
+ {
+ "name": "FlickerTests"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tests/FlickerTests/lib/Android.mk b/tests/FlickerTests/lib/Android.mk
new file mode 100644
index 0000000..6a8dfe8
--- /dev/null
+++ b/tests/FlickerTests/lib/Android.mk
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := flickerlib
+LOCAL_MODULE_TAGS := tests optional
+# sign this with platform cert, so this test is allowed to call private platform apis
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVATE_PLATFORM_APIS := true
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ ub-janktesthelper \
+ cts-amwm-util \
+ platformprotosnano \
+ layersprotosnano \
+ truth-prebuilt \
+ sysui-helper \
+ launcher-helper-lib \
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := flickerautomationhelperlib
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := src/com/android/server/wm/flicker/AutomationUtils.java \
+ src/com/android/server/wm/flicker/WindowUtils.java
+LOCAL_STATIC_JAVA_LIBRARIES := sysui-helper \
+ launcher-helper-lib \
+ compatibility-device-util
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/Assertions.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/Assertions.java
new file mode 100644
index 0000000..84f9f871
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/Assertions.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+/**
+ * Collection of functional interfaces and classes representing assertions and their associated
+ * results. Assertions are functions that are applied over a single trace entry and returns a
+ * result which includes a detailed reason if the assertion fails.
+ */
+class Assertions {
+ /**
+ * Checks assertion on a single trace entry.
+ *
+ * @param <T> trace entry type to perform the assertion on.
+ */
+ @FunctionalInterface
+ interface TraceAssertion<T> extends Function<T, Result> {
+ /**
+ * Returns an assertion that represents the logical negation of this assertion.
+ *
+ * @return a assertion that represents the logical negation of this assertion
+ */
+ default TraceAssertion<T> negate() {
+ return (T t) -> apply(t).negate();
+ }
+ }
+
+ /**
+ * Checks assertion on a single layers trace entry.
+ */
+ @FunctionalInterface
+ interface LayersTraceAssertion extends TraceAssertion<LayersTrace.Entry> {
+
+ }
+
+ /**
+ * Utility class to store assertions with an identifier to help generate more useful debug
+ * data when dealing with multiple assertions.
+ */
+ static class NamedAssertion<T> {
+ final TraceAssertion<T> assertion;
+ final String name;
+
+ NamedAssertion(TraceAssertion<T> assertion, String name) {
+ this.assertion = assertion;
+ this.name = name;
+ }
+ }
+
+ /**
+ * Contains the result of an assertion including the reason for failed assertions.
+ */
+ static class Result {
+ static final String NEGATION_PREFIX = "!";
+ final boolean success;
+ final long timestamp;
+ final String assertionName;
+ final String reason;
+
+ Result(boolean success, long timestamp, String assertionName, String reason) {
+ this.success = success;
+ this.timestamp = timestamp;
+ this.assertionName = assertionName;
+ this.reason = reason;
+ }
+
+ Result(boolean success, String reason) {
+ this.success = success;
+ this.reason = reason;
+ this.assertionName = "";
+ this.timestamp = 0;
+ }
+
+ /**
+ * Returns the negated {@code Result} and adds a negation prefix to the assertion name.
+ */
+ Result negate() {
+ String negatedAssertionName;
+ if (this.assertionName.startsWith(NEGATION_PREFIX)) {
+ negatedAssertionName = this.assertionName.substring(NEGATION_PREFIX.length() + 1);
+ } else {
+ negatedAssertionName = NEGATION_PREFIX + this.assertionName;
+ }
+ return new Result(!this.success, this.timestamp, negatedAssertionName, this.reason);
+ }
+
+ boolean passed() {
+ return this.success;
+ }
+
+ boolean failed() {
+ return !this.success;
+ }
+
+ @Override
+ public String toString() {
+ return "Timestamp: " + prettyTimestamp(timestamp)
+ + "\nAssertion: " + assertionName
+ + "\nReason: " + reason;
+ }
+
+ private String prettyTimestamp(long timestamp_ns) {
+ StringBuilder prettyTimestamp = new StringBuilder();
+ TimeUnit[] timeUnits = {TimeUnit.HOURS, TimeUnit.MINUTES, TimeUnit.SECONDS, TimeUnit
+ .MILLISECONDS};
+ String[] unitSuffixes = {"h", "m", "s", "ms"};
+
+ for (int i = 0; i < timeUnits.length; i++) {
+ long convertedTime = timeUnits[i].convert(timestamp_ns, TimeUnit.NANOSECONDS);
+ timestamp_ns -= TimeUnit.NANOSECONDS.convert(convertedTime, timeUnits[i]);
+ prettyTimestamp.append(convertedTime).append(unitSuffixes[i]);
+ }
+
+ return prettyTimestamp.toString();
+ }
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AssertionsChecker.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AssertionsChecker.java
new file mode 100644
index 0000000..3c65d3c
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AssertionsChecker.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import com.android.server.wm.flicker.Assertions.NamedAssertion;
+import com.android.server.wm.flicker.Assertions.Result;
+import com.android.server.wm.flicker.Assertions.TraceAssertion;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Captures some of the common logic in {@link LayersTraceSubject} and {@link WmTraceSubject}
+ * used to filter trace entries and combine multiple assertions.
+ *
+ * @param <T> trace entry type
+ */
+public class AssertionsChecker<T extends ITraceEntry> {
+ private boolean mFilterEntriesByRange = false;
+ private long mFilterStartTime = 0;
+ private long mFilterEndTime = 0;
+ private AssertionOption mOption = AssertionOption.NONE;
+ private List<NamedAssertion<T>> mAssertions = new LinkedList<>();
+
+ void add(Assertions.TraceAssertion<T> assertion, String name) {
+ mAssertions.add(new NamedAssertion<>(assertion, name));
+ }
+
+ void filterByRange(long startTime, long endTime) {
+ mFilterEntriesByRange = true;
+ mFilterStartTime = startTime;
+ mFilterEndTime = endTime;
+ }
+
+ private void setOption(AssertionOption option) {
+ if (mOption != AssertionOption.NONE && option != mOption) {
+ throw new IllegalArgumentException("Cannot use " + mOption + " option with "
+ + option + " option.");
+ }
+ mOption = option;
+ }
+
+ public void checkFirstEntry() {
+ setOption(AssertionOption.CHECK_FIRST_ENTRY);
+ }
+
+ public void checkLastEntry() {
+ setOption(AssertionOption.CHECK_LAST_ENTRY);
+ }
+
+ public void checkChangingAssertions() {
+ setOption(AssertionOption.CHECK_CHANGING_ASSERTIONS);
+ }
+
+
+ /**
+ * Filters trace entries then runs assertions returning a list of failures.
+ *
+ * @param entries list of entries to perform assertions on
+ * @return list of failed assertion results
+ */
+ List<Result> test(List<T> entries) {
+ List<T> filteredEntries;
+ List<Result> failures;
+
+ if (mFilterEntriesByRange) {
+ filteredEntries = entries.stream()
+ .filter(e -> ((e.getTimestamp() >= mFilterStartTime)
+ && (e.getTimestamp() <= mFilterEndTime)))
+ .collect(Collectors.toList());
+ } else {
+ filteredEntries = entries;
+ }
+
+ switch (mOption) {
+ case CHECK_CHANGING_ASSERTIONS:
+ return assertChanges(filteredEntries);
+ case CHECK_FIRST_ENTRY:
+ return assertEntry(filteredEntries.get(0));
+ case CHECK_LAST_ENTRY:
+ return assertEntry(filteredEntries.get(filteredEntries.size() - 1));
+ }
+ return assertAll(filteredEntries);
+ }
+
+ /**
+ * Steps through each trace entry checking if provided assertions are true in the order they
+ * are added. Each assertion must be true for at least a single trace entry.
+ *
+ * This can be used to check for asserting a change in property over a trace. Such as visibility
+ * for a window changes from true to false or top-most window changes from A to Bb and back to A
+ * again.
+ */
+ private List<Result> assertChanges(List<T> entries) {
+ List<Result> failures = new ArrayList<>();
+ int entryIndex = 0;
+ int assertionIndex = 0;
+ int lastPassedAssertionIndex = -1;
+
+ if (mAssertions.size() == 0) {
+ return failures;
+ }
+
+ while (assertionIndex < mAssertions.size() && entryIndex < entries.size()) {
+ TraceAssertion<T> currentAssertion = mAssertions.get(assertionIndex).assertion;
+ Result result = currentAssertion.apply(entries.get(entryIndex));
+ if (result.passed()) {
+ lastPassedAssertionIndex = assertionIndex;
+ entryIndex++;
+ continue;
+ }
+
+ if (lastPassedAssertionIndex != assertionIndex) {
+ failures.add(result);
+ break;
+ }
+ assertionIndex++;
+
+ if (assertionIndex == mAssertions.size()) {
+ failures.add(result);
+ break;
+ }
+ }
+
+ if (failures.isEmpty()) {
+ if (assertionIndex != mAssertions.size() - 1) {
+ String reason = "\nAssertion " + mAssertions.get(assertionIndex).name
+ + " never became false";
+ reason += "\nPassed assertions: " + mAssertions.stream().limit(assertionIndex)
+ .map(assertion -> assertion.name).collect(Collectors.joining(","));
+ reason += "\nUntested assertions: " + mAssertions.stream().skip(assertionIndex + 1)
+ .map(assertion -> assertion.name).collect(Collectors.joining(","));
+
+ Result result = new Result(false /* success */, 0 /* timestamp */,
+ "assertChanges", "Not all assertions passed." + reason);
+ failures.add(result);
+ }
+ }
+ return failures;
+ }
+
+ private List<Result> assertEntry(T entry) {
+ List<Result> failures = new ArrayList<>();
+ for (NamedAssertion<T> assertion : mAssertions) {
+ Result result = assertion.assertion.apply(entry);
+ if (result.failed()) {
+ failures.add(result);
+ }
+ }
+ return failures;
+ }
+
+ private List<Result> assertAll(List<T> entries) {
+ return mAssertions.stream().flatMap(
+ assertion -> entries.stream()
+ .map(assertion.assertion)
+ .filter(Result::failed))
+ .collect(Collectors.toList());
+ }
+
+ private enum AssertionOption {
+ NONE,
+ CHECK_CHANGING_ASSERTIONS,
+ CHECK_FIRST_ENTRY,
+ CHECK_LAST_ENTRY,
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AutomationUtils.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AutomationUtils.java
new file mode 100644
index 0000000..6bac675
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/AutomationUtils.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static android.os.SystemClock.sleep;
+import static android.system.helpers.OverviewHelper.isRecentsInLauncher;
+import static android.view.Surface.ROTATION_0;
+
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.os.RemoteException;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.launcherhelper.LauncherStrategyFactory;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.Configurator;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.util.Log;
+import android.util.Rational;
+import android.view.View;
+import android.view.ViewConfiguration;
+
+/**
+ * Collection of UI Automation helper functions.
+ */
+public class AutomationUtils {
+ private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
+ private static final long FIND_TIMEOUT = 10000;
+ private static final long LONG_PRESS_TIMEOUT = ViewConfiguration.getLongPressTimeout() * 2L;
+ private static final String TAG = "FLICKER";
+
+ public static void wakeUpAndGoToHomeScreen() {
+ UiDevice device = UiDevice.getInstance(InstrumentationRegistry
+ .getInstrumentation());
+ try {
+ device.wakeUp();
+ } catch (RemoteException e) {
+ throw new RuntimeException(e);
+ }
+ device.pressHome();
+ }
+
+ /**
+ * Sets {@link android.app.UiAutomation#waitForIdle(long, long)} global timeout to 0 causing
+ * the {@link android.app.UiAutomation#waitForIdle(long, long)} function to timeout instantly.
+ * This removes some delays when using the UIAutomator library required to create fast UI
+ * transitions.
+ */
+ static void setFastWait() {
+ Configurator.getInstance().setWaitForIdleTimeout(0);
+ }
+
+ /**
+ * Reverts {@link android.app.UiAutomation#waitForIdle(long, long)} to default behavior.
+ */
+ static void setDefaultWait() {
+ Configurator.getInstance().setWaitForIdleTimeout(10000);
+ }
+
+ public static boolean isQuickstepEnabled(UiDevice device) {
+ return device.findObject(By.res(SYSTEMUI_PACKAGE, "recent_apps")) == null;
+ }
+
+ public static void openQuickstep(UiDevice device) {
+ if (isQuickstepEnabled(device)) {
+ int height = device.getDisplayHeight();
+ UiObject2 navBar = device.findObject(By.res(SYSTEMUI_PACKAGE, "navigation_bar_frame"));
+
+ Rect navBarVisibleBounds;
+
+ // TODO(vishnun) investigate why this object cannot be found.
+ if (navBar != null) {
+ navBarVisibleBounds = navBar.getVisibleBounds();
+ } else {
+ Log.e(TAG, "Could not find nav bar, infer location");
+ navBarVisibleBounds = WindowUtils.getNavigationBarPosition(ROTATION_0);
+ }
+
+ // Swipe from nav bar to 2/3rd down the screen.
+ device.swipe(
+ navBarVisibleBounds.centerX(), navBarVisibleBounds.centerY(),
+ navBarVisibleBounds.centerX(), height * 2 / 3,
+ (navBarVisibleBounds.centerY() - height * 2 / 3) / 100); // 100 px/step
+ } else {
+ try {
+ device.pressRecentApps();
+ } catch (RemoteException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ BySelector RECENTS = By.res(SYSTEMUI_PACKAGE, "recents_view");
+
+ // use a long timeout to wait until recents populated
+ if (device.wait(
+ Until.findObject(isRecentsInLauncher()
+ ? getLauncherOverviewSelector(device) : RECENTS),
+ 10000) == null) {
+ fail("Recents didn't appear");
+ }
+ device.waitForIdle();
+ }
+
+ static void clearRecents(UiDevice device) {
+ if (isQuickstepEnabled(device)) {
+ openQuickstep(device);
+
+ for (int i = 0; i < 5; i++) {
+ device.swipe(device.getDisplayWidth() / 2,
+ device.getDisplayHeight() / 2, device.getDisplayWidth(),
+ device.getDisplayHeight() / 2,
+ 5);
+
+ BySelector clearAllSelector = By.res("com.google.android.apps.nexuslauncher",
+ "clear_all_button");
+ UiObject2 clearAllButton = device.wait(Until.findObject(clearAllSelector), 100);
+ if (clearAllButton != null) {
+ clearAllButton.click();
+ return;
+ }
+ }
+ }
+ }
+
+ private static BySelector getLauncherOverviewSelector(UiDevice device) {
+ return By.res(device.getLauncherPackageName(), "overview_panel");
+ }
+
+ private static void longPressRecents(UiDevice device) {
+ BySelector recentsSelector = By.res(SYSTEMUI_PACKAGE, "recent_apps");
+ UiObject2 recentsButton = device.wait(Until.findObject(recentsSelector), FIND_TIMEOUT);
+ assertNotNull("Unable to find recents button", recentsButton);
+ recentsButton.click(LONG_PRESS_TIMEOUT);
+ }
+
+ public static void launchSplitScreen(UiDevice device) {
+ String mLauncherPackage = LauncherStrategyFactory.getInstance(device)
+ .getLauncherStrategy().getSupportedLauncherPackage();
+
+ if (isQuickstepEnabled(device)) {
+ // Quickstep enabled
+ openQuickstep(device);
+
+ BySelector overviewIconSelector = By.res(mLauncherPackage, "icon")
+ .clazz(View.class);
+ UiObject2 overviewIcon = device.wait(Until.findObject(overviewIconSelector),
+ FIND_TIMEOUT);
+ assertNotNull("Unable to find app icon in Overview", overviewIcon);
+ overviewIcon.click();
+
+ BySelector splitscreenButtonSelector = By.text("Split screen");
+ UiObject2 splitscreenButton = device.wait(Until.findObject(splitscreenButtonSelector),
+ FIND_TIMEOUT);
+ assertNotNull("Unable to find Split screen button in Overview", overviewIcon);
+ splitscreenButton.click();
+ } else {
+ // Classic long press recents
+ longPressRecents(device);
+ }
+ // Wait for animation to complete.
+ sleep(2000);
+ }
+
+ public static void exitSplitScreen(UiDevice device) {
+ if (isQuickstepEnabled(device)) {
+ // Quickstep enabled
+ BySelector dividerSelector = By.res(SYSTEMUI_PACKAGE, "docked_divider_handle");
+ UiObject2 divider = device.wait(Until.findObject(dividerSelector), FIND_TIMEOUT);
+ assertNotNull("Unable to find Split screen divider", divider);
+
+ // Drag the split screen divider to the top of the screen
+ divider.drag(new Point(device.getDisplayWidth() / 2, 0), 400);
+ } else {
+ // Classic long press recents
+ longPressRecents(device);
+ }
+ // Wait for animation to complete.
+ sleep(2000);
+ }
+
+ static void resizeSplitScreen(UiDevice device, Rational windowHeightRatio) {
+ BySelector dividerSelector = By.res(SYSTEMUI_PACKAGE, "docked_divider_handle");
+ UiObject2 divider = device.wait(Until.findObject(dividerSelector), FIND_TIMEOUT);
+ assertNotNull("Unable to find Split screen divider", divider);
+ int destHeight =
+ (int) (WindowUtils.getDisplayBounds().height() * windowHeightRatio.floatValue());
+ // Drag the split screen divider to so that the ratio of top window height and bottom
+ // window height is windowHeightRatio
+ device.drag(divider.getVisibleBounds().centerX(), divider.getVisibleBounds().centerY(),
+ device.getDisplayWidth() / 2, destHeight, 10);
+ //divider.drag(new Point(device.getDisplayWidth() / 2, destHeight), 400)
+ divider = device.wait(Until.findObject(dividerSelector), FIND_TIMEOUT);
+
+ // Wait for animation to complete.
+ sleep(2000);
+ }
+
+ static void closePipWindow(UiDevice device) {
+ UiObject2 pipWindow = device.findObject(
+ By.res(SYSTEMUI_PACKAGE, "background"));
+ pipWindow.click();
+ UiObject2 exitPipObject = device.findObject(
+ By.res(SYSTEMUI_PACKAGE, "dismiss"));
+ exitPipObject.click();
+ // Wait for animation to complete.
+ sleep(2000);
+ }
+
+ static void expandPipWindow(UiDevice device) {
+ UiObject2 pipWindow = device.findObject(
+ By.res(SYSTEMUI_PACKAGE, "background"));
+ pipWindow.click();
+ pipWindow.click();
+ }
+
+ public static void stopPackage(Context context, String packageName) {
+ runShellCommand("am force-stop " + packageName);
+ int packageUid;
+ try {
+ packageUid = context.getPackageManager().getPackageUid(packageName, /* flags= */0);
+ } catch (PackageManager.NameNotFoundException e) {
+ return;
+ }
+ while (targetPackageIsRunning(packageUid)) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ //ignore
+ }
+ }
+ }
+
+ private static boolean targetPackageIsRunning(int uid) {
+ final String result = runShellCommand(
+ String.format("cmd activity get-uid-state %d", uid));
+ return !result.contains("(NONEXISTENT)");
+ }
+}
\ No newline at end of file
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/ITraceEntry.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/ITraceEntry.java
new file mode 100644
index 0000000..9525f41
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/ITraceEntry.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+/**
+ * Common interface for Layer and WindowManager trace entries.
+ */
+interface ITraceEntry {
+ /**
+ * @return timestamp of current entry
+ */
+ long getTimestamp();
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTrace.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTrace.java
new file mode 100644
index 0000000..660ec0f
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTrace.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import android.annotation.Nullable;
+import android.graphics.Rect;
+import android.surfaceflinger.nano.Layers.LayerProto;
+import android.surfaceflinger.nano.Layers.RectProto;
+import android.surfaceflinger.nano.Layers.RegionProto;
+import android.surfaceflinger.nano.Layerstrace.LayersTraceFileProto;
+import android.surfaceflinger.nano.Layerstrace.LayersTraceProto;
+import android.util.SparseArray;
+
+import com.android.server.wm.flicker.Assertions.Result;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Contains a collection of parsed Layers trace entries and assertions to apply over
+ * a single entry.
+ *
+ * Each entry is parsed into a list of {@link LayersTrace.Entry} objects.
+ */
+public class LayersTrace {
+ final private List<Entry> mEntries;
+ @Nullable
+ final private Path mSource;
+
+ private LayersTrace(List<Entry> entries, Path source) {
+ this.mEntries = entries;
+ this.mSource = source;
+ }
+
+ /**
+ * Parses {@code LayersTraceFileProto} from {@code data} and uses the proto to generates a list
+ * of trace entries, storing the flattened layers into its hierarchical structure.
+ *
+ * @param data binary proto data
+ * @param source Path to source of data for additional debug information
+ */
+ static LayersTrace parseFrom(byte[] data, Path source) {
+ List<Entry> entries = new ArrayList<>();
+ LayersTraceFileProto fileProto;
+ try {
+ fileProto = LayersTraceFileProto.parseFrom(data);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ for (LayersTraceProto traceProto : fileProto.entry) {
+ Entry entry = Entry.fromFlattenedLayers(traceProto.elapsedRealtimeNanos,
+ traceProto.layers.layers);
+ entries.add(entry);
+ }
+ return new LayersTrace(entries, source);
+ }
+
+ /**
+ * Parses {@code LayersTraceFileProto} from {@code data} and uses the proto to generates a list
+ * of trace entries, storing the flattened layers into its hierarchical structure.
+ *
+ * @param data binary proto data
+ */
+ static LayersTrace parseFrom(byte[] data) {
+ return parseFrom(data, null);
+ }
+
+ List<Entry> getEntries() {
+ return mEntries;
+ }
+
+ Entry getEntry(long timestamp) {
+ Optional<Entry> entry = mEntries.stream()
+ .filter(e -> e.getTimestamp() == timestamp)
+ .findFirst();
+ if (!entry.isPresent()) {
+ throw new RuntimeException("Entry does not exist for timestamp " + timestamp);
+ }
+ return entry.get();
+ }
+
+ Optional<Path> getSource() {
+ return Optional.ofNullable(mSource);
+ }
+
+ /**
+ * Represents a single Layer trace entry.
+ */
+ static class Entry implements ITraceEntry {
+ private long mTimestamp;
+ private List<Layer> mRootLayers; // hierarchical representation of layers
+ private List<Layer> mFlattenedLayers = null;
+
+ private Entry(long timestamp, List<Layer> rootLayers) {
+ this.mTimestamp = timestamp;
+ this.mRootLayers = rootLayers;
+ }
+
+ /**
+ * Constructs the layer hierarchy from a flattened list of layers.
+ */
+ static Entry fromFlattenedLayers(long timestamp, LayerProto[] protos) {
+ SparseArray<Layer> layerMap = new SparseArray<>();
+ ArrayList<Layer> orphans = new ArrayList<>();
+ for (LayerProto proto : protos) {
+ int id = proto.id;
+ int parentId = proto.parent;
+
+ Layer newLayer = layerMap.get(id);
+ if (newLayer == null) {
+ newLayer = new Layer(proto);
+ layerMap.append(id, newLayer);
+ } else if (newLayer.mProto != null) {
+ throw new RuntimeException("Duplicate layer id found:" + id);
+ } else {
+ newLayer.mProto = proto;
+ orphans.remove(newLayer);
+ }
+
+ // add parent placeholder
+ if (layerMap.get(parentId) == null) {
+ Layer orphanLayer = new Layer(null);
+ layerMap.append(parentId, orphanLayer);
+ orphans.add(orphanLayer);
+ }
+ layerMap.get(parentId).addChild(newLayer);
+ newLayer.addParent(layerMap.get(parentId));
+ }
+
+ // Fail if we find orphan layers.
+ orphans.remove(layerMap.get(-1));
+ orphans.forEach(orphan -> {
+ String childNodes = orphan.mChildren.stream().map(node ->
+ Integer.toString(node.getId())).collect(Collectors.joining(", "));
+ int orphanId = orphan.mChildren.get(0).mProto.parent;
+ throw new RuntimeException(
+ "Failed to parse layers trace. Found orphan layers with parent "
+ + "layer id:" + orphanId + " : " + childNodes);
+ });
+
+ return new Entry(timestamp, layerMap.get(-1).mChildren);
+ }
+
+ /**
+ * Extracts {@link Rect} from {@link RectProto}.
+ */
+ private static Rect extract(RectProto proto) {
+ return new Rect(proto.left, proto.top, proto.right, proto.bottom);
+ }
+
+ /**
+ * Extracts {@link Rect} from {@link RegionProto} by returning a rect that encompasses all
+ * the rects making up the region.
+ */
+ private static Rect extract(RegionProto regionProto) {
+ Rect region = new Rect();
+ for (RectProto proto : regionProto.rect) {
+ region.union(proto.left, proto.top, proto.right, proto.bottom);
+ }
+ return region;
+ }
+
+ /**
+ * Checks if a region specified by {@code testRect} is covered by all visible layers.
+ */
+ Result coversRegion(Rect testRect) {
+ String assertionName = "coversRegion";
+ Collection<Layer> layers = asFlattenedLayers();
+
+ for (int x = testRect.left; x < testRect.right; x++) {
+ for (int y = testRect.top; y < testRect.bottom; y++) {
+ boolean emptyRegionFound = true;
+ for (Layer layer : layers) {
+ if (layer.isInvisible() || layer.isHiddenByParent()) {
+ continue;
+ }
+ for (RectProto rectProto : layer.mProto.visibleRegion.rect) {
+ Rect r = extract(rectProto);
+ if (r.contains(x, y)) {
+ y = r.bottom;
+ emptyRegionFound = false;
+ }
+ }
+ }
+ if (emptyRegionFound) {
+ String reason = "Region to test: " + testRect
+ + "\nfirst empty point: " + x + ", " + y;
+ reason += "\nvisible regions:";
+ for (Layer layer : layers) {
+ if (layer.isInvisible() || layer.isHiddenByParent()) {
+ continue;
+ }
+ Rect r = extract(layer.mProto.visibleRegion);
+ reason += "\n" + layer.mProto.name + r.toString();
+ }
+ return new Result(false /* success */, this.mTimestamp, assertionName,
+ reason);
+ }
+ }
+ }
+ String info = "Region covered: " + testRect;
+ return new Result(true /* success */, this.mTimestamp, assertionName, info);
+ }
+
+ /**
+ * Checks if a layer with name {@code layerName} has a visible region
+ * {@code expectedVisibleRegion}.
+ */
+ Result hasVisibleRegion(String layerName, Rect expectedVisibleRegion) {
+ String assertionName = "hasVisibleRegion";
+ String reason = "Could not find " + layerName;
+ for (Layer layer : asFlattenedLayers()) {
+ if (layer.mProto.name.contains(layerName)) {
+ if (layer.isHiddenByParent()) {
+ reason = layer.getHiddenByParentReason();
+ continue;
+ }
+ if (layer.isInvisible()) {
+ reason = layer.getVisibilityReason();
+ continue;
+ }
+ Rect visibleRegion = extract(layer.mProto.visibleRegion);
+ if (visibleRegion.equals(expectedVisibleRegion)) {
+ return new Result(true /* success */, this.mTimestamp, assertionName,
+ layer.mProto.name + "has visible region " + expectedVisibleRegion);
+ }
+ reason = layer.mProto.name + " has visible region:" + visibleRegion + " "
+ + "expected:" + expectedVisibleRegion;
+ }
+ }
+ return new Result(false /* success */, this.mTimestamp, assertionName, reason);
+ }
+
+ /**
+ * Checks if a layer with name {@code layerName} is visible.
+ */
+ Result isVisible(String layerName) {
+ String assertionName = "isVisible";
+ String reason = "Could not find " + layerName;
+ for (Layer layer : asFlattenedLayers()) {
+ if (layer.mProto.name.contains(layerName)) {
+ if (layer.isHiddenByParent()) {
+ reason = layer.getHiddenByParentReason();
+ continue;
+ }
+ if (layer.isInvisible()) {
+ reason = layer.getVisibilityReason();
+ continue;
+ }
+ return new Result(true /* success */, this.mTimestamp, assertionName,
+ layer.mProto.name + " is visible");
+ }
+ }
+ return new Result(false /* success */, this.mTimestamp, assertionName, reason);
+ }
+
+ @Override
+ public long getTimestamp() {
+ return mTimestamp;
+ }
+
+ List<Layer> getRootLayers() {
+ return mRootLayers;
+ }
+
+ List<Layer> asFlattenedLayers() {
+ if (mFlattenedLayers == null) {
+ mFlattenedLayers = new ArrayList<>();
+ ArrayList<Layer> pendingLayers = new ArrayList<>(this.mRootLayers);
+ while (!pendingLayers.isEmpty()) {
+ Layer layer = pendingLayers.remove(0);
+ mFlattenedLayers.add(layer);
+ pendingLayers.addAll(layer.mChildren);
+ }
+ }
+ return mFlattenedLayers;
+ }
+
+ Rect getVisibleBounds(String layerName) {
+ List<Layer> layers = asFlattenedLayers();
+ for (Layer layer : layers) {
+ if (layer.mProto.name.contains(layerName) && layer.isVisible()) {
+ return extract(layer.mProto.visibleRegion);
+ }
+ }
+ return new Rect(0, 0, 0, 0);
+ }
+ }
+
+ /**
+ * Represents a single layer with links to its parent and child layers.
+ */
+ static class Layer {
+ @Nullable
+ LayerProto mProto;
+ List<Layer> mChildren;
+ @Nullable
+ Layer mParent = null;
+
+ private Layer(LayerProto proto) {
+ this.mProto = proto;
+ this.mChildren = new ArrayList<>();
+ }
+
+ private void addChild(Layer childLayer) {
+ this.mChildren.add(childLayer);
+ }
+
+ private void addParent(Layer parentLayer) {
+ this.mParent = parentLayer;
+ }
+
+ int getId() {
+ return mProto.id;
+ }
+
+ boolean isActiveBufferEmpty() {
+ return this.mProto.activeBuffer == null || this.mProto.activeBuffer.height == 0
+ || this.mProto.activeBuffer.width == 0;
+ }
+
+ boolean isVisibleRegionEmpty() {
+ if (this.mProto.visibleRegion == null) {
+ return true;
+ }
+ Rect visibleRect = Entry.extract(this.mProto.visibleRegion);
+ return visibleRect.height() == 0 || visibleRect.width() == 0;
+ }
+
+ boolean isHidden() {
+ return (this.mProto.flags & /* FLAG_HIDDEN */ 0x1) != 0x0;
+ }
+
+ boolean isVisible() {
+ return (!isActiveBufferEmpty() || isColorLayer()) &&
+ !isHidden() && this.mProto.color.a > 0 && !isVisibleRegionEmpty();
+ }
+
+ boolean isColorLayer() {
+ return this.mProto.type.equals("ColorLayer");
+ }
+
+ boolean isRootLayer() {
+ return mParent == null || mParent.mProto == null;
+ }
+
+ boolean isInvisible() {
+ return !isVisible();
+ }
+
+ boolean isHiddenByParent() {
+ return !isRootLayer() && (mParent.isHidden() || mParent.isHiddenByParent());
+ }
+
+ String getHiddenByParentReason() {
+ String reason = "Layer " + mProto.name;
+ if (isHiddenByParent()) {
+ reason += " is hidden by parent: " + mParent.mProto.name;
+ } else {
+ reason += " is not hidden by parent: " + mParent.mProto.name;
+ }
+ return reason;
+ }
+
+ String getVisibilityReason() {
+ String reason = "Layer " + mProto.name;
+ if (isVisible()) {
+ reason += " is visible:";
+ } else {
+ reason += " is invisible:";
+ if (this.mProto.activeBuffer == null) {
+ reason += " activeBuffer=null";
+ } else if (this.mProto.activeBuffer.height == 0) {
+ reason += " activeBuffer.height=0";
+ } else if (this.mProto.activeBuffer.width == 0) {
+ reason += " activeBuffer.width=0";
+ }
+ if (!isColorLayer()) {
+ reason += " type != ColorLayer";
+ }
+ if (isHidden()) {
+ reason += " flags=" + this.mProto.flags + " (FLAG_HIDDEN set)";
+ }
+ if (this.mProto.color.a == 0) {
+ reason += " color.a=0";
+ }
+ if (isVisibleRegionEmpty()) {
+ reason += " visible region is empty";
+ }
+ }
+ return reason;
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java
new file mode 100644
index 0000000..b4c97e4
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.google.common.truth.Truth.assertAbout;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.annotation.Nullable;
+import android.graphics.Rect;
+
+import com.android.server.wm.flicker.Assertions.Result;
+import com.android.server.wm.flicker.LayersTrace.Entry;
+import com.android.server.wm.flicker.TransitionRunner.TransitionResult;
+
+import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.Subject;
+import com.google.common.truth.SubjectFactory;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Truth subject for {@link LayersTrace} objects.
+ */
+public class LayersTraceSubject extends Subject<LayersTraceSubject, LayersTrace> {
+ // Boiler-plate Subject.Factory for LayersTraceSubject
+ private static final SubjectFactory<LayersTraceSubject, LayersTrace> FACTORY =
+ new SubjectFactory<LayersTraceSubject, LayersTrace>() {
+ @Override
+ public LayersTraceSubject getSubject(
+ FailureStrategy fs, @Nullable LayersTrace target) {
+ return new LayersTraceSubject(fs, target);
+ }
+ };
+
+ private AssertionsChecker<Entry> mChecker = new AssertionsChecker<>();
+
+ private LayersTraceSubject(FailureStrategy fs, @Nullable LayersTrace subject) {
+ super(fs, subject);
+ }
+
+ // User-defined entry point
+ public static LayersTraceSubject assertThat(@Nullable LayersTrace entry) {
+ return assertAbout(FACTORY).that(entry);
+ }
+
+ // User-defined entry point
+ public static LayersTraceSubject assertThat(@Nullable TransitionResult result) {
+ LayersTrace entries = LayersTrace.parseFrom(result.getLayersTrace(),
+ result.getLayersTracePath());
+ return assertWithMessage(result.toString()).about(FACTORY).that(entries);
+ }
+
+ // Static method for getting the subject factory (for use with assertAbout())
+ public static SubjectFactory<LayersTraceSubject, LayersTrace> entries() {
+ return FACTORY;
+ }
+
+ public void forAllEntries() {
+ test();
+ }
+
+ public void forRange(long startTime, long endTime) {
+ mChecker.filterByRange(startTime, endTime);
+ test();
+ }
+
+ public LayersTraceSubject then() {
+ mChecker.checkChangingAssertions();
+ return this;
+ }
+
+ public void inTheBeginning() {
+ if (getSubject().getEntries().isEmpty()) {
+ fail("No entries found.");
+ }
+ mChecker.checkFirstEntry();
+ test();
+ }
+
+ public void atTheEnd() {
+ if (getSubject().getEntries().isEmpty()) {
+ fail("No entries found.");
+ }
+ mChecker.checkLastEntry();
+ test();
+ }
+
+ private void test() {
+ List<Result> failures = mChecker.test(getSubject().getEntries());
+ if (!failures.isEmpty()) {
+ String failureLogs = failures.stream().map(Result::toString)
+ .collect(Collectors.joining("\n"));
+ String tracePath = "";
+ if (getSubject().getSource().isPresent()) {
+ tracePath = "\nLayers Trace can be found in: "
+ + getSubject().getSource().get().toAbsolutePath() + "\n";
+ }
+ fail(tracePath + failureLogs);
+ }
+ }
+
+ public LayersTraceSubject coversRegion(Rect rect) {
+ mChecker.add(entry -> entry.coversRegion(rect),
+ "coversRegion(" + rect + ")");
+ return this;
+ }
+
+ public LayersTraceSubject hasVisibleRegion(String layerName, Rect size) {
+ mChecker.add(entry -> entry.hasVisibleRegion(layerName, size),
+ "hasVisibleRegion(" + layerName + size + ")");
+ return this;
+ }
+
+ public LayersTraceSubject showsLayer(String layerName) {
+ mChecker.add(entry -> entry.isVisible(layerName),
+ "showsLayer(" + layerName + ")");
+ return this;
+ }
+
+ public LayersTraceSubject hidesLayer(String layerName) {
+ mChecker.add(entry -> entry.isVisible(layerName).negate(),
+ "hidesLayer(" + layerName + ")");
+ return this;
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java
new file mode 100644
index 0000000..f6e8192
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/TransitionRunner.java
@@ -0,0 +1,423 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import android.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.test.InstrumentationRegistry;
+import android.util.Log;
+
+import com.android.server.wm.flicker.monitor.ITransitionMonitor;
+import com.android.server.wm.flicker.monitor.LayersTraceMonitor;
+import com.android.server.wm.flicker.monitor.ScreenRecorder;
+import com.android.server.wm.flicker.monitor.WindowAnimationFrameStatsMonitor;
+import com.android.server.wm.flicker.monitor.WindowManagerTraceMonitor;
+
+import com.google.common.io.Files;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Builds and runs UI transitions capturing test artifacts.
+ *
+ * User can compose a transition from simpler steps, specifying setup and teardown steps. During
+ * a transition, Layers trace, WindowManager trace, screen recordings and window animation frame
+ * stats can be captured.
+ *
+ * <pre>
+ * Transition builder options:
+ * {@link TransitionBuilder#run(Runnable)} run transition under test. Monitors will be started
+ * before the transition and stopped after the transition is completed.
+ * {@link TransitionBuilder#repeat(int)} repeat transitions under test multiple times recording
+ * result for each run.
+ * {@link TransitionBuilder#withTag(String)} specify a string identifier used to prefix logs and
+ * artifacts generated.
+ * {@link TransitionBuilder#runBeforeAll(Runnable)} run setup transitions once before all other
+ * transition are run to set up an initial state on device.
+ * {@link TransitionBuilder#runBefore(Runnable)} run setup transitions before each test transition
+ * run.
+ * {@link TransitionBuilder#runAfter(Runnable)} run teardown transitions after each test
+ * transition.
+ * {@link TransitionBuilder#runAfter(Runnable)} run teardown transitions once after all
+ * other transition are run.
+ * {@link TransitionBuilder#includeJankyRuns()} disables {@link WindowAnimationFrameStatsMonitor}
+ * to monitor janky frames. If janky frames are detected, then the test run is skipped. This
+ * monitor is enabled by default.
+ * {@link TransitionBuilder#skipLayersTrace()} disables {@link LayersTraceMonitor} used to
+ * capture Layers trace during a transition. This monitor is enabled by default.
+ * {@link TransitionBuilder#skipWindowManagerTrace()} disables {@link WindowManagerTraceMonitor}
+ * used to capture WindowManager trace during a transition. This monitor is enabled by
+ * default.
+ * {@link TransitionBuilder#recordAllRuns()} records the screen contents and saves it to a file.
+ * All the runs including setup and teardown transitions are included in the recording. This
+ * monitor is used for debugging purposes.
+ * {@link TransitionBuilder#recordEachRun()} records the screen contents during test transitions
+ * and saves it to a file for each run. This monitor is used for debugging purposes.
+ *
+ * Example transition to capture WindowManager and Layers trace when opening a test app:
+ * {@code
+ * TransitionRunner.newBuilder()
+ * .withTag("OpenTestAppFast")
+ * .runBeforeAll(UiAutomationLib::wakeUp)
+ * .runBeforeAll(UiAutomationLib::UnlockDevice)
+ * .runBeforeAll(UiAutomationLib::openTestApp)
+ * .runBefore(UiAutomationLib::closeTestApp)
+ * .run(UiAutomationLib::openTestApp)
+ * .runAfterAll(UiAutomationLib::closeTestApp)
+ * .repeat(5)
+ * .build()
+ * .run();
+ * }
+ * </pre>
+ */
+class TransitionRunner {
+ private static final String TAG = "FLICKER";
+ private final ScreenRecorder mScreenRecorder;
+ private final WindowManagerTraceMonitor mWmTraceMonitor;
+ private final LayersTraceMonitor mLayersTraceMonitor;
+ private final WindowAnimationFrameStatsMonitor mFrameStatsMonitor;
+
+ private final List<ITransitionMonitor> mAllRunsMonitors;
+ private final List<ITransitionMonitor> mPerRunMonitors;
+ private final List<Runnable> mBeforeAlls;
+ private final List<Runnable> mBefores;
+ private final List<Runnable> mTransitions;
+ private final List<Runnable> mAfters;
+ private final List<Runnable> mAfterAlls;
+
+ private final int mIterations;
+ private final String mTestTag;
+
+ @Nullable
+ private List<TransitionResult> mResults = null;
+
+ private TransitionRunner(TransitionBuilder builder) {
+ mScreenRecorder = builder.mScreenRecorder;
+ mWmTraceMonitor = builder.mWmTraceMonitor;
+ mLayersTraceMonitor = builder.mLayersTraceMonitor;
+ mFrameStatsMonitor = builder.mFrameStatsMonitor;
+
+ mAllRunsMonitors = builder.mAllRunsMonitors;
+ mPerRunMonitors = builder.mPerRunMonitors;
+ mBeforeAlls = builder.mBeforeAlls;
+ mBefores = builder.mBefores;
+ mTransitions = builder.mTransitions;
+ mAfters = builder.mAfters;
+ mAfterAlls = builder.mAfterAlls;
+
+ mIterations = builder.mIterations;
+ mTestTag = builder.mTestTag;
+ }
+
+ static TransitionBuilder newBuilder() {
+ return new TransitionBuilder();
+ }
+
+ /**
+ * Runs the composed transition and calls monitors at the appropriate stages. If jank monitor
+ * is enabled, transitions with jank are skipped.
+ *
+ * @return itself
+ */
+ TransitionRunner run() {
+ mResults = new ArrayList<>();
+ mAllRunsMonitors.forEach(ITransitionMonitor::start);
+ mBeforeAlls.forEach(Runnable::run);
+ for (int iteration = 0; iteration < mIterations; iteration++) {
+ mBefores.forEach(Runnable::run);
+ mPerRunMonitors.forEach(ITransitionMonitor::start);
+ mTransitions.forEach(Runnable::run);
+ mPerRunMonitors.forEach(ITransitionMonitor::stop);
+ mAfters.forEach(Runnable::run);
+ if (runJankFree() && mFrameStatsMonitor.jankyFramesDetected()) {
+ String msg = String.format("Skipping iteration %d/%d for test %s due to jank. %s",
+ iteration, mIterations - 1, mTestTag, mFrameStatsMonitor.toString());
+ Log.e(TAG, msg);
+ continue;
+ }
+ mResults.add(saveResult(iteration));
+ }
+ mAfterAlls.forEach(Runnable::run);
+ mAllRunsMonitors.forEach(monitor -> {
+ monitor.stop();
+ Path path = monitor.save(mTestTag);
+ Log.e(TAG, "Video saved to " + path.toString());
+ });
+ return this;
+ }
+
+ /**
+ * Returns a list of transition results.
+ *
+ * @return list of transition results.
+ */
+ List<TransitionResult> getResults() {
+ if (mResults == null) {
+ throw new IllegalStateException("Results do not exist!");
+ }
+ return mResults;
+ }
+
+ /**
+ * Deletes all transition results that are not marked for saving.
+ *
+ * @return list of transition results.
+ */
+ void deleteResults() {
+ if (mResults == null) {
+ return;
+ }
+ mResults.stream()
+ .filter(TransitionResult::canDelete)
+ .forEach(TransitionResult::delete);
+ mResults = null;
+ }
+
+ /**
+ * Saves monitor results to file.
+ *
+ * @return object containing paths to test artifacts
+ */
+ private TransitionResult saveResult(int iteration) {
+ Path windowTrace = null;
+ Path layerTrace = null;
+ Path screenCaptureVideo = null;
+
+ if (mPerRunMonitors.contains(mWmTraceMonitor)) {
+ windowTrace = mWmTraceMonitor.save(mTestTag, iteration);
+ }
+ if (mPerRunMonitors.contains(mLayersTraceMonitor)) {
+ layerTrace = mLayersTraceMonitor.save(mTestTag, iteration);
+ }
+ if (mPerRunMonitors.contains(mScreenRecorder)) {
+ screenCaptureVideo = mScreenRecorder.save(mTestTag, iteration);
+ }
+ return new TransitionResult(layerTrace, windowTrace, screenCaptureVideo);
+ }
+
+ private boolean runJankFree() {
+ return mPerRunMonitors.contains(mFrameStatsMonitor);
+ }
+
+ public String getTestTag() {
+ return mTestTag;
+ }
+
+ /**
+ * Stores paths to all test artifacts.
+ */
+ @VisibleForTesting
+ public static class TransitionResult {
+ @Nullable
+ final Path layersTrace;
+ @Nullable
+ final Path windowManagerTrace;
+ @Nullable
+ final Path screenCaptureVideo;
+ private boolean flaggedForSaving;
+
+ TransitionResult(@Nullable Path layersTrace, @Nullable Path windowManagerTrace,
+ @Nullable Path screenCaptureVideo) {
+ this.layersTrace = layersTrace;
+ this.windowManagerTrace = windowManagerTrace;
+ this.screenCaptureVideo = screenCaptureVideo;
+ }
+
+ void flagForSaving() {
+ flaggedForSaving = true;
+ }
+
+ boolean canDelete() {
+ return !flaggedForSaving;
+ }
+
+ boolean layersTraceExists() {
+ return layersTrace != null && layersTrace.toFile().exists();
+ }
+
+ byte[] getLayersTrace() {
+ try {
+ return Files.toByteArray(this.layersTrace.toFile());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ Path getLayersTracePath() {
+ return layersTrace;
+ }
+
+ boolean windowManagerTraceExists() {
+ return windowManagerTrace != null && windowManagerTrace.toFile().exists();
+ }
+
+ public byte[] getWindowManagerTrace() {
+ try {
+ return Files.toByteArray(this.windowManagerTrace.toFile());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ Path getWindowManagerTracePath() {
+ return windowManagerTrace;
+ }
+
+ boolean screenCaptureVideoExists() {
+ return screenCaptureVideo != null && screenCaptureVideo.toFile().exists();
+ }
+
+ Path screenCaptureVideoPath() {
+ return screenCaptureVideo;
+ }
+
+ void delete() {
+ if (layersTraceExists()) layersTrace.toFile().delete();
+ if (windowManagerTraceExists()) windowManagerTrace.toFile().delete();
+ if (screenCaptureVideoExists()) screenCaptureVideo.toFile().delete();
+ }
+ }
+
+ /**
+ * Builds a {@link TransitionRunner} instance.
+ */
+ static class TransitionBuilder {
+ private ScreenRecorder mScreenRecorder;
+ private WindowManagerTraceMonitor mWmTraceMonitor;
+ private LayersTraceMonitor mLayersTraceMonitor;
+ private WindowAnimationFrameStatsMonitor mFrameStatsMonitor;
+
+ private List<ITransitionMonitor> mAllRunsMonitors = new LinkedList<>();
+ private List<ITransitionMonitor> mPerRunMonitors = new LinkedList<>();
+ private List<Runnable> mBeforeAlls = new LinkedList<>();
+ private List<Runnable> mBefores = new LinkedList<>();
+ private List<Runnable> mTransitions = new LinkedList<>();
+ private List<Runnable> mAfters = new LinkedList<>();
+ private List<Runnable> mAfterAlls = new LinkedList<>();
+
+ private boolean mRunJankFree = true;
+ private boolean mCaptureWindowManagerTrace = true;
+ private boolean mCaptureLayersTrace = true;
+ private boolean mRecordEachRun = false;
+ private int mIterations = 1;
+ private String mTestTag = "";
+
+ private boolean mRecordAllRuns = false;
+
+ TransitionBuilder() {
+ mScreenRecorder = new ScreenRecorder();
+ mWmTraceMonitor = new WindowManagerTraceMonitor();
+ mLayersTraceMonitor = new LayersTraceMonitor();
+ mFrameStatsMonitor = new
+ WindowAnimationFrameStatsMonitor(InstrumentationRegistry.getInstrumentation());
+ }
+
+ TransitionRunner build() {
+ if (mCaptureWindowManagerTrace) {
+ mPerRunMonitors.add(mWmTraceMonitor);
+ }
+
+ if (mCaptureLayersTrace) {
+ mPerRunMonitors.add(mLayersTraceMonitor);
+ }
+
+ if (mRunJankFree) {
+ mPerRunMonitors.add(mFrameStatsMonitor);
+ }
+
+ if (mRecordAllRuns) {
+ mAllRunsMonitors.add(mScreenRecorder);
+ }
+
+ if (mRecordEachRun) {
+ mPerRunMonitors.add(mScreenRecorder);
+ }
+
+ return new TransitionRunner(this);
+ }
+
+ TransitionBuilder runBeforeAll(Runnable runnable) {
+ mBeforeAlls.add(runnable);
+ return this;
+ }
+
+ TransitionBuilder runBefore(Runnable runnable) {
+ mBefores.add(runnable);
+ return this;
+ }
+
+ TransitionBuilder run(Runnable runnable) {
+ mTransitions.add(runnable);
+ return this;
+ }
+
+ TransitionBuilder runAfter(Runnable runnable) {
+ mAfters.add(runnable);
+ return this;
+ }
+
+ TransitionBuilder runAfterAll(Runnable runnable) {
+ mAfterAlls.add(runnable);
+ return this;
+ }
+
+ TransitionBuilder repeat(int iterations) {
+ mIterations = iterations;
+ return this;
+ }
+
+ TransitionBuilder skipWindowManagerTrace() {
+ mCaptureWindowManagerTrace = false;
+ return this;
+ }
+
+ TransitionBuilder skipLayersTrace() {
+ mCaptureLayersTrace = false;
+ return this;
+ }
+
+ TransitionBuilder includeJankyRuns() {
+ mRunJankFree = false;
+ return this;
+ }
+
+ TransitionBuilder recordEachRun() {
+ if (mRecordAllRuns) {
+ throw new IllegalArgumentException("Invalid option with recordAllRuns");
+ }
+ mRecordEachRun = true;
+ return this;
+ }
+
+ TransitionBuilder recordAllRuns() {
+ if (mRecordEachRun) {
+ throw new IllegalArgumentException("Invalid option with recordEachRun");
+ }
+ mRecordAllRuns = true;
+ return this;
+ }
+
+ TransitionBuilder withTag(String testTag) {
+ mTestTag = testTag;
+ return this;
+ }
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowManagerTrace.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowManagerTrace.java
new file mode 100644
index 0000000..e3592eb
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowManagerTrace.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import android.annotation.Nullable;
+
+import com.android.server.wm.flicker.Assertions.Result;
+import com.android.server.wm.nano.AppWindowTokenProto;
+import com.android.server.wm.nano.StackProto;
+import com.android.server.wm.nano.TaskProto;
+import com.android.server.wm.nano.WindowManagerTraceFileProto;
+import com.android.server.wm.nano.WindowManagerTraceProto;
+import com.android.server.wm.nano.WindowStateProto;
+import com.android.server.wm.nano.WindowTokenProto;
+
+import com.google.protobuf.nano.InvalidProtocolBufferNanoException;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Contains a collection of parsed WindowManager trace entries and assertions to apply over
+ * a single entry.
+ *
+ * Each entry is parsed into a list of {@link WindowManagerTrace.Entry} objects.
+ */
+public class WindowManagerTrace {
+ private static final int DEFAULT_DISPLAY = 0;
+ private final List<Entry> mEntries;
+ @Nullable
+ final private Path mSource;
+
+ private WindowManagerTrace(List<Entry> entries, Path source) {
+ this.mEntries = entries;
+ this.mSource = source;
+ }
+
+ /**
+ * Parses {@code WindowManagerTraceFileProto} from {@code data} and uses the proto to
+ * generates a list of trace entries.
+ *
+ * @param data binary proto data
+ * @param source Path to source of data for additional debug information
+ */
+ static WindowManagerTrace parseFrom(byte[] data, Path source) {
+ List<Entry> entries = new ArrayList<>();
+
+ WindowManagerTraceFileProto fileProto;
+ try {
+ fileProto = WindowManagerTraceFileProto.parseFrom(data);
+ } catch (InvalidProtocolBufferNanoException e) {
+ throw new RuntimeException(e);
+ }
+ for (WindowManagerTraceProto entryProto : fileProto.entry) {
+ entries.add(new Entry(entryProto));
+ }
+ return new WindowManagerTrace(entries, source);
+ }
+
+ static WindowManagerTrace parseFrom(byte[] data) {
+ return parseFrom(data, null);
+ }
+
+ public List<Entry> getEntries() {
+ return mEntries;
+ }
+
+ Entry getEntry(long timestamp) {
+ Optional<Entry> entry = mEntries.stream()
+ .filter(e -> e.getTimestamp() == timestamp)
+ .findFirst();
+ if (!entry.isPresent()) {
+ throw new RuntimeException("Entry does not exist for timestamp " + timestamp);
+ }
+ return entry.get();
+ }
+
+ Optional<Path> getSource() {
+ return Optional.ofNullable(mSource);
+ }
+
+ /**
+ * Represents a single WindowManager trace entry.
+ */
+ static class Entry implements ITraceEntry {
+ private final WindowManagerTraceProto mProto;
+
+ Entry(WindowManagerTraceProto proto) {
+ mProto = proto;
+ }
+
+ private static Result isWindowVisible(String windowTitle,
+ WindowTokenProto[] windowTokenProtos) {
+ boolean titleFound = false;
+ for (WindowTokenProto windowToken : windowTokenProtos) {
+ for (WindowStateProto windowState : windowToken.windows) {
+ if (windowState.identifier.title.contains(windowTitle)) {
+ titleFound = true;
+ if (isVisible(windowState)) {
+ return new Result(true /* success */,
+ windowState.identifier.title + " is visible");
+ }
+ }
+ }
+ }
+
+ String reason;
+ if (!titleFound) {
+ reason = windowTitle + " cannot be found";
+ } else {
+ reason = windowTitle + " is invisible";
+ }
+ return new Result(false /* success */, reason);
+ }
+
+ private static boolean isVisible(WindowStateProto windowState) {
+ return windowState.windowContainer.visible;
+ }
+
+ @Override
+ public long getTimestamp() {
+ return mProto.elapsedRealtimeNanos;
+ }
+
+ /**
+ * Returns window title of the top most visible app window.
+ */
+ private String getTopVisibleAppWindow() {
+ StackProto[] stacks = mProto.windowManagerService.rootWindowContainer
+ .displays[DEFAULT_DISPLAY].stacks;
+ for (StackProto stack : stacks) {
+ for (TaskProto task : stack.tasks) {
+ for (AppWindowTokenProto token : task.appWindowTokens) {
+ for (WindowStateProto windowState : token.windowToken.windows) {
+ if (windowState.windowContainer.visible) {
+ return task.appWindowTokens[0].name;
+ }
+ }
+ }
+ }
+ }
+
+ return "";
+ }
+
+ /**
+ * Checks if aboveAppWindow with {@code windowTitle} is visible.
+ */
+ Result isAboveAppWindowVisible(String windowTitle) {
+ WindowTokenProto[] windowTokenProtos = mProto.windowManagerService
+ .rootWindowContainer
+ .displays[DEFAULT_DISPLAY].aboveAppWindows;
+ Result result = isWindowVisible(windowTitle, windowTokenProtos);
+ return new Result(result.success, getTimestamp(), "showsAboveAppWindow", result.reason);
+ }
+
+ /**
+ * Checks if belowAppWindow with {@code windowTitle} is visible.
+ */
+ Result isBelowAppWindowVisible(String windowTitle) {
+ WindowTokenProto[] windowTokenProtos = mProto.windowManagerService
+ .rootWindowContainer
+ .displays[DEFAULT_DISPLAY].belowAppWindows;
+ Result result = isWindowVisible(windowTitle, windowTokenProtos);
+ return new Result(result.success, getTimestamp(), "isBelowAppWindowVisible",
+ result.reason);
+ }
+
+ /**
+ * Checks if imeWindow with {@code windowTitle} is visible.
+ */
+ Result isImeWindowVisible(String windowTitle) {
+ WindowTokenProto[] windowTokenProtos = mProto.windowManagerService
+ .rootWindowContainer
+ .displays[DEFAULT_DISPLAY].imeWindows;
+ Result result = isWindowVisible(windowTitle, windowTokenProtos);
+ return new Result(result.success, getTimestamp(), "isImeWindowVisible",
+ result.reason);
+ }
+
+ /**
+ * Checks if app window with {@code windowTitle} is on top.
+ */
+ Result isVisibleAppWindowOnTop(String windowTitle) {
+ String topAppWindow = getTopVisibleAppWindow();
+ boolean success = topAppWindow.contains(windowTitle);
+ String reason = "wanted=" + windowTitle + " found=" + topAppWindow;
+ return new Result(success, getTimestamp(), "isAppWindowOnTop", reason);
+ }
+
+ /**
+ * Checks if app window with {@code windowTitle} is visible.
+ */
+ Result isAppWindowVisible(String windowTitle) {
+ final String assertionName = "isAppWindowVisible";
+ boolean titleFound = false;
+ StackProto[] stacks = mProto.windowManagerService.rootWindowContainer
+ .displays[DEFAULT_DISPLAY].stacks;
+ for (StackProto stack : stacks) {
+ for (TaskProto task : stack.tasks) {
+ for (AppWindowTokenProto token : task.appWindowTokens) {
+ if (token.name.contains(windowTitle)) {
+ titleFound = true;
+ for (WindowStateProto windowState : token.windowToken.windows) {
+ if (windowState.windowContainer.visible) {
+ return new Result(true /* success */, getTimestamp(),
+ assertionName, "Window " + token.name +
+ "is visible");
+ }
+ }
+ }
+ }
+ }
+ }
+ String reason;
+ if (!titleFound) {
+ reason = "Window " + windowTitle + " cannot be found";
+ } else {
+ reason = "Window " + windowTitle + " is invisible";
+ }
+ return new Result(false /* success */, getTimestamp(), assertionName, reason);
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java
new file mode 100644
index 0000000..0da8761
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WindowUtils.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.support.test.InstrumentationRegistry;
+import android.view.Surface;
+import android.view.WindowManager;
+
+/**
+ * Helper functions to retrieve system window sizes and positions.
+ */
+class WindowUtils {
+
+ static Rect getDisplayBounds() {
+ Point display = new Point();
+ WindowManager wm =
+ (WindowManager) InstrumentationRegistry.getContext().getSystemService(
+ Context.WINDOW_SERVICE);
+ wm.getDefaultDisplay().getRealSize(display);
+ return new Rect(0, 0, display.x, display.y);
+ }
+
+ private static int getCurrentRotation() {
+ WindowManager wm =
+ (WindowManager) InstrumentationRegistry.getContext().getSystemService(
+ Context.WINDOW_SERVICE);
+ return wm.getDefaultDisplay().getRotation();
+ }
+
+ static Rect getDisplayBounds(int requestedRotation) {
+ Rect displayBounds = getDisplayBounds();
+ int currentDisplayRotation = getCurrentRotation();
+
+ boolean displayIsRotated = (currentDisplayRotation == Surface.ROTATION_90 ||
+ currentDisplayRotation == Surface.ROTATION_270);
+
+ boolean requestedDisplayIsRotated = requestedRotation == Surface.ROTATION_90 ||
+ requestedRotation == Surface.ROTATION_270;
+
+ // if the current orientation changes with the requested rotation,
+ // flip height and width of display bounds.
+ if (displayIsRotated != requestedDisplayIsRotated) {
+ return new Rect(0, 0, displayBounds.height(), displayBounds.width());
+ }
+
+ return new Rect(0, 0, displayBounds.width(), displayBounds.height());
+ }
+
+
+ static Rect getAppPosition(int requestedRotation) {
+ Rect displayBounds = getDisplayBounds();
+ int currentDisplayRotation = getCurrentRotation();
+
+ boolean displayIsRotated = currentDisplayRotation == Surface.ROTATION_90 ||
+ currentDisplayRotation == Surface.ROTATION_270;
+
+ boolean requestedAppIsRotated = requestedRotation == Surface.ROTATION_90 ||
+ requestedRotation == Surface.ROTATION_270;
+
+ // display size will change if the display is reflected. Flip height and width of app if the
+ // requested rotation is different from the current rotation.
+ if (displayIsRotated != requestedAppIsRotated) {
+ return new Rect(0, 0, displayBounds.height(), displayBounds.width());
+ }
+
+ return new Rect(0, 0, displayBounds.width(), displayBounds.height());
+ }
+
+ static Rect getStatusBarPosition(int requestedRotation) {
+ Resources resources = InstrumentationRegistry.getContext().getResources();
+ String resourceName;
+ Rect displayBounds = getDisplayBounds();
+ int width;
+ if (requestedRotation == Surface.ROTATION_0 || requestedRotation == Surface.ROTATION_180) {
+ resourceName = "status_bar_height_portrait";
+ width = Math.min(displayBounds.width(), displayBounds.height());
+ } else {
+ resourceName = "status_bar_height_landscape";
+ width = Math.max(displayBounds.width(), displayBounds.height());
+ }
+
+ int resourceId = resources.getIdentifier(resourceName, "dimen", "android");
+ int height = resources.getDimensionPixelSize(resourceId);
+
+ return new Rect(0, 0, width, height);
+ }
+
+ static Rect getNavigationBarPosition(int requestedRotation) {
+ Resources resources = InstrumentationRegistry.getContext().getResources();
+ Rect displayBounds = getDisplayBounds();
+ int displayWidth = Math.min(displayBounds.width(), displayBounds.height());
+ int displayHeight = Math.max(displayBounds.width(), displayBounds.height());
+ int resourceId;
+ if (requestedRotation == Surface.ROTATION_0 || requestedRotation == Surface.ROTATION_180) {
+ resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
+ int height = resources.getDimensionPixelSize(resourceId);
+ return new Rect(0, displayHeight - height, displayWidth, displayHeight);
+ } else {
+ resourceId = resources.getIdentifier("navigation_bar_width", "dimen", "android");
+ int width = resources.getDimensionPixelSize(resourceId);
+ // swap display dimensions in landscape or seascape mode
+ int temp = displayHeight;
+ displayHeight = displayWidth;
+ displayWidth = temp;
+ if (requestedRotation == Surface.ROTATION_90) {
+ return new Rect(0, 0, width, displayHeight);
+ } else {
+ return new Rect(displayWidth - width, 0, displayWidth, displayHeight);
+ }
+ }
+ }
+
+ static int getNavigationBarHeight() {
+ Resources resources = InstrumentationRegistry.getContext().getResources();
+ int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
+ return resources.getDimensionPixelSize(resourceId);
+ }
+
+ static int getDockedStackDividerInset() {
+ Resources resources = InstrumentationRegistry.getContext().getResources();
+ int resourceId = resources.getIdentifier("docked_stack_divider_insets", "dimen",
+ "android");
+ return resources.getDimensionPixelSize(resourceId);
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java
new file mode 100644
index 0000000..1fc7d59
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.google.common.truth.Truth.assertAbout;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.annotation.Nullable;
+
+import com.android.server.wm.flicker.Assertions.Result;
+import com.android.server.wm.flicker.TransitionRunner.TransitionResult;
+
+import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.Subject;
+import com.google.common.truth.SubjectFactory;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Truth subject for {@link WindowManagerTrace} objects.
+ */
+public class WmTraceSubject extends Subject<WmTraceSubject, WindowManagerTrace> {
+ // Boiler-plate Subject.Factory for WmTraceSubject
+ private static final SubjectFactory<WmTraceSubject, WindowManagerTrace> FACTORY =
+ new SubjectFactory<WmTraceSubject, WindowManagerTrace>() {
+ @Override
+ public WmTraceSubject getSubject(
+ FailureStrategy fs, @Nullable WindowManagerTrace target) {
+ return new WmTraceSubject(fs, target);
+ }
+ };
+
+ private AssertionsChecker<WindowManagerTrace.Entry> mChecker = new AssertionsChecker<>();
+
+ private WmTraceSubject(FailureStrategy fs, @Nullable WindowManagerTrace subject) {
+ super(fs, subject);
+ }
+
+ // User-defined entry point
+ public static WmTraceSubject assertThat(@Nullable WindowManagerTrace entry) {
+ return assertAbout(FACTORY).that(entry);
+ }
+
+ // User-defined entry point
+ public static WmTraceSubject assertThat(@Nullable TransitionResult result) {
+ WindowManagerTrace entries = WindowManagerTrace.parseFrom(result.getWindowManagerTrace(),
+ result.getWindowManagerTracePath());
+ return assertWithMessage(result.toString()).about(FACTORY).that(entries);
+ }
+
+ // Static method for getting the subject factory (for use with assertAbout())
+ public static SubjectFactory<WmTraceSubject, WindowManagerTrace> entries() {
+ return FACTORY;
+ }
+
+ public void forAllEntries() {
+ test();
+ }
+
+ public void forRange(long startTime, long endTime) {
+ mChecker.filterByRange(startTime, endTime);
+ test();
+ }
+
+ public WmTraceSubject then() {
+ mChecker.checkChangingAssertions();
+ return this;
+ }
+
+ public void inTheBeginning() {
+ if (getSubject().getEntries().isEmpty()) {
+ fail("No entries found.");
+ }
+ mChecker.checkFirstEntry();
+ test();
+ }
+
+ public void atTheEnd() {
+ if (getSubject().getEntries().isEmpty()) {
+ fail("No entries found.");
+ }
+ mChecker.checkLastEntry();
+ test();
+ }
+
+ private void test() {
+ List<Result> failures = mChecker.test(getSubject().getEntries());
+ if (!failures.isEmpty()) {
+ Optional<Path> failureTracePath = getSubject().getSource();
+ String failureLogs = failures.stream().map(Result::toString)
+ .collect(Collectors.joining("\n"));
+ String tracePath = "";
+ if (failureTracePath.isPresent()) {
+ tracePath = "\nWindowManager Trace can be found in: "
+ + failureTracePath.get().toAbsolutePath() + "\n";
+ }
+ fail(tracePath + failureLogs);
+ }
+ }
+
+ public WmTraceSubject showsAboveAppWindow(String partialWindowTitle) {
+ mChecker.add(entry -> entry.isAboveAppWindowVisible(partialWindowTitle),
+ "showsAboveAppWindow(" + partialWindowTitle + ")");
+ return this;
+ }
+
+ public WmTraceSubject hidesAboveAppWindow(String partialWindowTitle) {
+ mChecker.add(entry -> entry.isAboveAppWindowVisible(partialWindowTitle).negate(),
+ "hidesAboveAppWindow" + "(" + partialWindowTitle + ")");
+ return this;
+ }
+
+ public WmTraceSubject showsBelowAppWindow(String partialWindowTitle) {
+ mChecker.add(entry -> entry.isBelowAppWindowVisible(partialWindowTitle),
+ "showsBelowAppWindow(" + partialWindowTitle + ")");
+ return this;
+ }
+
+ public WmTraceSubject hidesBelowAppWindow(String partialWindowTitle) {
+ mChecker.add(entry -> entry.isBelowAppWindowVisible(partialWindowTitle).negate(),
+ "hidesBelowAppWindow" + "(" + partialWindowTitle + ")");
+ return this;
+ }
+
+ public WmTraceSubject showsImeWindow(String partialWindowTitle) {
+ mChecker.add(entry -> entry.isImeWindowVisible(partialWindowTitle),
+ "showsBelowAppWindow(" + partialWindowTitle + ")");
+ return this;
+ }
+
+ public WmTraceSubject hidesImeWindow(String partialWindowTitle) {
+ mChecker.add(entry -> entry.isImeWindowVisible(partialWindowTitle).negate(),
+ "hidesImeWindow" + "(" + partialWindowTitle + ")");
+ return this;
+ }
+
+ public WmTraceSubject showsAppWindowOnTop(String partialWindowTitle) {
+ mChecker.add(
+ entry -> {
+ Result result = entry.isAppWindowVisible(partialWindowTitle);
+ if (result.passed()) {
+ result = entry.isVisibleAppWindowOnTop(partialWindowTitle);
+ }
+ return result;
+ },
+ "showsAppWindowOnTop(" + partialWindowTitle + ")"
+ );
+ return this;
+ }
+
+ public WmTraceSubject hidesAppWindowOnTop(String partialWindowTitle) {
+ mChecker.add(
+ entry -> {
+ Result result = entry.isAppWindowVisible(partialWindowTitle).negate();
+ if (result.failed()) {
+ result = entry.isVisibleAppWindowOnTop(partialWindowTitle).negate();
+ }
+ return result;
+ },
+ "hidesAppWindowOnTop(" + partialWindowTitle + ")"
+ );
+ return this;
+ }
+
+ public WmTraceSubject showsAppWindow(String partialWindowTitle) {
+ mChecker.add(entry -> entry.isAppWindowVisible(partialWindowTitle),
+ "showsAppWindow(" + partialWindowTitle + ")");
+ return this;
+ }
+
+ public WmTraceSubject hidesAppWindow(String partialWindowTitle) {
+ mChecker.add(entry -> entry.isAppWindowVisible(partialWindowTitle).negate(),
+ "hidesAppWindow(" + partialWindowTitle + ")");
+ return this;
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ITransitionMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ITransitionMonitor.java
new file mode 100644
index 0000000..67e0ecc
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ITransitionMonitor.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import android.os.Environment;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Collects test artifacts during a UI transition.
+ */
+public interface ITransitionMonitor {
+ Path OUTPUT_DIR = Paths.get(Environment.getExternalStorageDirectory().toString(), "flicker");
+
+ /**
+ * Starts monitor.
+ */
+ void start();
+
+ /**
+ * Stops monitor.
+ */
+ void stop();
+
+ /**
+ * Saves any monitor artifacts to file adding {@code testTag} and {@code iteration}
+ * to the file name.
+ *
+ * @param testTag suffix added to artifact name
+ * @param iteration suffix added to artifact name
+ *
+ * @return Path to saved artifact
+ */
+ default Path save(String testTag, int iteration) {
+ return save(testTag + "_" + iteration);
+ }
+
+ /**
+ * Saves any monitor artifacts to file adding {@code testTag} to the file name.
+ *
+ * @param testTag suffix added to artifact name
+ *
+ * @return Path to saved artifact
+ */
+ default Path save(String testTag) {
+ throw new UnsupportedOperationException("Save not implemented for this monitor");
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/LayersTraceMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/LayersTraceMonitor.java
new file mode 100644
index 0000000..c55d068
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/LayersTraceMonitor.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Log;
+
+/**
+ * Captures Layers trace from SurfaceFlinger.
+ */
+public class LayersTraceMonitor extends TraceMonitor {
+ private static final String TAG = "LayersTraceMonitor";
+ private IBinder mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
+
+ public LayersTraceMonitor() {
+ traceFileName = "layers_trace.pb";
+ }
+
+ @Override
+ public void start() {
+ setEnabled(true);
+ }
+
+ @Override
+ public void stop() {
+ setEnabled(false);
+ }
+
+ @Override
+ public boolean isEnabled() throws RemoteException {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken("android.ui.ISurfaceComposer");
+ mSurfaceFlinger.transact(/* LAYER_TRACE_STATUS_CODE */ 1026,
+ data, reply, 0 /* flags */);
+ return reply.readBoolean();
+ }
+
+ private void setEnabled(boolean isEnabled) {
+ Parcel data = null;
+ try {
+ if (mSurfaceFlinger != null) {
+ data = Parcel.obtain();
+ data.writeInterfaceToken("android.ui.ISurfaceComposer");
+ data.writeInt(isEnabled ? 1 : 0);
+ mSurfaceFlinger.transact( /* LAYER_TRACE_CONTROL_CODE */ 1025,
+ data, null, 0 /* flags */);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Could not set layer tracing." + e.toString());
+ } finally {
+ if (data != null) {
+ data.recycle();
+ }
+ }
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ScreenRecorder.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ScreenRecorder.java
new file mode 100644
index 0000000..4787586
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/ScreenRecorder.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Captures screen contents and saves it as a mp4 video file.
+ */
+public class ScreenRecorder implements ITransitionMonitor {
+ @VisibleForTesting
+ static final Path DEFAULT_OUTPUT_PATH = OUTPUT_DIR.resolve("transition.mp4");
+ private static final String TAG = "FLICKER";
+ private Thread recorderThread;
+
+ @VisibleForTesting
+ static Path getPath(String testTag) {
+ return OUTPUT_DIR.resolve(testTag + ".mp4");
+ }
+
+ @Override
+ public void start() {
+ OUTPUT_DIR.toFile().mkdirs();
+ String command = "screenrecord " + DEFAULT_OUTPUT_PATH;
+ recorderThread = new Thread(() -> {
+ try {
+ Runtime.getRuntime().exec(command);
+ } catch (IOException e) {
+ Log.e(TAG, "Error executing " + command, e);
+ }
+ });
+ recorderThread.start();
+ }
+
+ @Override
+ public void stop() {
+ runShellCommand("killall -s 2 screenrecord");
+ try {
+ recorderThread.join();
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ }
+
+ @Override
+ public Path save(String testTag) {
+ try {
+ return Files.move(DEFAULT_OUTPUT_PATH, getPath(testTag),
+ REPLACE_EXISTING);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/TraceMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/TraceMonitor.java
new file mode 100644
index 0000000..0e154ec
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/TraceMonitor.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+
+import android.os.RemoteException;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Locale;
+
+/**
+ * Base class for monitors containing common logic to read the trace
+ * as a byte array and save the trace to another location.
+ */
+public abstract class TraceMonitor implements ITransitionMonitor {
+ public static final String TAG = "FLICKER";
+ private static final String TRACE_DIR = "/data/misc/wmtrace/";
+
+ String traceFileName;
+
+ abstract boolean isEnabled() throws RemoteException;
+
+ /**
+ * Saves trace file to the external storage directory suffixing the name with the testtag
+ * and iteration.
+ *
+ * Moves the trace file from the default location via a shell command since the test app
+ * does not have security privileges to access /data/misc/wmtrace.
+ *
+ * @param testTag suffix added to trace name used to identify trace
+ *
+ * @return Path to saved trace file
+ */
+ @Override
+ public Path save(String testTag) {
+ OUTPUT_DIR.toFile().mkdirs();
+ Path traceFileCopy = getOutputTraceFilePath(testTag);
+ String copyCommand = String.format(Locale.getDefault(), "mv %s%s %s", TRACE_DIR,
+ traceFileName, traceFileCopy.toString());
+ runShellCommand(copyCommand);
+ return traceFileCopy;
+ }
+
+ @VisibleForTesting
+ Path getOutputTraceFilePath(String testTag) {
+ return OUTPUT_DIR.resolve(traceFileName + "_" + testTag);
+ }
+}
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java
new file mode 100644
index 0000000..717d187
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitor.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import static android.view.FrameStats.UNDEFINED_TIME_NANO;
+
+import android.app.Instrumentation;
+import android.util.Log;
+import android.view.FrameStats;
+
+/**
+ * Monitors {@link android.view.WindowAnimationFrameStats} to detect janky frames.
+ *
+ * Adapted from {@link android.support.test.jank.internal.WindowAnimationFrameStatsMonitorImpl}
+ * using the same threshold to determine jank.
+ */
+public class WindowAnimationFrameStatsMonitor implements ITransitionMonitor {
+
+ private static final String TAG = "FLICKER";
+ // Maximum normalized error in frame duration before the frame is considered janky
+ private static final double MAX_ERROR = 0.5f;
+ // Maximum normalized frame duration before the frame is considered a pause
+ private static final double PAUSE_THRESHOLD = 15.0f;
+ private Instrumentation mInstrumentation;
+ private FrameStats stats;
+ private int numJankyFrames;
+ private long mLongestFrameNano = 0L;
+
+
+ /**
+ * Constructs a WindowAnimationFrameStatsMonitor instance.
+ */
+ public WindowAnimationFrameStatsMonitor(Instrumentation instrumentation) {
+ mInstrumentation = instrumentation;
+ }
+
+ private void analyze() {
+ int frameCount = stats.getFrameCount();
+ long refreshPeriodNano = stats.getRefreshPeriodNano();
+
+ // Skip first frame
+ for (int i = 2; i < frameCount; i++) {
+ // Handle frames that have not been presented.
+ if (stats.getFramePresentedTimeNano(i) == UNDEFINED_TIME_NANO) {
+ // The animation must not have completed. Warn and break out of the loop.
+ Log.w(TAG, "Skipping fenced frame.");
+ break;
+ }
+ long frameDurationNano = stats.getFramePresentedTimeNano(i) -
+ stats.getFramePresentedTimeNano(i - 1);
+ double normalized = (double) frameDurationNano / refreshPeriodNano;
+ if (normalized < PAUSE_THRESHOLD) {
+ if (normalized > 1.0f + MAX_ERROR) {
+ numJankyFrames++;
+ }
+ mLongestFrameNano = Math.max(mLongestFrameNano, frameDurationNano);
+ }
+ }
+ }
+
+ @Override
+ public void start() {
+ // Clear out any previous data
+ numJankyFrames = 0;
+ mLongestFrameNano = 0;
+ mInstrumentation.getUiAutomation().clearWindowAnimationFrameStats();
+ }
+
+ @Override
+ public void stop() {
+ stats = mInstrumentation.getUiAutomation().getWindowAnimationFrameStats();
+ analyze();
+ }
+
+ public boolean jankyFramesDetected() {
+ return stats.getFrameCount() > 0 && numJankyFrames > 0;
+ }
+
+ @Override
+ public String toString() {
+ return stats.toString() +
+ " RefreshPeriodNano:" + stats.getRefreshPeriodNano() +
+ " NumJankyFrames:" + numJankyFrames +
+ " LongestFrameNano:" + mLongestFrameNano;
+ }
+}
\ No newline at end of file
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitor.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitor.java
new file mode 100644
index 0000000..ae160b68
--- /dev/null
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitor.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import android.os.RemoteException;
+import android.view.IWindowManager;
+import android.view.WindowManagerGlobal;
+
+/**
+ * Captures WindowManager trace from WindowManager.
+ */
+public class WindowManagerTraceMonitor extends TraceMonitor {
+ private IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
+
+ public WindowManagerTraceMonitor() {
+ traceFileName = "wm_trace.pb";
+ }
+
+ @Override
+ public void start() {
+ try {
+ wm.startWindowTrace();
+ } catch (RemoteException e) {
+ throw new RuntimeException("Could not start trace", e);
+ }
+ }
+
+ @Override
+ public void stop() {
+ try {
+ wm.stopWindowTrace();
+ } catch (RemoteException e) {
+ throw new RuntimeException("Could not stop trace", e);
+ }
+ }
+
+ @Override
+ public boolean isEnabled() throws RemoteException{
+ return wm.isWindowTraceEnabled();
+ }
+}
diff --git a/tests/FlickerTests/lib/test/Android.mk b/tests/FlickerTests/lib/test/Android.mk
new file mode 100644
index 0000000..0e3f58d
--- /dev/null
+++ b/tests/FlickerTests/lib/test/Android.mk
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_PACKAGE_NAME := FlickerLibTest
+LOCAL_MODULE_TAGS := tests optional
+# sign this with platform cert, so this test is allowed to call private platform apis
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVATE_PLATFORM_APIS := true
+LOCAL_COMPATIBILITY_SUITE := tests
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-test \
+ platform-test-annotations \
+ truth-prebuilt \
+ platformprotosnano \
+ layersprotosnano \
+ flickerlib
+
+include $(BUILD_PACKAGE)
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/tests/FlickerTests/lib/test/AndroidManifest.xml b/tests/FlickerTests/lib/test/AndroidManifest.xml
new file mode 100644
index 0000000..d30172d
--- /dev/null
+++ b/tests/FlickerTests/lib/test/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.server.wm.flicker">
+
+ <uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27"/>
+ <!-- Read and write traces from external storage -->
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <!-- Capture screen contents -->
+ <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />
+ <!-- Run layers trace -->
+ <uses-permission android:name="android.permission.HARDWARE_TEST"/>
+ <application android:label="FlickerLibTest">
+ <uses-library android:name="android.test.runner"/>
+ </application>
+
+ <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.server.wm.flicker"
+ android:label="WindowManager Flicker Lib Test">
+ </instrumentation>
+
+</manifest>
\ No newline at end of file
diff --git a/tests/FlickerTests/lib/test/AndroidTest.xml b/tests/FlickerTests/lib/test/AndroidTest.xml
new file mode 100644
index 0000000..e4cc298
--- /dev/null
+++ b/tests/FlickerTests/lib/test/AndroidTest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ -->
+<configuration description="Config for WindowManager Flicker Tests">
+ <target_preparer class="com.google.android.tradefed.targetprep.GoogleDeviceSetup">
+ <!-- keeps the screen on during tests -->
+ <option name="screen-always-on" value="on" />
+ <!-- prevents the phone from restarting -->
+ <option name="force-skip-system-props" value="true" />
+ </target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true"/>
+ <option name="test-file-name" value="FlickerLibTest.apk"/>
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+ <option name="package" value="com.android.server.wm.flicker"/>
+ <option name="hidden-api-checks" value="false" />
+ </test>
+</configuration>
diff --git a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_emptyregion.pb b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_emptyregion.pb
new file mode 100644
index 0000000..98ee6f3
--- /dev/null
+++ b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_emptyregion.pb
Binary files differ
diff --git a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_invalid_layer_visibility.pb b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_invalid_layer_visibility.pb
new file mode 100644
index 0000000..20572d7
--- /dev/null
+++ b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_invalid_layer_visibility.pb
Binary files differ
diff --git a/tests/FlickerTests/lib/test/assets/testdata/layers_trace_orphanlayers.pb b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_orphanlayers.pb
new file mode 100644
index 0000000..af40797
--- /dev/null
+++ b/tests/FlickerTests/lib/test/assets/testdata/layers_trace_orphanlayers.pb
Binary files differ
diff --git a/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome.pb b/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome.pb
new file mode 100644
index 0000000..b3f3170
--- /dev/null
+++ b/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome.pb
Binary files differ
diff --git a/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome2.pb b/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome2.pb
new file mode 100644
index 0000000..b3b73ce
--- /dev/null
+++ b/tests/FlickerTests/lib/test/assets/testdata/wm_trace_openchrome2.pb
Binary files differ
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsCheckerTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsCheckerTest.java
new file mode 100644
index 0000000..8e7fe1b
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsCheckerTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.server.wm.flicker.Assertions.Result;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Contains {@link AssertionsChecker} tests.
+ * To run this test: {@code atest FlickerLibTest:AssertionsCheckerTest}
+ */
+public class AssertionsCheckerTest {
+
+ /**
+ * Returns a list of SimpleEntry objects with {@code data} and incremental timestamps starting
+ * at 0.
+ */
+ private static List<SimpleEntry> getTestEntries(int... data) {
+ List<SimpleEntry> entries = new ArrayList<>();
+ for (int i = 0; i < data.length; i++) {
+ entries.add(new SimpleEntry(i, data[i]));
+ }
+ return entries;
+ }
+
+ @Test
+ public void canCheckAllEntries() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.add(SimpleEntry::isData42, "isData42");
+
+ List<Result> failures = checker.test(getTestEntries(1, 1, 1, 1, 1));
+
+ assertThat(failures).hasSize(5);
+ }
+
+ @Test
+ public void canCheckFirstEntry() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.checkFirstEntry();
+ checker.add(SimpleEntry::isData42, "isData42");
+
+ List<Result> failures = checker.test(getTestEntries(1, 1, 1, 1, 1));
+
+ assertThat(failures).hasSize(1);
+ assertThat(failures.get(0).timestamp).isEqualTo(0);
+ }
+
+ @Test
+ public void canCheckLastEntry() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.checkLastEntry();
+ checker.add(SimpleEntry::isData42, "isData42");
+
+ List<Result> failures = checker.test(getTestEntries(1, 1, 1, 1, 1));
+
+ assertThat(failures).hasSize(1);
+ assertThat(failures.get(0).timestamp).isEqualTo(4);
+ }
+
+ @Test
+ public void canCheckRangeOfEntries() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.filterByRange(1, 2);
+ checker.add(SimpleEntry::isData42, "isData42");
+
+ List<Result> failures = checker.test(getTestEntries(1, 42, 42, 1, 1));
+
+ assertThat(failures).hasSize(0);
+ }
+
+ @Test
+ public void emptyRangePasses() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.filterByRange(9, 10);
+ checker.add(SimpleEntry::isData42, "isData42");
+
+ List<Result> failures = checker.test(getTestEntries(1, 1, 1, 1, 1));
+
+ assertThat(failures).isEmpty();
+ }
+
+ @Test
+ public void canCheckChangingAssertions() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.add(SimpleEntry::isData42, "isData42");
+ checker.add(SimpleEntry::isData0, "isData0");
+ checker.checkChangingAssertions();
+
+ List<Result> failures = checker.test(getTestEntries(42, 0, 0, 0, 0));
+
+ assertThat(failures).isEmpty();
+ }
+
+ @Test
+ public void canCheckChangingAssertions_withNoAssertions() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.checkChangingAssertions();
+
+ List<Result> failures = checker.test(getTestEntries(42, 0, 0, 0, 0));
+
+ assertThat(failures).isEmpty();
+ }
+
+ @Test
+ public void canCheckChangingAssertions_withSingleAssertion() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.add(SimpleEntry::isData42, "isData42");
+ checker.checkChangingAssertions();
+
+ List<Result> failures = checker.test(getTestEntries(42, 42, 42, 42, 42));
+
+ assertThat(failures).isEmpty();
+ }
+
+ @Test
+ public void canFailCheckChangingAssertions_ifStartingAssertionFails() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.add(SimpleEntry::isData42, "isData42");
+ checker.add(SimpleEntry::isData0, "isData0");
+ checker.checkChangingAssertions();
+
+ List<Result> failures = checker.test(getTestEntries(0, 0, 0, 0, 0));
+
+ assertThat(failures).hasSize(1);
+ }
+
+ @Test
+ public void canFailCheckChangingAssertions_ifStartingAssertionAlwaysPasses() {
+ AssertionsChecker<SimpleEntry> checker = new AssertionsChecker<>();
+ checker.add(SimpleEntry::isData42, "isData42");
+ checker.add(SimpleEntry::isData0, "isData0");
+ checker.checkChangingAssertions();
+
+ List<Result> failures = checker.test(getTestEntries(0, 0, 0, 0, 0));
+
+ assertThat(failures).hasSize(1);
+ }
+
+ static class SimpleEntry implements ITraceEntry {
+ long timestamp;
+ int data;
+
+ SimpleEntry(long timestamp, int data) {
+ this.timestamp = timestamp;
+ this.data = data;
+ }
+
+ @Override
+ public long getTimestamp() {
+ return timestamp;
+ }
+
+ Result isData42() {
+ return new Result(this.data == 42, this.timestamp, "is42", "");
+ }
+
+ Result isData0() {
+ return new Result(this.data == 0, this.timestamp, "is42", "");
+ }
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsTest.java
new file mode 100644
index 0000000..7fd178c
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/AssertionsTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.server.wm.flicker.Assertions.Result;
+
+import org.junit.Test;
+
+/**
+ * Contains {@link Assertions} tests.
+ * To run this test: {@code atest FlickerLibTest:AssertionsTest}
+ */
+public class AssertionsTest {
+ @Test
+ public void traceEntryAssertionCanNegateResult() {
+ Assertions.TraceAssertion<Integer> assertNumEquals42 =
+ getIntegerTraceEntryAssertion();
+
+ assertThat(assertNumEquals42.apply(1).success).isFalse();
+ assertThat(assertNumEquals42.negate().apply(1).success).isTrue();
+
+ assertThat(assertNumEquals42.apply(42).success).isTrue();
+ assertThat(assertNumEquals42.negate().apply(42).success).isFalse();
+ }
+
+ @Test
+ public void resultCanBeNegated() {
+ String reason = "Everything is fine!";
+ Result result = new Result(true, 0, "TestAssert", reason);
+ Result negatedResult = result.negate();
+ assertThat(negatedResult.success).isFalse();
+ assertThat(negatedResult.reason).isEqualTo(reason);
+ assertThat(negatedResult.assertionName).isEqualTo("!TestAssert");
+ }
+
+ private Assertions.TraceAssertion<Integer> getIntegerTraceEntryAssertion() {
+ return (num) -> {
+ if (num == 42) {
+ return new Result(true, "Num equals 42");
+ }
+ return new Result(false, "Num doesn't equal 42, actual:" + num);
+ };
+ }
+}
\ No newline at end of file
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceSubjectTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceSubjectTest.java
new file mode 100644
index 0000000..d06c5d7
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceSubjectTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.LayersTraceSubject.assertThat;
+import static com.android.server.wm.flicker.TestFileUtils.readTestFile;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.fail;
+
+import android.graphics.Rect;
+
+import org.junit.Test;
+
+import java.nio.file.Paths;
+
+/**
+ * Contains {@link LayersTraceSubject} tests.
+ * To run this test: {@code atest FlickerLibTest:LayersTraceSubjectTest}
+ */
+public class LayersTraceSubjectTest {
+ private static final Rect displayRect = new Rect(0, 0, 1440, 2880);
+
+ private static LayersTrace readLayerTraceFromFile(String relativePath) {
+ try {
+ return LayersTrace.parseFrom(readTestFile(relativePath), Paths.get(relativePath));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Test
+ public void testCanDetectEmptyRegionFromLayerTrace() {
+ LayersTrace layersTraceEntries = readLayerTraceFromFile("layers_trace_emptyregion.pb");
+ try {
+ assertThat(layersTraceEntries).coversRegion(displayRect).forAllEntries();
+ fail("Assertion passed");
+ } catch (AssertionError e) {
+ assertWithMessage("Contains path to trace")
+ .that(e.getMessage()).contains("layers_trace_emptyregion.pb");
+ assertWithMessage("Contains timestamp")
+ .that(e.getMessage()).contains("0h38m28s8ms");
+ assertWithMessage("Contains assertion function")
+ .that(e.getMessage()).contains("coversRegion");
+ assertWithMessage("Contains debug info")
+ .that(e.getMessage()).contains("Region to test: " + displayRect);
+ assertWithMessage("Contains debug info")
+ .that(e.getMessage()).contains("first empty point: 0, 99");
+ }
+ }
+
+ @Test
+ public void testCanDetectIncorrectVisibilityFromLayerTrace() {
+ LayersTrace layersTraceEntries = readLayerTraceFromFile(
+ "layers_trace_invalid_layer_visibility.pb");
+ try {
+ assertThat(layersTraceEntries).showsLayer("com.android.server.wm.flicker.testapp")
+ .then().hidesLayer("com.android.server.wm.flicker.testapp").forAllEntries();
+ fail("Assertion passed");
+ } catch (AssertionError e) {
+ assertWithMessage("Contains path to trace")
+ .that(e.getMessage()).contains("layers_trace_invalid_layer_visibility.pb");
+ assertWithMessage("Contains timestamp")
+ .that(e.getMessage()).contains("70h13m14s303ms");
+ assertWithMessage("Contains assertion function")
+ .that(e.getMessage()).contains("!isVisible");
+ assertWithMessage("Contains debug info")
+ .that(e.getMessage()).contains(
+ "com.android.server.wm.flicker.testapp/com.android.server.wm.flicker.testapp"
+ + ".SimpleActivity#0 is visible");
+ }
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java
new file mode 100644
index 0000000..42b2aca
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/LayersTraceTest.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.TestFileUtils.readTestFile;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.support.test.InstrumentationRegistry;
+import android.view.WindowManager;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Contains {@link LayersTrace} tests.
+ * To run this test: {@code atest FlickerLibTest:LayersTraceTest}
+ */
+public class LayersTraceTest {
+ private static LayersTrace readLayerTraceFromFile(String relativePath) {
+ try {
+ return LayersTrace.parseFrom(readTestFile(relativePath));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static Rect getDisplayBounds() {
+ Point display = new Point();
+ WindowManager wm =
+ (WindowManager) InstrumentationRegistry.getContext().getSystemService(
+ Context.WINDOW_SERVICE);
+ wm.getDefaultDisplay().getRealSize(display);
+ return new Rect(0, 0, display.x, display.y);
+ }
+
+ @Test
+ public void canParseAllLayers() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ assertThat(trace.getEntries()).isNotEmpty();
+ assertThat(trace.getEntries().get(0).getTimestamp()).isEqualTo(2307984557311L);
+ assertThat(trace.getEntries().get(trace.getEntries().size() - 1).getTimestamp())
+ .isEqualTo(2308521813510L);
+ List<LayersTrace.Layer> flattenedLayers = trace.getEntries().get(0).asFlattenedLayers();
+ String msg = "Layers:\n" + flattenedLayers.stream().map(layer -> layer.mProto.name)
+ .collect(Collectors.joining("\n\t"));
+ assertWithMessage(msg).that(flattenedLayers).hasSize(47);
+ }
+
+ @Test
+ public void canParseVisibleLayers() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ assertThat(trace.getEntries()).isNotEmpty();
+ assertThat(trace.getEntries().get(0).getTimestamp()).isEqualTo(2307984557311L);
+ assertThat(trace.getEntries().get(trace.getEntries().size() - 1).getTimestamp())
+ .isEqualTo(2308521813510L);
+ List<LayersTrace.Layer> flattenedLayers = trace.getEntries().get(0).asFlattenedLayers();
+ List<LayersTrace.Layer> visibleLayers = flattenedLayers.stream()
+ .filter(layer -> layer.isVisible() && !layer.isHiddenByParent())
+ .collect(Collectors.toList());
+
+ String msg = "Visible Layers:\n" + visibleLayers.stream()
+ .map(layer -> layer.mProto.name)
+ .collect(Collectors.joining("\n\t"));
+
+ assertWithMessage(msg).that(visibleLayers).hasSize(9);
+ }
+
+ @Test
+ public void canParseLayerHierarchy() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ assertThat(trace.getEntries()).isNotEmpty();
+ assertThat(trace.getEntries().get(0).getTimestamp()).isEqualTo(2307984557311L);
+ assertThat(trace.getEntries().get(trace.getEntries().size() - 1).getTimestamp())
+ .isEqualTo(2308521813510L);
+ List<LayersTrace.Layer> layers = trace.getEntries().get(0).getRootLayers();
+ assertThat(layers).hasSize(2);
+ assertThat(layers.get(0).mChildren).hasSize(layers.get(0).mProto.children.length);
+ assertThat(layers.get(1).mChildren).hasSize(layers.get(1).mProto.children.length);
+ }
+
+ // b/76099859
+ @Test
+ public void canDetectOrphanLayers() {
+ try {
+ readLayerTraceFromFile(
+ "layers_trace_orphanlayers.pb");
+ fail("Failed to detect orphaned layers.");
+ } catch (RuntimeException exception) {
+ assertThat(exception.getMessage()).contains(
+ "Failed to parse layers trace. Found orphan layers "
+ + "with parent layer id:1006 : 49");
+ }
+ }
+
+ // b/75276931
+ @Test
+ public void canDetectUncoveredRegion() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ LayersTrace.Entry entry = trace.getEntry(2308008331271L);
+
+ Assertions.Result result = entry.coversRegion(getDisplayBounds());
+
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains("Region to test: Rect(0, 0 - 1440, 2880)");
+ assertThat(result.reason).contains("first empty point: 0, 99");
+ assertThat(result.reason).contains("visible regions:");
+ assertWithMessage("Reason contains list of visible regions")
+ .that(result.reason).contains("StatusBar#0Rect(0, 0 - 1440, 98");
+ }
+
+ // Visible region tests
+ @Test
+ public void canTestLayerVisibleRegion_layerDoesNotExist() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ LayersTrace.Entry entry = trace.getEntry(2308008331271L);
+
+ final Rect expectedVisibleRegion = new Rect(0, 0, 1, 1);
+ Assertions.Result result = entry.hasVisibleRegion("ImaginaryLayer",
+ expectedVisibleRegion);
+
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains("Could not find ImaginaryLayer");
+ }
+
+ @Test
+ public void canTestLayerVisibleRegion_layerDoesNotHaveExpectedVisibleRegion() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ LayersTrace.Entry entry = trace.getEntry(2307993020072L);
+
+ final Rect expectedVisibleRegion = new Rect(0, 0, 1, 1);
+ Assertions.Result result = entry.hasVisibleRegion("NexusLauncherActivity#2",
+ expectedVisibleRegion);
+
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains(
+ "Layer com.google.android.apps.nexuslauncher/com.google.android.apps"
+ + ".nexuslauncher.NexusLauncherActivity#2 is invisible: activeBuffer=null"
+ + " type != ColorLayer flags=1 (FLAG_HIDDEN set) visible region is empty");
+ }
+
+ @Test
+ public void canTestLayerVisibleRegion_layerIsHiddenByParent() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ LayersTrace.Entry entry = trace.getEntry(2308455948035L);
+
+ final Rect expectedVisibleRegion = new Rect(0, 0, 1, 1);
+ Assertions.Result result = entry.hasVisibleRegion(
+ "SurfaceView - com.android.chrome/com.google.android.apps.chrome.Main",
+ expectedVisibleRegion);
+
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains(
+ "Layer SurfaceView - com.android.chrome/com.google.android.apps.chrome.Main#0 is "
+ + "hidden by parent: com.android.chrome/com.google.android.apps.chrome"
+ + ".Main#0");
+ }
+
+ @Test
+ public void canTestLayerVisibleRegion_incorrectRegionSize() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ LayersTrace.Entry entry = trace.getEntry(2308008331271L);
+
+ final Rect expectedVisibleRegion = new Rect(0, 0, 1440, 99);
+ Assertions.Result result = entry.hasVisibleRegion(
+ "StatusBar",
+ expectedVisibleRegion);
+
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains("StatusBar#0 has visible "
+ + "region:Rect(0, 0 - 1440, 98) expected:Rect(0, 0 - 1440, 99)");
+ }
+
+ @Test
+ public void canTestLayerVisibleRegion() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_emptyregion.pb");
+ LayersTrace.Entry entry = trace.getEntry(2308008331271L);
+
+ final Rect expectedVisibleRegion = new Rect(0, 0, 1440, 98);
+ Assertions.Result result = entry.hasVisibleRegion("StatusBar", expectedVisibleRegion);
+
+ assertThat(result.passed()).isTrue();
+ }
+
+ @Test
+ public void canTestLayerVisibleRegion_layerIsNotVisible() {
+ LayersTrace trace = readLayerTraceFromFile(
+ "layers_trace_invalid_layer_visibility.pb");
+ LayersTrace.Entry entry = trace.getEntry(252794268378458L);
+
+ Assertions.Result result = entry.isVisible("com.android.server.wm.flicker.testapp");
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains(
+ "Layer com.android.server.wm.flicker.testapp/com.android.server.wm.flicker"
+ + ".testapp.SimpleActivity#0 is invisible: type != ColorLayer visible "
+ + "region is empty");
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java
new file mode 100644
index 0000000..5a24e6d
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TestFileUtils.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+
+import com.google.common.io.ByteStreams;
+
+import java.io.InputStream;
+
+/**
+ * Helper functions for test file resources.
+ */
+class TestFileUtils {
+ static byte[] readTestFile(String relativePath) throws Exception {
+ Context context = InstrumentationRegistry.getContext();
+ InputStream in = context.getResources().getAssets().open("testdata/" + relativePath);
+ return ByteStreams.toByteArray(in);
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TransitionRunnerTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TransitionRunnerTest.java
new file mode 100644
index 0000000..9c5e2059a
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/TransitionRunnerTest.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.os.Environment;
+
+import com.android.server.wm.flicker.TransitionRunner.TransitionBuilder;
+import com.android.server.wm.flicker.TransitionRunner.TransitionResult;
+import com.android.server.wm.flicker.monitor.LayersTraceMonitor;
+import com.android.server.wm.flicker.monitor.ScreenRecorder;
+import com.android.server.wm.flicker.monitor.WindowAnimationFrameStatsMonitor;
+import com.android.server.wm.flicker.monitor.WindowManagerTraceMonitor;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.List;
+
+/**
+ * Contains {@link TransitionRunner} tests.
+ * {@code atest FlickerLibTest:TransitionRunnerTest}
+ */
+public class TransitionRunnerTest {
+ @Mock
+ private SimpleUiTransitions mTransitionsMock;
+ @Mock
+ private ScreenRecorder mScreenRecorderMock;
+ @Mock
+ private WindowManagerTraceMonitor mWindowManagerTraceMonitorMock;
+ @Mock
+ private LayersTraceMonitor mLayersTraceMonitorMock;
+ @Mock
+ private WindowAnimationFrameStatsMonitor mWindowAnimationFrameStatsMonitor;
+ @InjectMocks
+ private TransitionBuilder mTransitionBuilder;
+
+ @Before
+ public void init() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ @Test
+ public void transitionsRunInOrder() {
+ TransitionRunner.newBuilder()
+ .runBeforeAll(mTransitionsMock::turnOnDevice)
+ .runBefore(mTransitionsMock::openApp)
+ .run(mTransitionsMock::performMagic)
+ .runAfter(mTransitionsMock::closeApp)
+ .runAfterAll(mTransitionsMock::cleanUpTracks)
+ .skipLayersTrace()
+ .skipWindowManagerTrace()
+ .build()
+ .run();
+
+ InOrder orderVerifier = inOrder(mTransitionsMock);
+ orderVerifier.verify(mTransitionsMock).turnOnDevice();
+ orderVerifier.verify(mTransitionsMock).openApp();
+ orderVerifier.verify(mTransitionsMock).performMagic();
+ orderVerifier.verify(mTransitionsMock).closeApp();
+ orderVerifier.verify(mTransitionsMock).cleanUpTracks();
+ }
+
+ @Test
+ public void canCombineTransitions() {
+ TransitionRunner.newBuilder()
+ .runBeforeAll(mTransitionsMock::turnOnDevice)
+ .runBeforeAll(mTransitionsMock::turnOnDevice)
+ .runBefore(mTransitionsMock::openApp)
+ .runBefore(mTransitionsMock::openApp)
+ .run(mTransitionsMock::performMagic)
+ .run(mTransitionsMock::performMagic)
+ .runAfter(mTransitionsMock::closeApp)
+ .runAfter(mTransitionsMock::closeApp)
+ .runAfterAll(mTransitionsMock::cleanUpTracks)
+ .runAfterAll(mTransitionsMock::cleanUpTracks)
+ .skipLayersTrace()
+ .skipWindowManagerTrace()
+ .build()
+ .run();
+
+ final int wantedNumberOfInvocations = 2;
+ verify(mTransitionsMock, times(wantedNumberOfInvocations)).turnOnDevice();
+ verify(mTransitionsMock, times(wantedNumberOfInvocations)).openApp();
+ verify(mTransitionsMock, times(wantedNumberOfInvocations)).performMagic();
+ verify(mTransitionsMock, times(wantedNumberOfInvocations)).closeApp();
+ verify(mTransitionsMock, times(wantedNumberOfInvocations)).cleanUpTracks();
+ }
+
+ @Test
+ public void emptyTransitionPasses() {
+ List<TransitionResult> results = TransitionRunner.newBuilder()
+ .skipLayersTrace()
+ .skipWindowManagerTrace()
+ .build()
+ .run()
+ .getResults();
+ assertThat(results).hasSize(1);
+ assertThat(results.get(0).layersTraceExists()).isFalse();
+ assertThat(results.get(0).windowManagerTraceExists()).isFalse();
+ assertThat(results.get(0).screenCaptureVideoExists()).isFalse();
+ }
+
+ @Test
+ public void canRepeatTransitions() {
+ final int wantedNumberOfInvocations = 10;
+ TransitionRunner.newBuilder()
+ .runBeforeAll(mTransitionsMock::turnOnDevice)
+ .runBefore(mTransitionsMock::openApp)
+ .run(mTransitionsMock::performMagic)
+ .runAfter(mTransitionsMock::closeApp)
+ .runAfterAll(mTransitionsMock::cleanUpTracks)
+ .repeat(wantedNumberOfInvocations)
+ .skipLayersTrace()
+ .skipWindowManagerTrace()
+ .build()
+ .run();
+ verify(mTransitionsMock).turnOnDevice();
+ verify(mTransitionsMock, times(wantedNumberOfInvocations)).openApp();
+ verify(mTransitionsMock, times(wantedNumberOfInvocations)).performMagic();
+ verify(mTransitionsMock, times(wantedNumberOfInvocations)).closeApp();
+ verify(mTransitionsMock).cleanUpTracks();
+ }
+
+ private void emptyTask() {
+
+ }
+
+ @Test
+ public void canCaptureWindowManagerTrace() {
+ mTransitionBuilder
+ .run(this::emptyTask)
+ .includeJankyRuns()
+ .skipLayersTrace()
+ .withTag("mCaptureWmTraceTransitionRunner")
+ .build().run();
+ InOrder orderVerifier = inOrder(mWindowManagerTraceMonitorMock);
+ orderVerifier.verify(mWindowManagerTraceMonitorMock).start();
+ orderVerifier.verify(mWindowManagerTraceMonitorMock).stop();
+ orderVerifier.verify(mWindowManagerTraceMonitorMock)
+ .save("mCaptureWmTraceTransitionRunner", 0);
+ verifyNoMoreInteractions(mWindowManagerTraceMonitorMock);
+ }
+
+ @Test
+ public void canCaptureLayersTrace() {
+ mTransitionBuilder
+ .run(this::emptyTask)
+ .includeJankyRuns()
+ .skipWindowManagerTrace()
+ .withTag("mCaptureLayersTraceTransitionRunner")
+ .build().run();
+ InOrder orderVerifier = inOrder(mLayersTraceMonitorMock);
+ orderVerifier.verify(mLayersTraceMonitorMock).start();
+ orderVerifier.verify(mLayersTraceMonitorMock).stop();
+ orderVerifier.verify(mLayersTraceMonitorMock)
+ .save("mCaptureLayersTraceTransitionRunner", 0);
+ verifyNoMoreInteractions(mLayersTraceMonitorMock);
+ }
+
+ @Test
+ public void canRecordEachRun() throws IOException {
+ mTransitionBuilder
+ .run(this::emptyTask)
+ .withTag("mRecordEachRun")
+ .recordEachRun()
+ .includeJankyRuns()
+ .skipLayersTrace()
+ .skipWindowManagerTrace()
+ .repeat(2)
+ .build().run();
+ InOrder orderVerifier = inOrder(mScreenRecorderMock);
+ orderVerifier.verify(mScreenRecorderMock).start();
+ orderVerifier.verify(mScreenRecorderMock).stop();
+ orderVerifier.verify(mScreenRecorderMock).save("mRecordEachRun", 0);
+ orderVerifier.verify(mScreenRecorderMock).start();
+ orderVerifier.verify(mScreenRecorderMock).stop();
+ orderVerifier.verify(mScreenRecorderMock).save("mRecordEachRun", 1);
+ verifyNoMoreInteractions(mScreenRecorderMock);
+ }
+
+ @Test
+ public void canRecordAllRuns() throws IOException {
+ doReturn(Paths.get(Environment.getExternalStorageDirectory().getAbsolutePath(),
+ "mRecordAllRuns.mp4")).when(mScreenRecorderMock).save("mRecordAllRuns");
+ mTransitionBuilder
+ .run(this::emptyTask)
+ .recordAllRuns()
+ .includeJankyRuns()
+ .skipLayersTrace()
+ .skipWindowManagerTrace()
+ .withTag("mRecordAllRuns")
+ .repeat(2)
+ .build().run();
+ InOrder orderVerifier = inOrder(mScreenRecorderMock);
+ orderVerifier.verify(mScreenRecorderMock).start();
+ orderVerifier.verify(mScreenRecorderMock).stop();
+ orderVerifier.verify(mScreenRecorderMock).save("mRecordAllRuns");
+ verifyNoMoreInteractions(mScreenRecorderMock);
+ }
+
+ @Test
+ public void canSkipJankyRuns() {
+ doReturn(false).doReturn(true).doReturn(false)
+ .when(mWindowAnimationFrameStatsMonitor).jankyFramesDetected();
+ List<TransitionResult> results = mTransitionBuilder
+ .run(this::emptyTask)
+ .skipLayersTrace()
+ .skipWindowManagerTrace()
+ .repeat(3)
+ .build().run().getResults();
+ assertThat(results).hasSize(2);
+ }
+
+ public static class SimpleUiTransitions {
+ public void turnOnDevice() {
+ }
+
+ public void openApp() {
+ }
+
+ public void performMagic() {
+ }
+
+ public void closeApp() {
+ }
+
+ public void cleanUpTracks() {
+ }
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WindowManagerTraceTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WindowManagerTraceTest.java
new file mode 100644
index 0000000..4927871
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WindowManagerTraceTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.TestFileUtils.readTestFile;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.server.wm.flicker.Assertions.Result;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Contains {@link WindowManagerTrace} tests.
+ * To run this test: {@code atest FlickerLibTest:WindowManagerTraceTest}
+ */
+public class WindowManagerTraceTest {
+ private WindowManagerTrace mTrace;
+
+ private static WindowManagerTrace readWindowManagerTraceFromFile(String relativePath) {
+ try {
+ return WindowManagerTrace.parseFrom(readTestFile(relativePath));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Before
+ public void setup() {
+ mTrace = readWindowManagerTraceFromFile("wm_trace_openchrome.pb");
+ }
+
+ @Test
+ public void canParseAllEntries() {
+ assertThat(mTrace.getEntries().get(0).getTimestamp()).isEqualTo(241777211939236L);
+ assertThat(mTrace.getEntries().get(mTrace.getEntries().size() - 1).getTimestamp()).isEqualTo
+ (241779809471942L);
+ }
+
+ @Test
+ public void canDetectAboveAppWindowVisibility() {
+ WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L);
+ Result result = entry.isAboveAppWindowVisible("NavigationBar");
+ assertThat(result.passed()).isTrue();
+ }
+
+ @Test
+ public void canDetectBelowAppWindowVisibility() {
+ WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L);
+ Result result = entry.isBelowAppWindowVisible("wallpaper");
+ assertThat(result.passed()).isTrue();
+ }
+
+ @Test
+ public void canDetectAppWindowVisibility() {
+ WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L);
+ Result result = entry.isAppWindowVisible("com.google.android.apps.nexuslauncher");
+ assertThat(result.passed()).isTrue();
+ }
+
+ @Test
+ public void canFailWithReasonForVisibilityChecks_windowNotFound() {
+ WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L);
+ Result result = entry.isAboveAppWindowVisible("ImaginaryWindow");
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains("ImaginaryWindow cannot be found");
+ }
+
+ @Test
+ public void canFailWithReasonForVisibilityChecks_windowNotVisible() {
+ WindowManagerTrace.Entry entry = mTrace.getEntry(241777211939236L);
+ Result result = entry.isAboveAppWindowVisible("AssistPreviewPanel");
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains("AssistPreviewPanel is invisible");
+ }
+
+ @Test
+ public void canDetectAppZOrder() {
+ WindowManagerTrace.Entry entry = mTrace.getEntry(241778130296410L);
+ Result result = entry.isVisibleAppWindowOnTop("com.google.android.apps.chrome");
+ assertThat(result.passed()).isTrue();
+ }
+
+ @Test
+ public void canFailWithReasonForZOrderChecks_windowNotOnTop() {
+ WindowManagerTrace.Entry entry = mTrace.getEntry(241778130296410L);
+ Result result = entry.isVisibleAppWindowOnTop("com.google.android.apps.nexuslauncher");
+ assertThat(result.failed()).isTrue();
+ assertThat(result.reason).contains("wanted=com.google.android.apps.nexuslauncher");
+ assertThat(result.reason).contains("found=com.android.chrome/"
+ + "com.google.android.apps.chrome.Main");
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WmTraceSubjectTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WmTraceSubjectTest.java
new file mode 100644
index 0000000..d547a18
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/WmTraceSubjectTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.TestFileUtils.readTestFile;
+import static com.android.server.wm.flicker.WmTraceSubject.assertThat;
+
+import org.junit.Test;
+
+/**
+ * Contains {@link WmTraceSubject} tests.
+ * To run this test: {@code atest FlickerLibTest:WmTraceSubjectTest}
+ */
+public class WmTraceSubjectTest {
+ private static WindowManagerTrace readWmTraceFromFile(String relativePath) {
+ try {
+ return WindowManagerTrace.parseFrom(readTestFile(relativePath));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Test
+ public void testCanTransitionInAppWindow() {
+ WindowManagerTrace trace = readWmTraceFromFile("wm_trace_openchrome2.pb");
+
+ assertThat(trace).showsAppWindowOnTop("com.google.android.apps.nexuslauncher/"
+ + ".NexusLauncherActivity").forRange(174684850717208L, 174685957511016L);
+ assertThat(trace).showsAppWindowOnTop(
+ "com.google.android.apps.nexuslauncher/.NexusLauncherActivity")
+ .then()
+ .showsAppWindowOnTop("com.android.chrome")
+ .forAllEntries();
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/LayersTraceMonitorTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/LayersTraceMonitorTest.java
new file mode 100644
index 0000000..dbd6761
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/LayersTraceMonitorTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import static android.surfaceflinger.nano.Layerstrace.LayersTraceFileProto.MAGIC_NUMBER_H;
+import static android.surfaceflinger.nano.Layerstrace.LayersTraceFileProto.MAGIC_NUMBER_L;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.surfaceflinger.nano.Layerstrace.LayersTraceFileProto;
+
+import com.google.common.io.Files;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+
+/**
+ * Contains {@link LayersTraceMonitor} tests.
+ * To run this test: {@code atest FlickerLibTest:LayersTraceMonitorTest}
+ */
+public class LayersTraceMonitorTest {
+ private LayersTraceMonitor mLayersTraceMonitor;
+
+ @Before
+ public void setup() {
+ mLayersTraceMonitor = new LayersTraceMonitor();
+ }
+
+ @After
+ public void teardown() {
+ mLayersTraceMonitor.stop();
+ mLayersTraceMonitor.getOutputTraceFilePath("captureLayersTrace").toFile().delete();
+ }
+
+ @Test
+ public void canStartLayersTrace() throws Exception {
+ mLayersTraceMonitor.start();
+ assertThat(mLayersTraceMonitor.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void canStopLayersTrace() throws Exception {
+ mLayersTraceMonitor.start();
+ assertThat(mLayersTraceMonitor.isEnabled()).isTrue();
+ mLayersTraceMonitor.stop();
+ assertThat(mLayersTraceMonitor.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void captureLayersTrace() throws Exception {
+ mLayersTraceMonitor.start();
+ mLayersTraceMonitor.stop();
+ File testFile = mLayersTraceMonitor.save("captureLayersTrace").toFile();
+ assertThat(testFile.exists()).isTrue();
+ byte[] trace = Files.toByteArray(testFile);
+ assertThat(trace.length).isGreaterThan(0);
+ LayersTraceFileProto mLayerTraceFileProto = LayersTraceFileProto.parseFrom(trace);
+ assertThat(mLayerTraceFileProto.magicNumber).isEqualTo(
+ (long) MAGIC_NUMBER_H << 32 | MAGIC_NUMBER_L);
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/ScreenRecorderTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/ScreenRecorderTest.java
new file mode 100644
index 0000000..e73eecc
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/ScreenRecorderTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import static android.os.SystemClock.sleep;
+
+import static com.android.server.wm.flicker.monitor.ScreenRecorder.DEFAULT_OUTPUT_PATH;
+import static com.android.server.wm.flicker.monitor.ScreenRecorder.getPath;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Contains {@link ScreenRecorder} tests.
+ * To run this test: {@code atest FlickerLibTest:ScreenRecorderTest}
+ */
+public class ScreenRecorderTest {
+ private static final String TEST_VIDEO_FILENAME = "test.mp4";
+ private ScreenRecorder mScreenRecorder;
+
+ @Before
+ public void setup() {
+ mScreenRecorder = new ScreenRecorder();
+ }
+
+ @After
+ public void teardown() {
+ DEFAULT_OUTPUT_PATH.toFile().delete();
+ getPath(TEST_VIDEO_FILENAME).toFile().delete();
+ }
+
+ @Test
+ public void videoIsRecorded() {
+ mScreenRecorder.start();
+ sleep(100);
+ mScreenRecorder.stop();
+ File file = DEFAULT_OUTPUT_PATH.toFile();
+ assertThat(file.exists()).isTrue();
+ }
+
+ @Test
+ public void videoCanBeSaved() {
+ mScreenRecorder.start();
+ sleep(100);
+ mScreenRecorder.stop();
+ mScreenRecorder.save(TEST_VIDEO_FILENAME);
+ File file = getPath(TEST_VIDEO_FILENAME).toFile();
+ assertThat(file.exists()).isTrue();
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java
new file mode 100644
index 0000000..f7fa0d5
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import static com.android.server.wm.flicker.AutomationUtils.wakeUpAndGoToHomeScreen;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.support.test.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Contains {@link WindowAnimationFrameStatsMonitor} tests.
+ * To run this test: {@code atest FlickerLibTest:WindowAnimationFrameStatsMonitorTest}
+ */
+public class WindowAnimationFrameStatsMonitorTest {
+ private WindowAnimationFrameStatsMonitor mWindowAnimationFrameStatsMonitor;
+
+ @Before
+ public void setup() {
+ mWindowAnimationFrameStatsMonitor = new WindowAnimationFrameStatsMonitor(
+ InstrumentationRegistry.getInstrumentation());
+ wakeUpAndGoToHomeScreen();
+ }
+
+ // TODO(vishnun)
+ @Ignore("Disabled until app-helper libraries are available.")
+ @Test
+ public void captureWindowAnimationFrameStats() throws Exception {
+ mWindowAnimationFrameStatsMonitor.start();
+ //AppHelperWrapper.getInstance().getHelper(CHROME).open();
+ //AppHelperWrapper.getInstance().getHelper(CHROME).exit();
+ mWindowAnimationFrameStatsMonitor.stop();
+ }
+}
diff --git a/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitorTest.java b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitorTest.java
new file mode 100644
index 0000000..56284d7
--- /dev/null
+++ b/tests/FlickerTests/lib/test/src/com/android/server/wm/flicker/monitor/WindowManagerTraceMonitorTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.monitor;
+
+import static com.android.server.wm.nano.WindowManagerTraceFileProto.MAGIC_NUMBER_H;
+import static com.android.server.wm.nano.WindowManagerTraceFileProto.MAGIC_NUMBER_L;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.server.wm.nano.WindowManagerTraceFileProto;
+
+import com.google.common.io.Files;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+
+/**
+ * Contains {@link WindowManagerTraceMonitor} tests.
+ * To run this test: {@code atest FlickerLibTest:WindowManagerTraceMonitorTest}
+ */
+public class WindowManagerTraceMonitorTest {
+ private WindowManagerTraceMonitor mWindowManagerTraceMonitor;
+
+ @Before
+ public void setup() {
+ mWindowManagerTraceMonitor = new WindowManagerTraceMonitor();
+ }
+
+ @After
+ public void teardown() {
+ mWindowManagerTraceMonitor.stop();
+ mWindowManagerTraceMonitor.getOutputTraceFilePath("captureWindowTrace").toFile().delete();
+ }
+
+ @Test
+ public void canStartWindowTrace() throws Exception {
+ mWindowManagerTraceMonitor.start();
+ assertThat(mWindowManagerTraceMonitor.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void canStopWindowTrace() throws Exception {
+ mWindowManagerTraceMonitor.start();
+ assertThat(mWindowManagerTraceMonitor.isEnabled()).isTrue();
+ mWindowManagerTraceMonitor.stop();
+ assertThat(mWindowManagerTraceMonitor.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void captureWindowTrace() throws Exception {
+ mWindowManagerTraceMonitor.start();
+ mWindowManagerTraceMonitor.stop();
+ File testFile = mWindowManagerTraceMonitor.save("captureWindowTrace").toFile();
+ assertThat(testFile.exists()).isTrue();
+ byte[] trace = Files.toByteArray(testFile);
+ assertThat(trace.length).isGreaterThan(0);
+ WindowManagerTraceFileProto mWindowTraceFileProto = WindowManagerTraceFileProto.parseFrom(
+ trace);
+ assertThat(mWindowTraceFileProto.magicNumber).isEqualTo(
+ (long) MAGIC_NUMBER_H << 32 | MAGIC_NUMBER_L);
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java
new file mode 100644
index 0000000..34f4ebb
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static android.view.Surface.rotationToString;
+
+import static com.android.server.wm.flicker.CommonTransitions.changeAppRotation;
+import static com.android.server.wm.flicker.WindowUtils.getAppPosition;
+import static com.android.server.wm.flicker.WindowUtils.getNavigationBarPosition;
+import static com.android.server.wm.flicker.WindowUtils.getStatusBarPosition;
+import static com.android.server.wm.flicker.WmTraceSubject.assertThat;
+
+import android.graphics.Rect;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.util.Log;
+import android.view.Surface;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Cycle through supported app rotations.
+ * To run this test: {@code atest FlickerTest:ChangeAppRotationTest}
+ */
+@RunWith(Parameterized.class)
+@LargeTest
+public class ChangeAppRotationTest extends FlickerTestBase {
+ private int beginRotation;
+ private int endRotation;
+
+ public ChangeAppRotationTest(String beginRotationName, String endRotationName,
+ int beginRotation, int endRotation) {
+ this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "SimpleApp");
+ this.beginRotation = beginRotation;
+ this.endRotation = endRotation;
+ }
+
+ @Parameters(name = "{0}-{1}")
+ public static Collection<Object[]> getParams() {
+ int[] supportedRotations =
+ {Surface.ROTATION_0, Surface.ROTATION_90, Surface.ROTATION_270};
+ Collection<Object[]> params = new ArrayList<>();
+ for (int begin : supportedRotations) {
+ for (int end : supportedRotations) {
+ if (begin != end) {
+ params.add(new Object[]{rotationToString(begin), rotationToString(end), begin,
+ end});
+ }
+ }
+ }
+ return params;
+ }
+
+ @Before
+ public void runTransition() {
+ super.runTransition(
+ changeAppRotation(testApp, uiDevice, beginRotation, endRotation).build());
+ }
+
+ @Test
+ public void checkVisibility_navBarWindowIsAlwaysVisible() {
+ checkResults(result -> assertThat(result)
+ .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarWindowIsAlwaysVisible() {
+ checkResults(result -> assertThat(result)
+ .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkPosition_navBarLayerRotatesAndScales() {
+ Rect startingPos = getNavigationBarPosition(beginRotation);
+ Rect endingPos = getNavigationBarPosition(endRotation);
+ checkResults(result -> {
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(NAVIGATION_BAR_WINDOW_TITLE, startingPos)
+ .inTheBeginning();
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(NAVIGATION_BAR_WINDOW_TITLE, endingPos).atTheEnd();
+ }
+ );
+ }
+
+ @Test
+ public void checkPosition_appLayerRotates() {
+ Rect startingPos = getAppPosition(beginRotation);
+ Rect endingPos = getAppPosition(endRotation);
+ Log.e(TAG, "startingPos=" + startingPos + " endingPos=" + endingPos);
+ checkResults(result -> {
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(testApp.getPackage(), startingPos).inTheBeginning();
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(testApp.getPackage(), endingPos).atTheEnd();
+ }
+ );
+ }
+
+ @Test
+ public void checkPosition_statusBarLayerScales() {
+ Rect startingPos = getStatusBarPosition(beginRotation);
+ Rect endingPos = getStatusBarPosition(endRotation);
+ checkResults(result -> {
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(STATUS_BAR_WINDOW_TITLE, startingPos)
+ .inTheBeginning();
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(STATUS_BAR_WINDOW_TITLE, endingPos).atTheEnd();
+ }
+ );
+ }
+
+ @Test
+ public void checkVisibility_navBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java
new file mode 100644
index 0000000..2b62fcf
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.CommonTransitions.editTextLoseFocusToApp;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+
+import android.platform.helpers.IAppHelper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test IME window closing back to app window transitions.
+ * To run this test: {@code atest FlickerTests:CloseImeWindowToAppTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class CloseImeWindowToAppTest extends FlickerTestBase {
+
+ private static final String IME_WINDOW_TITLE = "InputMethod";
+ private IAppHelper mImeTestApp = new StandardAppHelper(
+ InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "ImeApp");
+
+ @Before
+ public void runTransition() {
+ super.runTransition(editTextLoseFocusToApp(uiDevice)
+ .includeJankyRuns().build());
+ }
+
+ @Test
+ public void checkVisibility_imeLayerBecomesInvisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(IME_WINDOW_TITLE)
+ .then()
+ .hidesLayer(IME_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_imeAppLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(mImeTestApp.getPackage())
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_imeAppWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAppWindowOnTop(mImeTestApp.getPackage())
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkCoveredRegion_noUncoveredRegions() {
+ checkResults(result -> LayersTraceSubject.assertThat(result).coversRegion(
+ getDisplayBounds()).forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java
new file mode 100644
index 0000000..42b161f
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.CommonTransitions.editTextLoseFocusToHome;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+
+import android.platform.helpers.IAppHelper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test IME window closing to home transitions.
+ * To run this test: {@code atest FlickerTests:CloseImeWindowToHomeTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class CloseImeWindowToHomeTest extends FlickerTestBase {
+
+ private static final String IME_WINDOW_TITLE = "InputMethod";
+ private IAppHelper mImeTestApp = new StandardAppHelper(
+ InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "ImeApp");
+
+ @Before
+ public void runTransition() {
+ super.runTransition(editTextLoseFocusToHome(uiDevice)
+ .includeJankyRuns().build());
+ }
+
+ @Test
+ public void checkVisibility_imeWindowBecomesInvisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsImeWindow(IME_WINDOW_TITLE)
+ .then()
+ .hidesImeWindow(IME_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_imeLayerBecomesInvisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(IME_WINDOW_TITLE)
+ .then()
+ .hidesLayer(IME_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_imeAppLayerBecomesInvisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(mImeTestApp.getPackage())
+ .then()
+ .hidesLayer(mImeTestApp.getPackage())
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_imeAppWindowBecomesInvisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAppWindowOnTop(mImeTestApp.getPackage())
+ .then()
+ .hidesAppWindowOnTop(mImeTestApp.getPackage())
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkCoveredRegion_noUncoveredRegions() {
+ checkResults(result -> LayersTraceSubject.assertThat(result).coversRegion(
+ getDisplayBounds()).forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java
new file mode 100644
index 0000000..92bb1ea
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static android.os.SystemClock.sleep;
+import static android.view.Surface.rotationToString;
+
+import static com.android.server.wm.flicker.AutomationUtils.clearRecents;
+import static com.android.server.wm.flicker.AutomationUtils.closePipWindow;
+import static com.android.server.wm.flicker.AutomationUtils.exitSplitScreen;
+import static com.android.server.wm.flicker.AutomationUtils.expandPipWindow;
+import static com.android.server.wm.flicker.AutomationUtils.launchSplitScreen;
+import static com.android.server.wm.flicker.AutomationUtils.stopPackage;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+import android.platform.helpers.IAppHelper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.util.Rational;
+import android.view.Surface;
+
+import com.android.server.wm.flicker.TransitionRunner.TransitionBuilder;
+
+/**
+ * Collection of common transitions which can be used to test different apps or scenarios.
+ */
+class CommonTransitions {
+
+ public static final int ITERATIONS = 1;
+ private static final String TAG = "FLICKER";
+ private static final long APP_LAUNCH_TIMEOUT = 10000;
+
+ private static void setRotation(UiDevice device, int rotation) {
+ try {
+ switch (rotation) {
+ case Surface.ROTATION_270:
+ device.setOrientationLeft();
+ break;
+
+ case Surface.ROTATION_90:
+ device.setOrientationRight();
+ break;
+
+ case Surface.ROTATION_0:
+ default:
+ device.setOrientationNatural();
+ }
+ // Wait for animation to complete
+ sleep(3000);
+ } catch (RemoteException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static void clickEditTextWidget(UiDevice device, IAppHelper testApp) {
+ UiObject2 editText = device.findObject(By.res(testApp.getPackage(), "plain_text_input"));
+ editText.click();
+ sleep(500);
+ }
+
+ private static void clickEnterPipButton(UiDevice device, IAppHelper testApp) {
+ UiObject2 enterPipButton = device.findObject(By.res(testApp.getPackage(), "enter_pip"));
+ enterPipButton.click();
+ sleep(500);
+ }
+
+ static TransitionBuilder openAppWarm(IAppHelper testApp, UiDevice
+ device) {
+ return TransitionRunner.newBuilder()
+ .withTag("OpenAppWarm_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBeforeAll(testApp::open)
+ .runBefore(device::pressHome)
+ .runBefore(device::waitForIdle)
+ .run(testApp::open)
+ .runAfterAll(testApp::exit)
+ .runAfterAll(AutomationUtils::setDefaultWait)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder closeAppWithBackKey(IAppHelper testApp, UiDevice
+ device) {
+ return TransitionRunner.newBuilder()
+ .withTag("closeAppWithBackKey_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(testApp::open)
+ .runBefore(device::waitForIdle)
+ .run(device::pressBack)
+ .run(device::waitForIdle)
+ .runAfterAll(testApp::exit)
+ .runAfterAll(AutomationUtils::setDefaultWait)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder closeAppWithHomeKey(IAppHelper testApp, UiDevice
+ device) {
+ return TransitionRunner.newBuilder()
+ .withTag("closeAppWithHomeKey_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(testApp::open)
+ .runBefore(device::waitForIdle)
+ .run(device::pressHome)
+ .run(device::waitForIdle)
+ .runAfterAll(testApp::exit)
+ .runAfterAll(AutomationUtils::setDefaultWait)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder getOpenAppCold(IAppHelper testApp,
+ UiDevice device) {
+ return TransitionRunner.newBuilder()
+ .withTag("OpenAppCold_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(device::pressHome)
+ .runBefore(testApp::exit)
+ .runBefore(device::waitForIdle)
+ .run(testApp::open)
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder changeAppRotation(IAppHelper testApp, UiDevice
+ device, int beginRotation, int endRotation) {
+ return TransitionRunner.newBuilder()
+ .withTag("changeAppRotation_" + testApp.getLauncherName()
+ + rotationToString(beginRotation) + "_" +
+ rotationToString(endRotation))
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBeforeAll(testApp::open)
+ .runBefore(() -> setRotation(device, beginRotation))
+ .run(() -> setRotation(device, endRotation))
+ .runAfterAll(testApp::exit)
+ .runAfterAll(() -> setRotation(device, Surface.ROTATION_0))
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder changeAppRotation(Intent intent, String intentId, Context context,
+ UiDevice
+ device, int beginRotation, int endRotation) {
+ final String testTag = "changeAppRotation_" + intentId + "_" +
+ rotationToString(beginRotation) + "_" + rotationToString(endRotation);
+ return TransitionRunner.newBuilder()
+ .withTag(testTag)
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBeforeAll(() -> {
+ context.startActivity(intent);
+ device.wait(Until.hasObject(By.pkg(intent.getComponent()
+ .getPackageName()).depth(0)), APP_LAUNCH_TIMEOUT);
+ }
+ )
+ .runBefore(() -> setRotation(device, beginRotation))
+ .run(() -> setRotation(device, endRotation))
+ .runAfterAll(() -> stopPackage(context, intent.getComponent().getPackageName()))
+ .runAfterAll(() -> setRotation(device, Surface.ROTATION_0))
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder appToSplitScreen(IAppHelper testApp, UiDevice device) {
+ return TransitionRunner.newBuilder()
+ .withTag("appToSplitScreen_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(testApp::open)
+ .runBefore(device::waitForIdle)
+ .runBefore(() -> sleep(500))
+ .run(() -> launchSplitScreen(device))
+ .runAfter(() -> exitSplitScreen(device))
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder splitScreenToLauncher(IAppHelper testApp, UiDevice device) {
+ return TransitionRunner.newBuilder()
+ .withTag("splitScreenToLauncher_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(testApp::open)
+ .runBefore(device::waitForIdle)
+ .runBefore(() -> launchSplitScreen(device))
+ .run(() -> exitSplitScreen(device))
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder editTextSetFocus(UiDevice device) {
+ IAppHelper testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "ImeApp");
+ return TransitionRunner.newBuilder()
+ .withTag("editTextSetFocus_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(device::pressHome)
+ .runBefore(testApp::open)
+ .run(() -> clickEditTextWidget(device, testApp))
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder resizeSplitScreen(IAppHelper testAppTop, IAppHelper testAppBottom,
+ UiDevice device, Rational startRatio, Rational stopRatio) {
+ String testTag = "resizeSplitScreen_" + testAppTop.getLauncherName() + "_" +
+ testAppBottom.getLauncherName() + "_" +
+ startRatio.toString().replace("/", ":") + "_to_" +
+ stopRatio.toString().replace("/", ":");
+ return TransitionRunner.newBuilder()
+ .withTag(testTag)
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBeforeAll(() -> clearRecents(device))
+ .runBefore(testAppBottom::open)
+ .runBefore(device::pressHome)
+ .runBefore(testAppTop::open)
+ .runBefore(device::waitForIdle)
+ .runBefore(() -> launchSplitScreen(device))
+ .runBefore(() -> {
+ UiObject2 snapshot = device.findObject(
+ By.res("com.google.android.apps.nexuslauncher", "snapshot"));
+ snapshot.click();
+ })
+ .runBefore(() -> AutomationUtils.resizeSplitScreen(device, startRatio))
+ .run(() -> AutomationUtils.resizeSplitScreen(device, stopRatio))
+ .runAfter(() -> exitSplitScreen(device))
+ .runAfter(device::pressHome)
+ .runAfterAll(testAppTop::exit)
+ .runAfterAll(testAppBottom::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder editTextLoseFocusToHome(UiDevice device) {
+ IAppHelper testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "ImeApp");
+ return TransitionRunner.newBuilder()
+ .withTag("editTextLoseFocusToHome_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(device::pressHome)
+ .runBefore(testApp::open)
+ .runBefore(() -> clickEditTextWidget(device, testApp))
+ .run(device::pressHome)
+ .run(device::waitForIdle)
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder editTextLoseFocusToApp(UiDevice device) {
+ IAppHelper testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "ImeApp");
+ return TransitionRunner.newBuilder()
+ .withTag("editTextLoseFocusToApp_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(device::pressHome)
+ .runBefore(testApp::open)
+ .runBefore(() -> clickEditTextWidget(device, testApp))
+ .run(device::pressBack)
+ .run(device::waitForIdle)
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder enterPipMode(UiDevice device) {
+ IAppHelper testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "PipApp");
+ return TransitionRunner.newBuilder()
+ .withTag("enterPipMode_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(device::pressHome)
+ .runBefore(testApp::open)
+ .run(() -> clickEnterPipButton(device, testApp))
+ .runAfter(() -> closePipWindow(device))
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder exitPipModeToHome(UiDevice device) {
+ IAppHelper testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "PipApp");
+ return TransitionRunner.newBuilder()
+ .withTag("exitPipModeToHome_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(device::pressHome)
+ .runBefore(testApp::open)
+ .runBefore(() -> clickEnterPipButton(device, testApp))
+ .run(() -> closePipWindow(device))
+ .run(device::waitForIdle)
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+
+ static TransitionBuilder exitPipModeToApp(UiDevice device) {
+ IAppHelper testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "PipApp");
+ return TransitionRunner.newBuilder()
+ .withTag("exitPipModeToApp_" + testApp.getLauncherName())
+ .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen)
+ .runBefore(device::pressHome)
+ .runBefore(testApp::open)
+ .runBefore(() -> clickEnterPipButton(device, testApp))
+ .run(() -> expandPipWindow(device))
+ .run(device::waitForIdle)
+ .runAfterAll(testApp::exit)
+ .repeat(ITERATIONS);
+ }
+}
\ No newline at end of file
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java
new file mode 100644
index 0000000..fec248c
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import android.platform.helpers.IAppHelper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+import android.util.Rational;
+import android.view.Surface;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests to help debug individual transitions, capture video recordings and create test cases.
+ */
+@Ignore("Used for debugging transitions used in FlickerTests.")
+@RunWith(AndroidJUnit4.class)
+public class DebugTest {
+ private IAppHelper testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "SimpleApp");
+ private UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+
+ /**
+ * atest FlickerTest:DebugTests#openAppCold
+ */
+ @Test
+ public void openAppCold() {
+ CommonTransitions.getOpenAppCold(testApp, uiDevice).recordAllRuns().build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#openAppWarm
+ */
+ @Test
+ public void openAppWarm() {
+ CommonTransitions.openAppWarm(testApp, uiDevice).recordAllRuns().build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#changeOrientationFromNaturalToLeft
+ */
+ @Test
+ public void changeOrientationFromNaturalToLeft() {
+ CommonTransitions.changeAppRotation(testApp, uiDevice, Surface.ROTATION_0,
+ Surface.ROTATION_270).recordAllRuns().build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#closeAppWithBackKey
+ */
+ @Test
+ public void closeAppWithBackKey() {
+ CommonTransitions.closeAppWithBackKey(testApp, uiDevice).recordAllRuns().build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#closeAppWithHomeKey
+ */
+ @Test
+ public void closeAppWithHomeKey() {
+ CommonTransitions.closeAppWithHomeKey(testApp, uiDevice).recordAllRuns().build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#openAppToSplitScreen
+ */
+ @Test
+ public void openAppToSplitScreen() {
+ CommonTransitions.appToSplitScreen(testApp, uiDevice).includeJankyRuns().recordAllRuns()
+ .build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#splitScreenToLauncher
+ */
+ @Test
+ public void splitScreenToLauncher() {
+ CommonTransitions.splitScreenToLauncher(testApp,
+ uiDevice).includeJankyRuns().recordAllRuns()
+ .build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#resizeSplitScreen
+ */
+ @Test
+ public void resizeSplitScreen() {
+ IAppHelper bottomApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "ImeApp");
+ CommonTransitions.resizeSplitScreen(testApp, bottomApp, uiDevice, new Rational(1, 3),
+ new Rational(2, 3)).includeJankyRuns().recordEachRun().build().run();
+ }
+
+ // IME tests
+
+ /**
+ * atest FlickerTest:DebugTests#editTextSetFocus
+ */
+ @Test
+ public void editTextSetFocus() {
+ CommonTransitions.editTextSetFocus(uiDevice).includeJankyRuns().recordEachRun()
+ .build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#editTextLoseFocusToHome
+ */
+ @Test
+ public void editTextLoseFocusToHome() {
+ CommonTransitions.editTextLoseFocusToHome(uiDevice).includeJankyRuns().recordEachRun()
+ .build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#editTextLoseFocusToApp
+ */
+ @Test
+ public void editTextLoseFocusToApp() {
+ CommonTransitions.editTextLoseFocusToHome(uiDevice).includeJankyRuns().recordEachRun()
+ .build().run();
+ }
+
+ // PIP tests
+
+ /**
+ * atest FlickerTest:DebugTests#enterPipMode
+ */
+ @Test
+ public void enterPipMode() {
+ CommonTransitions.enterPipMode(uiDevice).includeJankyRuns().recordEachRun().build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#exitPipModeToHome
+ */
+ @Test
+ public void exitPipModeToHome() {
+ CommonTransitions.exitPipModeToHome(uiDevice).includeJankyRuns().recordEachRun()
+ .build().run();
+ }
+
+ /**
+ * atest FlickerTest:DebugTests#exitPipModeToApp
+ */
+ @Test
+ public void exitPipModeToApp() {
+ CommonTransitions.exitPipModeToApp(uiDevice).includeJankyRuns().recordEachRun()
+ .build().run();
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java b/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java
new file mode 100644
index 0000000..7061b23
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/FlickerTestBase.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.AutomationUtils.setDefaultWait;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.platform.helpers.IAppHelper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.uiautomator.UiDevice;
+import android.util.Log;
+
+import com.android.server.wm.flicker.TransitionRunner.TransitionResult;
+
+import org.junit.After;
+import org.junit.AfterClass;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.function.Consumer;
+
+/**
+ * Base class of all Flicker test that performs common functions for all flicker tests:
+ * <p>
+ * - Caches transitions so that a transition is run once and the transition results are used by
+ * tests multiple times. This is needed for parameterized tests which call the BeforeClass methods
+ * multiple times.
+ * - Keeps track of all test artifacts and deletes ones which do not need to be reviewed.
+ * - Fails tests if results are not available for any test due to jank.
+ */
+public class FlickerTestBase {
+ public static final String TAG = "FLICKER";
+ static final String NAVIGATION_BAR_WINDOW_TITLE = "NavigationBar";
+ static final String STATUS_BAR_WINDOW_TITLE = "StatusBar";
+ static final String DOCKED_STACK_DIVIDER = "DockedStackDivider";
+ private static HashMap<String, List<TransitionResult>> transitionResults =
+ new HashMap<>();
+ IAppHelper testApp;
+ UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ private List<TransitionResult> results;
+ private TransitionResult lastResult = null;
+
+ /**
+ * Teardown any system settings and clean up test artifacts from the file system.
+ *
+ * Note: test artifacts for failed tests will remain on the device.
+ */
+ @AfterClass
+ public static void teardown() {
+ setDefaultWait();
+ transitionResults.values().stream()
+ .flatMap(List::stream)
+ .forEach(result -> {
+ if (result.canDelete()) {
+ result.delete();
+ } else {
+ if (result.layersTraceExists()) {
+ Log.e(TAG, "Layers trace saved to " + result.getLayersTracePath());
+ }
+ if (result.windowManagerTraceExists()) {
+ Log.e(TAG, "WindowManager trace saved to " + result
+ .getWindowManagerTracePath
+ ());
+ }
+ if (result.screenCaptureVideoExists()) {
+ Log.e(TAG, "Screen capture video saved to " + result
+ .screenCaptureVideo.toString());
+ }
+ }
+ });
+ }
+
+ /**
+ * Runs a transition, returns a cached result if the transition has run before.
+ */
+ void runTransition(TransitionRunner transition) {
+ if (transitionResults.containsKey(transition.getTestTag())) {
+ results = transitionResults.get(transition.getTestTag());
+ return;
+ }
+ results = transition.run().getResults();
+ /* Fail if we don't have any results due to jank */
+ assertWithMessage("No results to test because all transition runs were invalid because "
+ + "of Jank").that(results).isNotEmpty();
+ transitionResults.put(transition.getTestTag(), results);
+ }
+
+ /**
+ * Goes through a list of transition results and checks assertions on each result.
+ */
+ void checkResults(Consumer<TransitionResult> assertion) {
+
+ for (TransitionResult result : results) {
+ lastResult = result;
+ assertion.accept(result);
+ }
+ lastResult = null;
+ }
+
+ /**
+ * Kludge to mark a file for saving. If {@code checkResults} fails, the last result is not
+ * cleared. This indicates the assertion failed for the result, so mark it for saving.
+ */
+ @After
+ public void markArtifactsForSaving() {
+ if (lastResult != null) {
+ lastResult.flagForSaving();
+ }
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java
new file mode 100644
index 0000000..7e71369
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppColdTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.CommonTransitions.getOpenAppCold;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+import static com.android.server.wm.flicker.WmTraceSubject.assertThat;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test cold launch app from launcher.
+ * To run this test: {@code atest FlickerTests:OpenAppColdTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class OpenAppColdTest extends FlickerTestBase {
+
+ public OpenAppColdTest() {
+ this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "SimpleApp");
+ }
+
+ @Before
+ public void runTransition() {
+ super.runTransition(getOpenAppCold(testApp, uiDevice).build());
+ }
+
+ @Test
+ public void checkVisibility_navBarWindowIsAlwaysVisible() {
+ checkResults(result -> assertThat(result)
+ .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarWindowIsAlwaysVisible() {
+ checkResults(result -> assertThat(result)
+ .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_wallpaperWindowBecomesInvisible() {
+ checkResults(result -> assertThat(result)
+ .showsBelowAppWindow("wallpaper")
+ .then()
+ .hidesBelowAppWindow("wallpaper")
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkZOrder_appWindowReplacesLauncherAsTopWindow() {
+ checkResults(result -> assertThat(result)
+ .showsAppWindowOnTop(
+ "com.google.android.apps.nexuslauncher/.NexusLauncherActivity")
+ .then()
+ .showsAppWindowOnTop(testApp.getPackage())
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkCoveredRegion_noUncoveredRegions() {
+ checkResults(result -> LayersTraceSubject.assertThat(result).coversRegion(
+ getDisplayBounds()).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_navBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_wallpaperLayerBecomesInvisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer("wallpaper")
+ .then()
+ .hidesLayer("wallpaper")
+ .forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java
new file mode 100644
index 0000000..745569a
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppToSplitScreenTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.CommonTransitions.appToSplitScreen;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test open app to split screen.
+ * To run this test: {@code atest FlickerTests:OpenAppToSplitScreenTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class OpenAppToSplitScreenTest extends FlickerTestBase {
+
+ public OpenAppToSplitScreenTest() {
+ this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "SimpleApp");
+ }
+
+ @Before
+ public void runTransition() {
+ super.runTransition(appToSplitScreen(testApp, uiDevice).includeJankyRuns().build());
+ }
+
+ @Test
+ public void checkVisibility_navBarWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_dividerWindowBecomesVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .hidesAboveAppWindow(DOCKED_STACK_DIVIDER)
+ .then()
+ .showsAboveAppWindow(DOCKED_STACK_DIVIDER)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkCoveredRegion_noUncoveredRegions() {
+ checkResults(result ->
+ LayersTraceSubject.assertThat(result)
+ .coversRegion(getDisplayBounds()).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_navBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_dividerLayerBecomesVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .hidesLayer(DOCKED_STACK_DIVIDER)
+ .then()
+ .showsLayer(DOCKED_STACK_DIVIDER)
+ .forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java
new file mode 100644
index 0000000..de7639d
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenAppWarmTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.CommonTransitions.openAppWarm;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+import static com.android.server.wm.flicker.WmTraceSubject.assertThat;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test warm launch app.
+ * To run this test: {@code atest FlickerTests:OpenAppWarmTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class OpenAppWarmTest extends FlickerTestBase {
+
+ public OpenAppWarmTest() {
+ this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "SimpleApp");
+ }
+
+ @Before
+ public void runTransition() {
+ super.runTransition(openAppWarm(testApp, uiDevice).build());
+ }
+
+ @Test
+ public void checkVisibility_navBarIsAlwaysVisible() {
+ checkResults(result -> assertThat(result)
+ .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarIsAlwaysVisible() {
+ checkResults(result -> assertThat(result)
+ .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_wallpaperBecomesInvisible() {
+ checkResults(result -> assertThat(result)
+ .showsBelowAppWindow("wallpaper")
+ .then()
+ .hidesBelowAppWindow("wallpaper")
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkZOrder_appWindowReplacesLauncherAsTopWindow() {
+ checkResults(result -> assertThat(result)
+ .showsAppWindowOnTop(
+ "com.google.android.apps.nexuslauncher/.NexusLauncherActivity")
+ .then()
+ .showsAppWindowOnTop(testApp.getPackage())
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkCoveredRegion_noUncoveredRegions() {
+ checkResults(result -> LayersTraceSubject.assertThat(result).coversRegion(
+ getDisplayBounds()).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_navBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_wallpaperLayerBecomesInvisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer("wallpaper")
+ .then()
+ .hidesLayer("wallpaper")
+ .forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java
new file mode 100644
index 0000000..1bd519c
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/OpenImeWindowTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.CommonTransitions.editTextSetFocus;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test IME window opening transitions.
+ * To run this test: {@code atest FlickerTests:OpenImeWindowTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class OpenImeWindowTest extends FlickerTestBase {
+
+ private static final String IME_WINDOW_TITLE = "InputMethod";
+
+ @Before
+ public void runTransition() {
+ super.runTransition(editTextSetFocus(uiDevice)
+ .includeJankyRuns().build());
+ }
+
+ @Test
+ public void checkVisibility_imeWindowBecomesVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .hidesImeWindow(IME_WINDOW_TITLE)
+ .then()
+ .showsImeWindow(IME_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_imeLayerBecomesVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .hidesLayer(IME_WINDOW_TITLE)
+ .then()
+ .showsLayer(IME_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkCoveredRegion_noUncoveredRegions() {
+ checkResults(result -> LayersTraceSubject.assertThat(result).coversRegion(
+ getDisplayBounds()).forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java
new file mode 100644
index 0000000..8a15cbd
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ResizeSplitScreenTest.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.CommonTransitions.resizeSplitScreen;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+import static com.android.server.wm.flicker.WindowUtils.getDockedStackDividerInset;
+import static com.android.server.wm.flicker.WindowUtils.getNavigationBarHeight;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.graphics.Rect;
+import android.platform.helpers.IAppHelper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Rational;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test split screen resizing window transitions.
+ * To run this test: {@code atest FlickerTests:ResizeSplitScreenTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class ResizeSplitScreenTest extends FlickerTestBase {
+
+ public ResizeSplitScreenTest() {
+ this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "SimpleApp");
+ }
+
+ @Before
+ public void runTransition() {
+ IAppHelper bottomApp = new StandardAppHelper(InstrumentationRegistry
+ .getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "ImeApp");
+ super.runTransition(resizeSplitScreen(testApp, bottomApp, uiDevice, new Rational(1, 3),
+ new Rational(2, 3)).includeJankyRuns().build());
+ }
+
+ @Test
+ public void checkVisibility_navBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(NAVIGATION_BAR_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(STATUS_BAR_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_topAppLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer("SimpleActivity")
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_bottomAppLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer("ImeActivity")
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_dividerLayerIsAlwaysVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(DOCKED_STACK_DIVIDER)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkPosition_appsStartingBounds() {
+ Rect displayBounds = getDisplayBounds();
+ checkResults(result -> {
+ LayersTrace entries = LayersTrace.parseFrom(result.getLayersTrace(),
+ result.getLayersTracePath());
+
+ assertThat(entries.getEntries()).isNotEmpty();
+ Rect startingDividerBounds = entries.getEntries().get(0).getVisibleBounds
+ (DOCKED_STACK_DIVIDER);
+
+ Rect startingTopAppBounds = new Rect(0, 0, startingDividerBounds.right,
+ startingDividerBounds.top + getDockedStackDividerInset());
+
+ Rect startingBottomAppBounds = new Rect(0,
+ startingDividerBounds.bottom - getDockedStackDividerInset(),
+ displayBounds.right,
+ displayBounds.bottom - getNavigationBarHeight());
+
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion("SimpleActivity", startingTopAppBounds)
+ .inTheBeginning();
+
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion("ImeActivity", startingBottomAppBounds)
+ .inTheBeginning();
+ });
+ }
+
+ @Test
+ public void checkPosition_appsEndingBounds() {
+ Rect displayBounds = getDisplayBounds();
+ checkResults(result -> {
+ LayersTrace entries = LayersTrace.parseFrom(result.getLayersTrace(),
+ result.getLayersTracePath());
+
+ assertThat(entries.getEntries()).isNotEmpty();
+ Rect endingDividerBounds = entries.getEntries().get(
+ entries.getEntries().size() - 1).getVisibleBounds(
+ DOCKED_STACK_DIVIDER);
+
+ Rect startingTopAppBounds = new Rect(0, 0, endingDividerBounds.right,
+ endingDividerBounds.top + getDockedStackDividerInset());
+
+ Rect startingBottomAppBounds = new Rect(0,
+ endingDividerBounds.bottom - getDockedStackDividerInset(),
+ displayBounds.right,
+ displayBounds.bottom - getNavigationBarHeight());
+
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion("SimpleActivity", startingTopAppBounds)
+ .atTheEnd();
+
+ LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion("ImeActivity", startingBottomAppBounds)
+ .atTheEnd();
+ });
+ }
+
+ @Test
+ public void checkVisibility_navBarWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE)
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_topAppWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAppWindow("SimpleActivity")
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_bottomAppWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAppWindow("ImeActivity")
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_dividerWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(DOCKED_STACK_DIVIDER)
+ .forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java
new file mode 100644
index 0000000..3eab68d
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static android.view.Surface.rotationToString;
+
+import static com.android.server.wm.flicker.CommonTransitions.changeAppRotation;
+import static com.android.server.wm.flicker.WindowUtils.getAppPosition;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+import static com.android.server.wm.flicker.WindowUtils.getNavigationBarPosition;
+import static com.android.server.wm.flicker.testapp.ActivityOptions.EXTRA_STARVE_UI_THREAD;
+import static com.android.server.wm.flicker.testapp.ActivityOptions.SEAMLESS_ACTIVITY_COMPONENT_NAME;
+
+import android.content.Intent;
+import android.graphics.Rect;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.view.Surface;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Cycle through supported app rotations using seamless rotations.
+ * To run this test: {@code atest FlickerTests:SeamlessAppRotationTest}
+ */
+@LargeTest
+@RunWith(Parameterized.class)
+public class SeamlessAppRotationTest extends FlickerTestBase {
+ private int mBeginRotation;
+ private int mEndRotation;
+ private Intent mIntent;
+
+ public SeamlessAppRotationTest(String testId, Intent intent, int beginRotation,
+ int endRotation) {
+ this.mIntent = intent;
+ this.mBeginRotation = beginRotation;
+ this.mEndRotation = endRotation;
+ }
+
+ @Parameters(name = "{0}")
+ public static Collection<Object[]> getParams() {
+ int[] supportedRotations =
+ {Surface.ROTATION_0, Surface.ROTATION_90, Surface.ROTATION_270};
+ Collection<Object[]> params = new ArrayList<>();
+
+ ArrayList<Intent> testIntents = new ArrayList<>();
+
+ // launch test activity that supports seamless rotation
+ Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.setComponent(SEAMLESS_ACTIVITY_COMPONENT_NAME);
+ testIntents.add(intent);
+
+ // launch test activity that supports seamless rotation with a busy UI thread to miss frames
+ // when the app is asked to redraw
+ intent = new Intent(intent);
+ intent.putExtra(EXTRA_STARVE_UI_THREAD, true);
+ testIntents.add(intent);
+
+ for (Intent testIntent : testIntents) {
+ for (int begin : supportedRotations) {
+ for (int end : supportedRotations) {
+ if (begin != end) {
+ String testId = rotationToString(begin) + "_" + rotationToString(end);
+ if (testIntent.getExtras() != null &&
+ testIntent.getExtras().getBoolean(EXTRA_STARVE_UI_THREAD)) {
+ testId += "_" + "BUSY_UI_THREAD";
+ }
+ params.add(new Object[]{testId, testIntent, begin, end});
+ }
+ }
+ }
+ }
+ return params;
+ }
+
+ @Before
+ public void runTransition() {
+ String intentId = "";
+ if (mIntent.getExtras() != null &&
+ mIntent.getExtras().getBoolean(EXTRA_STARVE_UI_THREAD)) {
+ intentId = "BUSY_UI_THREAD";
+ }
+
+ super.runTransition(
+ changeAppRotation(mIntent, intentId, InstrumentationRegistry.getContext(),
+ uiDevice, mBeginRotation, mEndRotation).repeat(5).build());
+ }
+
+ @Test
+ public void checkVisibility_navBarWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkPosition_navBarLayerRotatesAndScales() {
+ Rect startingPos = getNavigationBarPosition(mBeginRotation);
+ Rect endingPos = getNavigationBarPosition(mEndRotation);
+ if (startingPos.equals(endingPos)) {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(NAVIGATION_BAR_WINDOW_TITLE, startingPos)
+ .forAllEntries());
+ } else {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(NAVIGATION_BAR_WINDOW_TITLE, startingPos)
+ .inTheBeginning());
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(NAVIGATION_BAR_WINDOW_TITLE, endingPos)
+ .atTheEnd());
+ }
+ }
+
+ @Test
+ public void checkPosition_appLayerRotates() {
+ Rect startingPos = getAppPosition(mBeginRotation);
+ Rect endingPos = getAppPosition(mEndRotation);
+ if (startingPos.equals(endingPos)) {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(mIntent.getComponent().getPackageName(), startingPos)
+ .forAllEntries());
+ } else {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .hasVisibleRegion(mIntent.getComponent().getPackageName(), startingPos)
+ .then()
+ .hasVisibleRegion(mIntent.getComponent().getPackageName(), endingPos)
+ .forAllEntries());
+ }
+ }
+
+ @Test
+ public void checkCoveredRegion_noUncoveredRegions() {
+ Rect startingBounds = getDisplayBounds(mBeginRotation);
+ Rect endingBounds = getDisplayBounds(mEndRotation);
+ if (startingBounds.equals(endingBounds)) {
+ checkResults(result ->
+ LayersTraceSubject.assertThat(result)
+ .coversRegion(startingBounds)
+ .forAllEntries());
+ } else {
+ checkResults(result ->
+ LayersTraceSubject.assertThat(result)
+ .coversRegion(startingBounds)
+ .then()
+ .coversRegion(endingBounds)
+ .forAllEntries());
+ }
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java b/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java
new file mode 100644
index 0000000..40bd4e9
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/SplitScreenToLauncherTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import static com.android.server.wm.flicker.CommonTransitions.splitScreenToLauncher;
+import static com.android.server.wm.flicker.WindowUtils.getDisplayBounds;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.FlakyTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test open app to split screen.
+ * To run this test: {@code atest FlickerTests:SplitScreenToLauncherTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class SplitScreenToLauncherTest extends FlickerTestBase {
+
+ public SplitScreenToLauncherTest() {
+ this.testApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),
+ "com.android.server.wm.flicker.testapp", "SimpleApp");
+ }
+
+ @Before
+ public void runTransition() {
+ super.runTransition(splitScreenToLauncher(testApp, uiDevice).includeJankyRuns().build());
+ }
+
+ @Test
+ public void checkCoveredRegion_noUncoveredRegions() {
+ checkResults(result ->
+ LayersTraceSubject.assertThat(result)
+ .coversRegion(getDisplayBounds()).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_dividerLayerBecomesInVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(DOCKED_STACK_DIVIDER)
+ .then()
+ .hidesLayer(DOCKED_STACK_DIVIDER)
+ .forAllEntries());
+ }
+
+ @FlakyTest(bugId = 79686616)
+ @Test
+ public void checkVisibility_appLayerBecomesInVisible() {
+ checkResults(result -> LayersTraceSubject.assertThat(result)
+ .showsLayer(testApp.getPackage())
+ .then()
+ .hidesLayer(testApp.getPackage())
+ .forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_navBarWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_statusBarWindowIsAlwaysVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE).forAllEntries());
+ }
+
+ @Test
+ public void checkVisibility_dividerWindowBecomesInVisible() {
+ checkResults(result -> WmTraceSubject.assertThat(result)
+ .showsAboveAppWindow(DOCKED_STACK_DIVIDER)
+ .then()
+ .hidesAboveAppWindow(DOCKED_STACK_DIVIDER)
+ .forAllEntries());
+ }
+}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/StandardAppHelper.java b/tests/FlickerTests/src/com/android/server/wm/flicker/StandardAppHelper.java
new file mode 100644
index 0000000..79a0220
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/StandardAppHelper.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker;
+
+import android.app.Instrumentation;
+import android.platform.helpers.AbstractStandardAppHelper;
+
+/**
+ * Class to take advantage of {@code IAppHelper} interface so the same test can be run against
+ * first party and third party apps.
+ */
+public class StandardAppHelper extends AbstractStandardAppHelper {
+ private final String mPackageName;
+ private final String mLauncherName;
+
+ public StandardAppHelper(Instrumentation instr, String packageName, String launcherName) {
+ super(instr);
+ mPackageName = packageName;
+ mLauncherName = launcherName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getPackage() {
+ return mPackageName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getLauncherName() {
+ return mLauncherName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void dismissInitialDialogs() {
+
+ }
+}
diff --git a/tests/FlickerTests/test-apps/Android.mk b/tests/FlickerTests/test-apps/Android.mk
new file mode 100644
index 0000000..9af9f444
--- /dev/null
+++ b/tests/FlickerTests/test-apps/Android.mk
@@ -0,0 +1,15 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include $(call all-subdir-makefiles)
diff --git a/tests/FlickerTests/test-apps/flickerapp/Android.mk b/tests/FlickerTests/test-apps/flickerapp/Android.mk
new file mode 100644
index 0000000..b916900
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/Android.mk
@@ -0,0 +1,31 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_PACKAGE_NAME := FlickerTestApp
+LOCAL_MODULE_TAGS := tests optional
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_SDK_VERSION := current
+LOCAL_COMPATIBILITY_SUITE := device-tests
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := flickertestapplib
+LOCAL_MODULE_TAGS := tests optional
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := src/com/android/server/wm/flicker/testapp/ActivityOptions.java
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml
new file mode 100644
index 0000000..b694172
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.server.wm.flicker.testapp">
+
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="27"/>
+ <application
+ android:allowBackup="false"
+ android:supportsRtl="true">
+ <activity android:name=".SimpleActivity"
+ android:taskAffinity="com.android.server.wm.flicker.testapp.SimpleActivity"
+ android:label="SimpleApp">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ <activity android:name=".ImeActivity"
+ android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivity"
+ android:label="ImeApp">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ <activity android:name=".PipActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges=
+ "screenSize|smallestScreenSize|screenLayout|orientation"
+ android:taskAffinity="com.android.server.wm.flicker.testapp.PipActivity"
+ android:label="PipApp">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ <activity android:name=".SeamlessRotationActivity"
+ android:taskAffinity=
+ "com.android.server.wm.flicker.testapp.SeamlessRotationActivity"
+ android:configChanges="orientation|screenSize"
+ android:label="SeamlessApp">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml
new file mode 100644
index 0000000..d5eb023
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/holo_green_light">
+ <EditText android:id="@+id/plain_text_input"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:inputType="text"/>
+</LinearLayout>
diff --git a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_pip.xml b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_pip.xml
new file mode 100644
index 0000000..2c58d91
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_pip.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/holo_blue_bright">
+ <Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/enter_pip"
+ android:text="Enter PIP"/>
+</LinearLayout>
diff --git a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_simple.xml b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_simple.xml
new file mode 100644
index 0000000..5d94e51
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_simple.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/holo_orange_light">
+
+</LinearLayout>
diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java
new file mode 100644
index 0000000..1899411
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.testapp;
+
+import android.content.ComponentName;
+
+public class ActivityOptions {
+ public static final String EXTRA_STARVE_UI_THREAD = "StarveUiThread";
+ public static final ComponentName SEAMLESS_ACTIVITY_COMPONENT_NAME =
+ new ComponentName("com.android.server.wm.flicker.testapp",
+ "com.android.server.wm.flicker.testapp.SeamlessRotationActivity");
+}
diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivity.java
new file mode 100644
index 0000000..df60460
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.testapp;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class ImeActivity extends Activity {
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ WindowManager.LayoutParams p = getWindow().getAttributes();
+ p.layoutInDisplayCutoutMode = WindowManager.LayoutParams
+ .LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+ getWindow().setAttributes(p);
+ setContentView(R.layout.activity_ime);
+ }
+}
diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/PipActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/PipActivity.java
new file mode 100644
index 0000000..9a8f399
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/PipActivity.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.testapp;
+
+import android.app.Activity;
+import android.app.PictureInPictureParams;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.util.Rational;
+import android.view.WindowManager;
+import android.widget.Button;
+
+public class PipActivity extends Activity {
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ WindowManager.LayoutParams p = getWindow().getAttributes();
+ p.layoutInDisplayCutoutMode = WindowManager.LayoutParams
+ .LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+ getWindow().setAttributes(p);
+ setContentView(R.layout.activity_pip);
+ Button enterPip = (Button) findViewById(R.id.enter_pip);
+
+ PictureInPictureParams params = new PictureInPictureParams.Builder()
+ .setAspectRatio(new Rational(1, 1))
+ .setSourceRectHint(new Rect(0, 0, 100, 100))
+ .build();
+
+ enterPip.setOnClickListener((v) -> enterPictureInPictureMode(params));
+ }
+}
diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SeamlessRotationActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SeamlessRotationActivity.java
new file mode 100644
index 0000000..3a0c1c9
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SeamlessRotationActivity.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.testapp;
+
+import static android.os.SystemClock.sleep;
+import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+
+import static com.android.server.wm.flicker.testapp.ActivityOptions.EXTRA_STARVE_UI_THREAD;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.view.Window;
+import android.view.WindowManager;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class SeamlessRotationActivity extends Activity {
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ enableSeamlessRotation();
+ setContentView(R.layout.activity_simple);
+ boolean starveUiThread = getIntent().getExtras() != null &&
+ getIntent().getExtras().getBoolean(EXTRA_STARVE_UI_THREAD);
+ if (starveUiThread) {
+ starveUiThread();
+ }
+ }
+
+ private void starveUiThread() {
+ Handler handler = new Handler(Looper.getMainLooper(), (Message unused) -> {
+ sleep(20);
+ return true;
+ });
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ handler.sendEmptyMessage(0);
+ }
+ }, 0, 21);
+ }
+
+ private void enableSeamlessRotation() {
+ WindowManager.LayoutParams p = getWindow().getAttributes();
+ p.rotationAnimation = WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS;
+ p.layoutInDisplayCutoutMode = WindowManager.LayoutParams
+ .LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+ getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+ WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ getWindow().setAttributes(p);
+ }
+}
diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SimpleActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SimpleActivity.java
new file mode 100644
index 0000000..699abf8
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/SimpleActivity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wm.flicker.testapp;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class SimpleActivity extends Activity {
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ WindowManager.LayoutParams p = getWindow().getAttributes();
+ p.layoutInDisplayCutoutMode = WindowManager.LayoutParams
+ .LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+ getWindow().setAttributes(p);
+ setContentView(R.layout.activity_simple);
+ }
+}