commit 101698504abf815072dc3cf3756fc34d2172cfa0
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 07 23:42:33 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 07 23:42:33 2022 +0000
tree 3f6d492b98ff493faeb3afa83d4573f388ba9ec7
parent 90736becf8db31c3ad95d6820c9a8acddba063bf
parent 26c13cf52ad15e8e112f50259f6a2f3b46d4d286

Merge "mediav2: use buffer's format to avoid race" into tm-dev

apps/CameraITS/tests/its_base_test.py

diff --git a/apps/CameraITS/tests/its_base_test.py b/apps/CameraITS/tests/its_base_test.py
index 0240682..9b29ab7 100644
--- a/apps/CameraITS/tests/its_base_test.py
+++ b/apps/CameraITS/tests/its_base_test.py
@@ -171,6 +171,7 @@
     self.tablet.adb.shell('am force-stop com.google.android.apps.photos')
     self.tablet.adb.shell('am force-stop com.android.gallery3d')
     self.tablet.adb.shell('am force-stop com.sec.android.gallery3d')
+    self.tablet.adb.shell('am force-stop com.miui.gallery')
 
   def set_tablet_landscape_orientation(self):
     """Sets the screen orientation to landscape.

tests/tests/permission/Android.bp

diff --git a/tests/tests/permission/Android.bp b/tests/tests/permission/Android.bp
index b78b6c0..eae7276 100644
--- a/tests/tests/permission/Android.bp
+++ b/tests/tests/permission/Android.bp
@@ -63,4 +63,54 @@
         "android.test.runner",
         "android.test.base",
     ],
+    data: [
+        ":AppThatDefinesUndefinedPermissionGroupElement",
+        ":AppThatDoesNotHaveBgLocationAccess",
+        ":CtsAdversarialPermissionDefinerApp",
+        ":CtsAdversarialPermissionUserApp",
+        ":CtsAppThatAccessesLocationOnCommand",
+        ":CtsAppThatAlsoDefinesPermissionA",
+        ":CtsAppThatAlsoDefinesPermissionADifferentCert",
+        ":CtsAppThatAlsoDefinesPermissionGroupADifferentCert",
+        ":CtsAppThatAlsoDefinesPermissionGroupADifferentCert30",
+        ":CtsAppThatDefinesPermissionA",
+        ":CtsAppThatDefinesPermissionInPlatformGroup",
+        ":CtsAppThatDefinesPermissionWithInvalidGroup",
+        ":CtsAppThatDefinesPermissionWithInvalidGroup30",
+        ":CtsAppThatRequestsBluetoothPermission30",
+        ":CtsAppThatRequestsCalendarContactsBodySensorCustomPermission",
+        ":CtsAppThatRequestsBluetoothPermission31",
+        ":CtsAppThatRequestsBluetoothPermissionNeverForLocation31",
+        ":CtsAppThatRequestsContactsAndCallLogPermission16",
+        ":CtsAppThatRequestsContactsPermission15",
+        ":CtsAppThatRequestsContactsPermission16",
+        ":CtsAppThatRequestsLocationAndBackgroundPermission28",
+        ":CtsAppThatRequestsLocationAndBackgroundPermission29",
+        ":CtsAppThatRequestsBluetoothPermissionNeverForLocationNoProvider",
+        ":CtsAppThatRequestsLocationPermission22",
+        ":CtsAppThatRequestsLocationPermission28",
+        ":CtsAppThatRequestsLocationPermission29",
+        ":CtsAppThatRequestsLocationPermission29v4",
+        ":CtsAppThatRequestsOneTimePermission",
+        ":CtsAppThatRequestsPermissionAandB",
+        ":CtsAppThatRequestsPermissionAandC",
+        ":CtsAppThatRequestsStoragePermission28",
+        ":CtsAppThatRequestsStoragePermission29",
+        ":CtsAppThatRunsRationaleTests",
+        ":CtsAppToTestRevokeSelfPermission",
+        ":CtsAppWithSharedUidThatRequestsLocationPermission28",
+        ":CtsAppWithSharedUidThatRequestsLocationPermission29",
+        ":CtsAppWithSharedUidThatRequestsNoPermissions",
+        ":CtsAppWithSharedUidThatRequestsPermissions",
+        ":CtsInstallPermissionDefinerApp",
+        ":CtsInstallPermissionEscalatorApp",
+        ":CtsInstallPermissionUserApp",
+        ":CtsRuntimePermissionDefinerApp",
+        ":CtsRuntimePermissionUserApp",
+        ":CtsStorageEscalationApp28",
+        ":CtsStorageEscalationApp29Full",
+        ":CtsStorageEscalationApp29Scoped",
+        ":CtsVictimPermissionDefinerApp",
+    ],
+    per_testcase_directory: true,
 }