Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev

2019-04-23 09:00:25 +00:00
parent 33ff97d7f6 28bc3708d0
commit c4fbf3f080
2 changed files with 1 additions and 15 deletions
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -45,12 +45,6 @@
    }
  ],
  "postsubmit": [
-    {
-      "name": "CtsActivityManagerDeviceTestCases"
-    },
-    {
-      "name": "CtsActivityManagerDeviceSdk25TestCases"
-    },
    {
      "name": "FrameworksServicesTests",
      "options": [
@@ -58,14 +52,6 @@
          "include-filter": "com.android.server.am."
        }
      ]
-    },
-    {
-      "name": "WmTests",
-      "options": [
-        {
-          "include-filter": "com.android.server.am."
-        }
-      ]
    }
  ]
 }
--- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -99,7 +99,7 @@ import com.android.server.LocalServices;
 * data for Tron, logcat, event logs and {@link android.app.WaitResult}.
 *
 * Tests:
- * atest CtsActivityManagerDeviceTestCases:ActivityMetricsLoggerTests
+ * atest CtsWindowManagerDeviceTestCases:ActivityMetricsLoggerTests
 */
 class ActivityMetricsLogger {