Merge "Remove some flaky WindowInsetsAnimationControllerTests from presubmit" into rvc-dev
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/mainline/MainlineModule.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/mainline/MainlineModule.java
index 6e48bcc..fb18b06 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/mainline/MainlineModule.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/mainline/MainlineModule.java
@@ -19,6 +19,9 @@
* Enum containing metadata for mainline modules.
*/
public enum MainlineModule {
+
+ // Added in Q
+
// Security
MEDIA_SOFTWARE_CODEC("com.google.android.media.swcodec",
true, ModuleType.APEX,
@@ -50,10 +53,6 @@
"9A:4B:85:34:44:86:EC:F5:1F:F8:05:EB:9D:23:17:97:79:BE:B7:EC:81:91:93:5A:CA:67:F0"
+ ":F4:09:02:52:97"),
// Consistency
- TZDATA2("com.google.android.tzdata2",
- true, ModuleType.APEX,
- "48:F3:A2:98:76:1B:6D:46:75:7C:EE:62:43:66:6A:25:B9:15:B9:42:18:A6:C2:82:72:99:BE"
- + ":DA:C9:92:AB:E7"),
NETWORK_STACK("com.google.android.networkstack",
true, ModuleType.APK,
"5F:A4:22:12:AD:40:3E:22:DD:6E:FE:75:F3:F3:11:84:05:1F:EF:74:4C:0B:05:BE:5C:73:ED"
@@ -70,6 +69,61 @@
true, ModuleType.APK,
"BF:62:23:1E:28:F0:85:42:75:5C:F3:3C:9D:D8:3C:5D:1D:0F:A3:20:64:50:EF:BC:4C:3F:F3"
+ ":D5:FD:A0:33:0F"),
+
+ // Added in R
+
+ ADBD("com.google.android.adbd",
+ true, ModuleType.APEX,
+ "87:3D:4E:43:58:25:1A:25:1A:2D:9C:18:E1:55:09:45:21:88:A8:1E:FE:9A:83:9D:43:0D:E8"
+ + ":D8:7E:C2:49:4C"),
+ NEURAL_NETWORKS("com.google.android.neuralnetworks",
+ true, ModuleType.APEX,
+ "6F:AB:D5:72:9A:90:02:6B:74:E4:87:79:8F:DF:10:BB:E3:6C:9E:6C:B7:A6:59:04:3C:D8:15"
+ + ":61:6C:9E:60:50"),
+ CELL_BROADCAST("com.google.android.cellbroadcast",
+ true, ModuleType.APEX,
+ "A8:2C:84:7A:A3:9D:DA:19:A5:6C:9E:D3:56:50:1A:76:4F:BD:5D:C9:60:98:66:16:E3:1D:48"
+ + ":EE:27:08:19:70"),
+ EXT_SERVICES("com.google.android.extservices",
+ true, ModuleType.APEX,
+ "10:89:F2:7C:85:6A:83:D4:02:6B:6A:49:97:15:4C:A1:70:9A:F6:93:27:C8:EF:9A:2D:1D:56"
+ + ":AB:69:DE:07:0B"),
+ IPSEC("com.google.android.ipsec",
+ true, ModuleType.APEX,
+ "64:3D:3E:A5:B7:BF:22:E5:94:42:29:77:7C:4B:FF:C6:C8:44:14:64:4D:E0:4B:E4:90:37:57"
+ + ":DE:83:CF:04:8B"),
+ MEDIA_PROVIDER("com.google.android.mediaprovider",
+ true, ModuleType.APEX,
+ "1A:61:93:09:6D:DC:81:58:72:45:EF:2C:07:33:73:6E:8E:FF:9D:E9:0E:51:27:4B:F8:23:AC"
+ + ":F0:F7:49:00:A0"),
+ PERMISSION_CONTROLLER_APEX("com.google.android.permission",
+ true, ModuleType.APEX,
+ "69:AC:92:BF:BA:D5:85:4C:61:8E:AB:AE:85:7F:AB:0B:1A:65:19:44:E9:19:EA:3C:86:DB:D4"
+ + ":07:04:1E:22:C1"),
+ SDK_EXTENSIONS("com.google.android.sdkext",
+ true, ModuleType.APEX,
+ "99:90:29:2B:22:11:D2:78:17:BF:5B:10:98:84:8F:68:44:53:37:16:2B:47:FF:D1:A0:8E:10"
+ + ":CE:65:B1:CC:73"),
+ STATSD("com.google.android.os.statsd",
+ true, ModuleType.APEX,
+ "DA:FE:D6:20:A7:0C:98:05:A9:A2:22:04:55:6B:0E:94:E8:E3:4D:ED:F4:16:EC:58:92:C6:48"
+ + ":86:53:39:B4:7B"),
+ TELEMETRY_TVP("com.google.mainline.telemetry",
+ true, ModuleType.APK,
+ "9D:AC:CC:AE:4F:49:5A:E6:DB:C5:8A:0E:C2:33:C6:E5:2D:31:14:33:AC:57:3C:4D:A1:C7:39"
+ + ":DF:64:03:51:5D"),
+ TETHERING("com.google.android.tethering",
+ true, ModuleType.APEX,
+ "E5:3F:52:F4:14:15:0C:05:BA:E0:E4:CE:E2:07:3D:D0:0F:E6:44:66:1D:5F:9A:0F:BE:49:4A"
+ + ":DC:07:F0:59:93"),
+ TZDATA2("com.google.android.tzdata2",
+ true, ModuleType.APEX,
+ "48:F3:A2:98:76:1B:6D:46:75:7C:EE:62:43:66:6A:25:B9:15:B9:42:18:A6:C2:82:72:99:BE"
+ + ":DA:C9:92:AB:E7"),
+ WIFI("com.google.android.wifi",
+ false, ModuleType.APEX,
+ "B7:A3:DB:7A:86:6D:18:51:3F:97:6C:63:20:BC:0F:E6:E4:01:BA:2F:26:96:B1:C3:94:2A:F0"
+ + ":FE:29:31:98:B1"),
;
public final String packageName;
diff --git a/hostsidetests/adb/src/android/adb/cts/AdbHostTest.java b/hostsidetests/adb/src/android/adb/cts/AdbHostTest.java
index bea7506..d5301d4 100644
--- a/hostsidetests/adb/src/android/adb/cts/AdbHostTest.java
+++ b/hostsidetests/adb/src/android/adb/cts/AdbHostTest.java
@@ -64,6 +64,10 @@
return;
}
+ if (getDevice().isAdbTcp()) { // adb over WiFi, no point checking it
+ return;
+ }
+
ProcessBuilder pb = new ProcessBuilder(check_ms_os_desc.getAbsolutePath());
pb.environment().put("ANDROID_SERIAL", serial);
pb.redirectOutput(ProcessBuilder.Redirect.PIPE);
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/LocationPolicyTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/LocationPolicyTest.java
new file mode 100644
index 0000000..e2ff6c6
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/LocationPolicyTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 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.appsecurity.cts;
+
+
+import android.platform.test.annotations.SecurityTest;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Tests to verify app location access */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class LocationPolicyTest extends BaseAppSecurityTest {
+
+ private static final String TEST_PKG = "android.appsecurity.cts.locationpolicy";
+ private static final String TEST_APK = "CtsLocationPolicyApp.apk";
+
+ @Before
+ public void setUp() throws Exception {
+ getDevice().uninstallPackage(TEST_PKG);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ getDevice().uninstallPackage(TEST_PKG);
+ }
+
+ @Test
+ @SecurityTest
+ public void testLocationPolicyPermissions() throws Exception {
+ new InstallMultiple(true).addFile(TEST_APK).run();
+ Utils.runDeviceTests(
+ getDevice(), TEST_PKG, ".LocationPolicyTest", "testLocationPolicyPermissions");
+ }
+}
diff --git a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp
new file mode 100644
index 0000000..b7174d2
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp
@@ -0,0 +1,36 @@
+// Copyright (C) 2020 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.
+
+android_test {
+ name: "CtsLocationPolicyApp",
+ defaults: ["cts_defaults"],
+ libs: [
+ "android.test.runner.stubs",
+ "android.test.base.stubs",
+ ],
+ static_libs: [
+ "androidx.test.rules",
+ "telephony-common",
+ ],
+ srcs: ["src/**/*.java"],
+ platform_apis: true,
+ test_suites: [
+ "cts",
+ "vts10",
+ "sts",
+ "general-tests",
+ ],
+ min_sdk_version: "27",
+ target_sdk_version: "28",
+}
diff --git a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/AndroidManifest.xml
new file mode 100644
index 0000000..ed9d1fc
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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="android.appsecurity.cts.locationpolicy">
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.appsecurity.cts.locationpolicy"
+ android:label="Test to check location policy access for bad sdk."/>
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/src/android/appsecurity/cts/locationpolicy/LocationPolicyTest.java b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/src/android/appsecurity/cts/locationpolicy/LocationPolicyTest.java
new file mode 100644
index 0000000..74ce0c5
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/src/android/appsecurity/cts/locationpolicy/LocationPolicyTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 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.appsecurity.cts.locationpolicy;
+
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.platform.test.annotations.SecurityTest;
+import android.telephony.TelephonyManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class LocationPolicyTest {
+
+ private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
+
+ @Test
+ @SecurityTest
+ public void testLocationPolicyPermissions() throws Exception {
+ assertNotNull(mContext);
+ PackageManager pm = mContext.getPackageManager();
+ assertNotNull(pm);
+ assertNotEquals(
+ PackageManager.PERMISSION_GRANTED,
+ pm.checkPermission(Manifest.permission.ACCESS_FINE_LOCATION,
+ mContext.getPackageName()));
+ assertNotEquals(
+ PackageManager.PERMISSION_GRANTED,
+ pm.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION,
+ mContext.getPackageName()));
+ TelephonyManager tele = mContext.getSystemService(TelephonyManager.class);
+ try {
+ tele.getCellLocation();
+ fail(
+ "ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION Permissions not granted. Should have"
+ + " received a security exception when invoking getCellLocation().");
+ } catch (SecurityException ignore) {
+ // That's what we want!
+ }
+ }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/LockTaskHostDrivenTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/LockTaskHostDrivenTest.java
index f6659f3..4321f38 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/LockTaskHostDrivenTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/LockTaskHostDrivenTest.java
@@ -88,12 +88,6 @@
mUiDevice.pressHome();
}
- public void testLockTaskIsActive() throws Exception {
- Log.d(TAG, "testLockTaskIsActive on host-driven test");
- waitAndCheckLockedActivityIsResumed();
- checkLockedActivityIsRunning();
- }
-
/**
* On low-RAM devices, this test can take too long to finish, so the test runner can incorrectly
* assume it's finished. Therefore, only use it once in a given test.
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
index 048468c..72e8293 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
@@ -1226,9 +1226,6 @@
// Wait for the LockTask starting
waitForBroadcastIdle();
- // Make sure that the LockTaskUtilityActivityIfWhitelisted was started.
- executeDeviceTestMethod(".LockTaskHostDrivenTest", "testLockTaskIsActive");
-
// Try to open settings via adb
executeShellCommand("am start -a android.settings.SETTINGS");
diff --git a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageHostTest.java b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageHostTest.java
index 7475e74..08349a1 100644
--- a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageHostTest.java
+++ b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageHostTest.java
@@ -20,6 +20,7 @@
import android.platform.test.annotations.AppModeFull;
+import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.testtype.junit4.DeviceTestRunOptions;
@@ -459,6 +460,22 @@
runDeviceTest("testReadWriteFilesInOtherAppExternalDir");
}
+ @Test
+ public void testRenameFromShell() throws Exception {
+ final ITestDevice device = getDevice();
+ final boolean isAdbRoot = device.isAdbRoot() ? true : false;
+ try {
+ if (isAdbRoot) {
+ device.disableAdbRoot();
+ }
+ runDeviceTest("testRenameFromShell");
+ } finally {
+ if (isAdbRoot) {
+ device.enableAdbRoot();
+ }
+ }
+ }
+
private void grantPermissions(String... perms) throws Exception {
for (String perm : perms) {
executeShellCommand("pm grant android.scopedstorage.cts " + perm);
diff --git a/hostsidetests/scopedstorage/legacy/src/android/scopedstorage/cts/legacy/LegacyStorageTest.java b/hostsidetests/scopedstorage/legacy/src/android/scopedstorage/cts/legacy/LegacyStorageTest.java
index 2422f3b..4596cab 100644
--- a/hostsidetests/scopedstorage/legacy/src/android/scopedstorage/cts/legacy/LegacyStorageTest.java
+++ b/hostsidetests/scopedstorage/legacy/src/android/scopedstorage/cts/legacy/LegacyStorageTest.java
@@ -133,6 +133,7 @@
@After
public void teardown() throws Exception {
executeShellCommand("rm " + getShellFile());
+ MediaStore.scanFile(getContentResolver(), getShellFile());
}
/**
@@ -221,6 +222,7 @@
try {
executeShellCommand("touch " + existingFile);
+ MediaStore.scanFile(getContentResolver(), existingFile);
Os.open(existingFile.getPath(), OsConstants.O_RDONLY, /*mode*/ 0);
fail("Opening file for read expected to fail: " + existingFile);
} catch (ErrnoException expected) {
@@ -273,6 +275,7 @@
FileDescriptor fd = null;
try {
executeShellCommand("touch " + existingFile);
+ MediaStore.scanFile(getContentResolver(), existingFile);
fd = Os.open(existingFile.getPath(), OsConstants.O_RDONLY, /*mode*/ 0);
} finally {
if (fd != null) {
@@ -314,6 +317,7 @@
final File shellFile = getShellFile();
executeShellCommand("touch " + getShellFile());
+ MediaStore.scanFile(getContentResolver(), getShellFile());
// can list a non-media file created by other package.
assertThat(Arrays.asList(shellFile.getParentFile().list()))
.contains(shellFile.getName());
@@ -381,6 +385,7 @@
"LegacyFileAccessTest2");
try {
executeShellCommand("touch " + shellFile1);
+ MediaStore.scanFile(getContentResolver(), shellFile1);
// app can't rename shell file.
assertCantRenameFile(shellFile1, shellFile2);
// app can't move shell file to its media directory.
@@ -415,6 +420,7 @@
"LegacyFileAccessTest2");
try {
executeShellCommand("touch " + shellFile1);
+ MediaStore.scanFile(getContentResolver(), shellFile1);
// app can't rename shell file.
assertCantRenameFile(shellFile1, shellFile2);
// app can't move shell file to its media directory.
diff --git a/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java b/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
index 8f44bae..eb60460 100644
--- a/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
+++ b/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
@@ -781,6 +781,8 @@
} finally {
executeShellCommand("rm " + pdfFile.getAbsolutePath());
executeShellCommand("rm " + videoFile.getAbsolutePath());
+ MediaStore.scanFile(getContentResolver(), pdfFile);
+ MediaStore.scanFile(getContentResolver(), videoFile);
uninstallAppNoThrow(TEST_APP_A);
}
}
@@ -1387,6 +1389,7 @@
videoFile.delete();
topLevelVideoFile.delete();
executeShellCommand("rm " + musicFile.getAbsolutePath());
+ MediaStore.scanFile(getContentResolver(), musicFile);
denyAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
}
}
@@ -2097,11 +2100,13 @@
// Use shell to create root file because TEST_APP_A is in
// scoped storage.
executeShellCommand("touch " + shellPdfAtRoot.getAbsolutePath());
+ MediaStore.scanFile(getContentResolver(), shellPdfAtRoot);
assertFileAccess_existsOnly(shellPdfAtRoot);
} finally {
deleteFileAsNoThrow(TEST_APP_A, otherAppPdf.getAbsolutePath());
deleteFileAsNoThrow(TEST_APP_A, otherAppImage.getAbsolutePath());
executeShellCommand("rm " + shellPdfAtRoot.getAbsolutePath());
+ MediaStore.scanFile(getContentResolver(), shellPdfAtRoot);
myAppPdf.delete();
uninstallApp(TEST_APP_A);
}
@@ -2225,6 +2230,7 @@
installApp(TEST_APP_A);
assertCreateFilesAs(TEST_APP_A, otherAppImg, otherAppMusic, otherAppPdf);
executeShellCommand("touch " + otherTopLevelFile);
+ MediaStore.scanFile(getContentResolver(), otherTopLevelFile);
allowAppOpsToUid(Process.myUid(), OPSTR_MANAGE_EXTERNAL_STORAGE);
@@ -2240,6 +2246,7 @@
} finally {
denyAppOpsToUid(Process.myUid(), OPSTR_MANAGE_EXTERNAL_STORAGE);
executeShellCommand("rm " + otherTopLevelFile);
+ MediaStore.scanFile(getContentResolver(), otherTopLevelFile);
deleteFilesAs(TEST_APP_A, otherAppImg, otherAppMusic, otherAppPdf);
uninstallApp(TEST_APP_A);
}
@@ -2344,6 +2351,7 @@
assertThat(dirInDcim.exists() || dirInDcim.mkdir()).isTrue();
executeShellCommand("touch " + otherAppPdfFile1);
+ MediaStore.scanFile(getContentResolver(), otherAppPdfFile1);
installAppWithStoragePermissions(TEST_APP_A);
allowAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
@@ -2362,6 +2370,8 @@
} finally {
executeShellCommand("rm " + otherAppPdfFile1);
executeShellCommand("rm " + otherAppPdfFile2);
+ MediaStore.scanFile(getContentResolver(), otherAppPdfFile1);
+ MediaStore.scanFile(getContentResolver(), otherAppPdfFile2);
otherAppImageFile1.delete();
otherAppImageFile2.delete();
otherAppVideoFile1.delete();
@@ -2730,6 +2740,46 @@
}
}
+ @Test
+ public void testRenameFromShell() throws Exception {
+ final File imageFile = new File(getPicturesDir(), IMAGE_FILE_NAME);
+ final File dir = new File(getMoviesDir(), TEST_DIRECTORY_NAME);
+ final File renamedDir = new File(getMusicDir(), TEST_DIRECTORY_NAME);
+ final File renamedImageFile = new File(dir, IMAGE_FILE_NAME);
+ final File imageFileInRenamedDir = new File(renamedDir, IMAGE_FILE_NAME);
+ try {
+ assertTrue(imageFile.createNewFile());
+ assertThat(getFileRowIdFromDatabase(imageFile)).isNotEqualTo(-1);
+ if (!dir.exists()) {
+ assertThat(dir.mkdir()).isTrue();
+ }
+
+ final String renameFileCommand = String.format("mv %s %s",
+ imageFile.getAbsolutePath(), renamedImageFile.getAbsolutePath());
+ executeShellCommand(renameFileCommand);
+ assertFalse(imageFile.exists());
+ assertThat(getFileRowIdFromDatabase(imageFile)).isEqualTo(-1);
+ assertTrue(renamedImageFile.exists());
+ assertThat(getFileRowIdFromDatabase(renamedImageFile)).isNotEqualTo(-1);
+
+ final String renameDirectoryCommand = String.format("mv %s %s",
+ dir.getAbsolutePath(), renamedDir.getAbsolutePath());
+ executeShellCommand(renameDirectoryCommand);
+ assertFalse(dir.exists());
+ assertFalse(renamedImageFile.exists());
+ assertThat(getFileRowIdFromDatabase(renamedImageFile)).isEqualTo(-1);
+ assertTrue(renamedDir.exists());
+ assertTrue(imageFileInRenamedDir.exists());
+ assertThat(getFileRowIdFromDatabase(imageFileInRenamedDir)).isNotEqualTo(-1);
+ } finally {
+ imageFile.delete();
+ renamedImageFile.delete();
+ imageFileInRenamedDir.delete();
+ dir.delete();
+ renamedDir.delete();
+ }
+ }
+
/**
* Checks restrictions for opening pending and trashed files by different apps. Assumes that
* given {@code testApp} is already installed and has READ_EXTERNAL_STORAGE permission. This
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/MagnificationGestureHandlerTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/MagnificationGestureHandlerTest.java
index 8393012..c64eaa3 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/MagnificationGestureHandlerTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/MagnificationGestureHandlerTest.java
@@ -51,6 +51,7 @@
import android.graphics.PointF;
import android.platform.test.annotations.AppModeFull;
import android.provider.Settings;
+import android.view.ViewConfiguration;
import android.widget.TextView;
import androidx.test.InstrumentationRegistry;
@@ -105,7 +106,6 @@
@Before
public void setUp() throws Exception {
mInstrumentation = InstrumentationRegistry.getInstrumentation();
-
PackageManager pm = mInstrumentation.getContext().getPackageManager();
mHasTouchscreen = pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)
|| pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH);
@@ -179,7 +179,11 @@
@Test
public void testPanning() {
- if (!mHasTouchscreen) return;
+ //The minimum movement to transit to panningState.
+ final float minSwipeDistance = ViewConfiguration.get(
+ mInstrumentation.getContext()).getScaledTouchSlop();
+ final boolean screenBigEnough = mPan > minSwipeDistance;
+ if (!mHasTouchscreen || !screenBigEnough) return;
assertFalse(isZoomed());
setZoomByTripleTapping(true);
@@ -190,7 +194,8 @@
swipe(mTapLocation2, add(mTapLocation2, -mPan, 0)));
waitOn(mZoomLock,
- () -> (mCurrentZoomCenter.x - oldCenter.x >= mPan / mCurrentScale * 0.9));
+ () -> (mCurrentZoomCenter.x - oldCenter.x
+ >= (mPan - minSwipeDistance) / mCurrentScale * 0.9));
setZoomByTripleTapping(false);
}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
index 9224739..56d5240 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
@@ -280,7 +280,7 @@
*/
@Test
@AppModeFull
- public void testDoubleTapNoAccessibilityFocus_doesNotPerformClick() {
+ public void testDoubleTapNoFocus_doesNotPerformClick() {
if (!mHasTouchscreen || !mScreenBigEnough) return;
dispatch(doubleTap(mTapLocation));
mHoverListener.assertNonePropagated();
@@ -318,7 +318,7 @@
*/
@Test
@AppModeFull
- public void testDoubleTapAndHoldNoAccessibilityFocus_doesNotPerformLongClick() {
+ public void testDoubleTapAndHoldNoFocus_doesNotPerformLongClick() {
if (!mHasTouchscreen || !mScreenBigEnough) return;
dispatch(doubleTap(mTapLocation));
mHoverListener.assertNonePropagated();
@@ -358,6 +358,63 @@
}
/**
+ * Test the case where we double tap and no item has accessibility focus, so TouchExplorer sends
+ * touch events to the last touch-explored coordinates to simulate a click.
+ */
+ @Test
+ @AppModeFull
+ public void testDoubleTapNoAccessibilityFocus_sendsTouchEvents() {
+ if (!mHasTouchscreen || !mScreenBigEnough) return;
+ // Do a single tap so there is a valid last touch-explored location.
+ dispatch(click(mTapLocation));
+ mHoverListener.assertPropagated(ACTION_HOVER_ENTER, ACTION_HOVER_EXIT);
+ // We don't really care about these events but we need to make sure all the events we want
+ // to clear have arrived before we clear them.
+ mService.assertPropagated(
+ TYPE_TOUCH_INTERACTION_START,
+ TYPE_TOUCH_EXPLORATION_GESTURE_START,
+ TYPE_TOUCH_EXPLORATION_GESTURE_END,
+ TYPE_TOUCH_INTERACTION_END);
+ mService.clearEvents();
+ dispatch(doubleTap(mTapLocation));
+ mHoverListener.assertNonePropagated();
+ // The click gets delivered as a series of touch events.
+ mTouchListener.assertPropagated(ACTION_DOWN, ACTION_UP);
+ mService.assertPropagated(
+ TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END, TYPE_VIEW_CLICKED);
+ mClickListener.assertClicked(mView);
+ }
+
+ /**
+ * Test the case where we double tap and hold and no item has accessibility focus, so
+ * TouchExplorer sends touch events to the last touch-explored coordinates to simulate a long
+ * click.
+ */
+ @Test
+ @AppModeFull
+ public void testDoubleTapAndHoldNoAccessibilityFocus_sendsTouchEvents() {
+ if (!mHasTouchscreen || !mScreenBigEnough) return;
+ // Do a single tap so there is a valid last touch-explored location.
+ dispatch(click(mTapLocation));
+ mHoverListener.assertPropagated(ACTION_HOVER_ENTER, ACTION_HOVER_EXIT);
+ // We don't really care about these events but we need to make sure all the events we want
+ // to clear have arrived before we clear them.
+ mService.assertPropagated(
+ TYPE_TOUCH_INTERACTION_START,
+ TYPE_TOUCH_EXPLORATION_GESTURE_START,
+ TYPE_TOUCH_EXPLORATION_GESTURE_END,
+ TYPE_TOUCH_INTERACTION_END);
+ mService.clearEvents();
+ dispatch(doubleTapAndHold(mTapLocation));
+ mHoverListener.assertNonePropagated();
+ // The click gets delivered as a series of touch events.
+ mTouchListener.assertPropagated(ACTION_DOWN, ACTION_UP);
+ mService.assertPropagated(
+ TYPE_TOUCH_INTERACTION_START, TYPE_VIEW_LONG_CLICKED, TYPE_TOUCH_INTERACTION_END);
+ mLongClickListener.assertLongClicked(mView);
+ }
+
+ /**
* Test the case where we want to double tap using a second finger without triggering touch
* exploration.
*/
diff --git a/tests/app/AppExitTest/AndroidManifest.xml b/tests/app/AppExitTest/AndroidManifest.xml
index 4606ca5..64a1ab8 100644
--- a/tests/app/AppExitTest/AndroidManifest.xml
+++ b/tests/app/AppExitTest/AndroidManifest.xml
@@ -24,6 +24,10 @@
<application android:usesCleartextTraffic="true">
<uses-library android:name="android.test.runner" />
+ <service android:name="android.app.cts.MemoryConsumerService"
+ android:exported="true"
+ android:isolatedProcess="true">
+ </service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
diff --git a/tests/app/AppExitTest/src/android/app/cts/ActivityManagerAppExitInfoTest.java b/tests/app/AppExitTest/src/android/app/cts/ActivityManagerAppExitInfoTest.java
index bd9e5af..cbded8b 100644
--- a/tests/app/AppExitTest/src/android/app/cts/ActivityManagerAppExitInfoTest.java
+++ b/tests/app/AppExitTest/src/android/app/cts/ActivityManagerAppExitInfoTest.java
@@ -30,6 +30,7 @@
import android.externalservice.common.RunningServiceInfo;
import android.externalservice.common.ServiceMessages;
import android.os.AsyncTask;
+import android.os.Binder;
import android.os.Bundle;
import android.os.DropBoxManager;
import android.os.Handler;
@@ -44,12 +45,12 @@
import android.os.UserManager;
import android.provider.Settings;
import android.server.wm.settings.SettingsSession;
-import android.system.Os;
import android.system.OsConstants;
import android.test.InstrumentationTestCase;
import android.text.TextUtils;
import android.util.DebugUtils;
import android.util.Log;
+import android.util.Pair;
import com.android.compatibility.common.util.AmMonitor;
import com.android.compatibility.common.util.ShellIdentityUtils;
@@ -58,9 +59,7 @@
import com.android.internal.util.MemInfoReader;
import java.io.BufferedInputStream;
-import java.io.FileDescriptor;
import java.io.IOException;
-import java.nio.DirectByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
@@ -131,6 +130,8 @@
private UserHandle mOtherUserHandle;
private DropBoxManager.Entry mAnrEntry;
private SettingsSession<String> mDataAnrSettings;
+ private SettingsSession<String> mHiddenApiSettings;
+ private int mProcSeqNum;
@Override
protected void setUp() throws Exception {
@@ -154,6 +155,11 @@
Settings.Global.DROPBOX_TAG_PREFIX + "data_app_anr"),
Settings.Global::getString, Settings.Global::putString);
mDataAnrSettings.set("enabled");
+ mHiddenApiSettings = new SettingsSession<>(
+ Settings.Global.getUriFor(
+ Settings.Global.HIDDEN_API_BLACKLIST_EXEMPTIONS),
+ Settings.Global::getString, Settings.Global::putString);
+ mHiddenApiSettings.set("*");
}
private void handleMessagePid(Message msg) {
@@ -217,6 +223,9 @@
if (mDataAnrSettings != null) {
mDataAnrSettings.close();
}
+ if (mHiddenApiSettings != null) {
+ mHiddenApiSettings.close();
+ }
}
private int createUser(String name, boolean guest) throws Exception {
@@ -391,47 +400,37 @@
ApplicationExitInfo.REASON_EXIT_SELF, EXIT_CODE, null, now, now2);
}
- private List<ApplicationExitInfo> fillUpMemoryAndCheck(ArrayList<Long> addresses)
- throws Exception {
- List<ApplicationExitInfo> list = null;
- // Get the meminfo firstly
- MemInfoReader reader = new MemInfoReader();
- reader.readMemInfo();
+ private List<ServiceConnection> fillUpMemoryAndCheck(
+ final MemoryConsumerService.TestFuncInterface testFunc,
+ final List<ApplicationExitInfo> list) throws Exception {
+ final String procNamePrefix = "memconsumer_";
+ final ArrayList<ServiceConnection> memConsumers = new ArrayList<>();
+ Pair<IBinder, ServiceConnection> p = MemoryConsumerService.bindToService(
+ mContext, testFunc, procNamePrefix + mProcSeqNum++);
+ IBinder consumer = p.first;
+ memConsumers.add(p.second);
- long totalMb = (reader.getFreeSizeKb() + reader.getCachedSizeKb()) >> 10;
- final int pageSize = 4096;
- final int oneMb = 1024 * 1024;
+ while (list.size() == 0) {
+ // Get the meminfo firstly
+ MemInfoReader reader = new MemInfoReader();
+ reader.readMemInfo();
- // Create an empty fd -1
- FileDescriptor fd = new FileDescriptor();
-
- // Okay now start a loop to allocate 1MB each time and check if our process is gone.
- for (long i = 0; i < totalMb; i++) {
- long addr = Os.mmap(0, oneMb, OsConstants.PROT_WRITE,
- OsConstants.MAP_PRIVATE | OsConstants.MAP_ANONYMOUS, fd, 0);
- if (addr == 0) {
- break;
+ long totalMb = (reader.getFreeSizeKb() + reader.getCachedSizeKb()) >> 10;
+ if (!MemoryConsumerService.runOnce(consumer, totalMb) && list.size() == 0) {
+ // Need to create a new consumer (the present one might be running out of space)
+ p = MemoryConsumerService.bindToService(mContext, testFunc,
+ procNamePrefix + mProcSeqNum++);
+ consumer = p.first;
+ memConsumers.add(p.second);
}
- addresses.add(addr);
-
- // We don't have direct access to Memory.pokeByte() though
- DirectByteBuffer buf = new DirectByteBuffer(oneMb, addr, fd, null, false);
-
- // Dirt the buffer
- for (int j = 0; j < oneMb; j += pageSize) {
- buf.put(j, (byte) 0xf);
- }
-
- // Check if we could get the report
- list = ShellIdentityUtils.invokeMethodWithShellPermissions(
- STUB_PACKAGE_NAME, mStubPackagePid, 1,
- mActivityManager::getHistoricalProcessExitReasons,
- android.Manifest.permission.DUMP);
- if (list != null && list.size() == 1) {
+ // make sure we have cached process killed
+ String output = executeShellCmd("dumpsys activity lru");
+ if (output == null && output.indexOf(" cch+") == -1) {
break;
}
}
- return list;
+
+ return memConsumers;
}
public void testLmkdKill() throws Exception {
@@ -444,23 +443,32 @@
// Start a process and do nothing
startService(ACTION_FINISH, STUB_SERVICE_NAME, false, false);
- final int oneMb = 1024 * 1024;
- ArrayList<Long> addresses = new ArrayList<Long>();
- List<ApplicationExitInfo> list = fillUpMemoryAndCheck(addresses);
+ final ArrayList<IBinder> memConsumers = new ArrayList<>();
+ List<ApplicationExitInfo> list = new ArrayList<>();
+ final MemoryConsumerService.TestFuncInterface testFunc =
+ new MemoryConsumerService.TestFuncInterface(() -> {
+ final long token = Binder.clearCallingIdentity();
+ try {
+ List<ApplicationExitInfo> result =
+ ShellIdentityUtils.invokeMethodWithShellPermissions(
+ STUB_PACKAGE_NAME, mStubPackagePid, 1,
+ mActivityManager::getHistoricalProcessExitReasons,
+ android.Manifest.permission.DUMP);
+ if (result != null && result.size() == 1) {
+ list.add(result.get(0));
+ return true;
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ return false;
+ });
- while (list == null || list.size() == 0) {
- // make sure we have cached process killed
- String output = executeShellCmd("dumpsys activity lru");
- if (output == null && output.indexOf(" cch+") == -1) {
- break;
- }
- // try again since the system might have reclaimed some ram
- list = fillUpMemoryAndCheck(addresses);
- }
+ List<ServiceConnection> services = fillUpMemoryAndCheck(testFunc, list);
- // Free all the buffers firstly
- for (int i = addresses.size() - 1; i >= 0; i--) {
- Os.munmap(addresses.get(i), oneMb);
+ // Unbind all the service connections firstly
+ for (int i = services.size() - 1; i >= 0; i--) {
+ mContext.unbindService(services.get(i));
}
long now2 = System.currentTimeMillis();
diff --git a/tests/app/AppExitTest/src/android/app/cts/MemoryConsumerService.java b/tests/app/AppExitTest/src/android/app/cts/MemoryConsumerService.java
new file mode 100644
index 0000000..cca0fac
--- /dev/null
+++ b/tests/app/AppExitTest/src/android/app/cts/MemoryConsumerService.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2020 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.app.cts;
+
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.AsyncTask;
+import android.os.Binder;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+import android.util.Log;
+import android.util.Pair;
+
+import java.io.FileDescriptor;
+import java.nio.DirectByteBuffer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BooleanSupplier;
+
+public class MemoryConsumerService extends Service {
+ private static final String TAG = MemoryConsumerService.class.getSimpleName();
+
+ private static final int ACTION_RUN_ONCE = IBinder.FIRST_CALL_TRANSACTION;
+ private static final String EXTRA_BUNDLE = "bundle";
+ private static final String EXTRA_TEST_FUNC = "test_func";
+
+ private IBinder mTestFunc;
+
+ private IBinder mBinder = new Binder() {
+ @Override
+ protected boolean onTransact(int code, Parcel data, Parcel reply, int flags)
+ throws RemoteException {
+ switch (code) {
+ case ACTION_RUN_ONCE:
+ reply.writeBoolean(fillUpMemoryAndCheck(data.readLong(), mTestFunc));
+ return true;
+ default:
+ return false;
+ }
+ }
+ };
+
+ static class TestFuncInterface extends Binder {
+ static final int ACTION_TEST = IBinder.FIRST_CALL_TRANSACTION;
+
+ private final BooleanSupplier mTestFunc;
+
+ TestFuncInterface(final BooleanSupplier testFunc) {
+ mTestFunc = testFunc;
+ }
+
+ @Override
+ protected boolean onTransact(int code, Parcel data, Parcel reply, int flags)
+ throws RemoteException {
+ switch (code) {
+ case ACTION_TEST:
+ reply.writeBoolean(mTestFunc.getAsBoolean());
+ return true;
+ default:
+ return false;
+ }
+ }
+ }
+
+ private boolean fillUpMemoryAndCheck(final long totalMb, final IBinder testFunc) {
+ final int pageSize = 4096;
+ final int oneMb = 1024 * 1024;
+
+ // Create an empty fd -1
+ FileDescriptor fd = new FileDescriptor();
+
+ // Okay now start a loop to allocate 1MB each time and check if our process is gone.
+ for (long i = 0; i < totalMb; i++) {
+ long addr = 0L;
+ try {
+ addr = Os.mmap(0, oneMb, OsConstants.PROT_WRITE,
+ OsConstants.MAP_PRIVATE | OsConstants.MAP_ANONYMOUS, fd, 0);
+ } catch (ErrnoException e) {
+ Log.d(TAG, "mmap returns " + e.errno);
+ if (e.errno == OsConstants.ENOMEM) {
+ // Running out of address space?
+ return false;
+ }
+ }
+ if (addr == 0) {
+ return false;
+ }
+
+ // We don't have direct access to Memory.pokeByte() though
+ DirectByteBuffer buf = new DirectByteBuffer(oneMb, addr, fd, null, false);
+
+ // Dirt the buffer
+ for (int j = 0; j < oneMb; j += pageSize) {
+ buf.put(j, (byte) 0xf);
+ }
+
+ // Test to see if we could stop
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ try {
+ testFunc.transact(TestFuncInterface.ACTION_TEST, data, reply, 0);
+ if (reply.readBoolean()) {
+ break;
+ }
+ } catch (RemoteException e) {
+ // Ignore
+ } finally {
+ data.recycle();
+ reply.recycle();
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ final Bundle bundle = intent.getBundleExtra(EXTRA_BUNDLE);
+ mTestFunc = bundle.getBinder(EXTRA_TEST_FUNC);
+ return mBinder;
+ }
+
+ static Pair<IBinder, ServiceConnection> bindToService(final Context context,
+ final TestFuncInterface testFunc, String instanceName) throws Exception {
+ final Intent intent = new Intent();
+ intent.setClass(context, MemoryConsumerService.class);
+ final Bundle bundle = new Bundle();
+ bundle.putBinder(EXTRA_TEST_FUNC, testFunc);
+ intent.putExtra(EXTRA_BUNDLE, bundle);
+ final String keyIBinder = "ibinder";
+ final Bundle holder = new Bundle();
+ final CountDownLatch latch = new CountDownLatch(1);
+ final ServiceConnection conn = new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ holder.putBinder(keyIBinder, service);
+ latch.countDown();
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ }
+ };
+ context.bindIsolatedService(intent, Context.BIND_AUTO_CREATE,
+ instanceName, AsyncTask.THREAD_POOL_EXECUTOR, conn);
+ latch.await(10_000, TimeUnit.MILLISECONDS);
+ return new Pair<>(holder.getBinder(keyIBinder), conn);
+ }
+
+ static boolean runOnce(final IBinder binder, final long totalMb) {
+ final Parcel data = Parcel.obtain();
+ final Parcel reply = Parcel.obtain();
+
+ try {
+ data.writeLong(totalMb);
+ binder.transact(ACTION_RUN_ONCE, data, reply, 0);
+ return reply.readBoolean();
+ } catch (RemoteException e) {
+ return false;
+ } finally {
+ data.recycle();
+ reply.recycle();
+ }
+ }
+}
diff --git a/tests/app/src/android/app/cts/UiModeManagerTest.java b/tests/app/src/android/app/cts/UiModeManagerTest.java
index 7174f36..e877350 100644
--- a/tests/app/src/android/app/cts/UiModeManagerTest.java
+++ b/tests/app/src/android/app/cts/UiModeManagerTest.java
@@ -124,6 +124,10 @@
}
public void testNightModeAutoNotPersistedCarMode() {
+ if (mUiModeManager.isNightModeLocked()) {
+ return;
+ }
+
// Reset the mode to no if it is set to another value
setNightMode(UiModeManager.MODE_NIGHT_NO);
mUiModeManager.enableCarMode(0);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/SettingsIntentTest.java b/tests/autofillservice/src/android/autofillservice/cts/SettingsIntentTest.java
index 22ba3b9..54f391b 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/SettingsIntentTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/SettingsIntentTest.java
@@ -26,6 +26,8 @@
import android.provider.Settings;
import android.support.test.uiautomator.UiObject2;
+import com.android.compatibility.common.util.FeatureUtil;
+
import org.junit.After;
import org.junit.Test;
@@ -51,8 +53,12 @@
@After
public void killSettings() {
- // Make sure there's no Settings activity left , as it could fail future tests.
- runShellCommand("am force-stop com.android.settings");
+ // Make sure there's no Settings activity left, as it could fail future tests.
+ if (FeatureUtil.isAutomotive()) {
+ runShellCommand("am force-stop com.android.car.settings");
+ } else {
+ runShellCommand("am force-stop com.android.settings");
+ }
}
@Test
@@ -65,6 +71,7 @@
// Asserts services are shown.
mUiBot.assertShownByText(InstrumentedAutoFillService.sServiceLabel);
mUiBot.assertShownByText(InstrumentedAutoFillServiceCompatMode.sServiceLabel);
+ mUiBot.scrollToTextObject(NoOpAutofillService.SERVICE_LABEL);
mUiBot.assertShownByText(NoOpAutofillService.SERVICE_LABEL);
mUiBot.assertNotShowingForSure(BadAutofillService.SERVICE_LABEL);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
index f67bd5c..fb878d3 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
@@ -1812,7 +1812,7 @@
// Tapping URLSpan.
final URLSpan span = mUiBot.findFirstUrlSpanWithText("Here is URLSpan");
- span.onClick(/* unused= */ null);
+ mActivity.syncRunOnUiThread(() -> span.onClick(/* unused= */ null));
// Waits for the save UI hided
mUiBot.waitForIdle();
diff --git a/tests/autofillservice/src/android/autofillservice/cts/UiBot.java b/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
index 8babc6c..88173d3 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
@@ -55,6 +55,9 @@
import android.support.test.uiautomator.SearchCondition;
import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiScrollable;
+import android.support.test.uiautomator.UiSelector;
import android.support.test.uiautomator.Until;
import android.text.Html;
import android.text.Spanned;
@@ -1246,4 +1249,15 @@
.getSpans(0, accessibilityTextWithSpan.length(), URLSpan.class);
return spans[0];
}
+
+ public boolean scrollToTextObject(String text) {
+ UiScrollable scroller = new UiScrollable(new UiSelector().scrollable(true));
+ try {
+ // Swipe far away from the edges to avoid triggering navigation gestures
+ scroller.setSwipeDeadZonePercentage(0.25);
+ return scroller.scrollTextIntoView(text);
+ } catch (UiObjectNotFoundException e) {
+ return false;
+ }
+ }
}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
index 4c37a3e..3ac15bb 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
@@ -570,7 +570,6 @@
}
@Test
- @FlakyTest(bugId=159062106)
public void testDisallowMultipleTasksInPinnedStack() throws Exception {
// Launch a test activity so that we have multiple fullscreen tasks
launchActivity(TEST_ACTIVITY);
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationSynchronicityTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationSynchronicityTests.java
index d4e6472..f51708f 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationSynchronicityTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationSynchronicityTests.java
@@ -20,6 +20,7 @@
import static android.server.wm.WindowInsetsAnimationUtils.requestControlThenTransitionToVisibility;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.WindowInsets.Type.ime;
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN;
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
@@ -43,6 +44,7 @@
import android.view.WindowInsetsAnimation;
import android.view.WindowInsetsAnimation.Callback;
import android.view.WindowInsetsController;
+import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.FrameLayout;
@@ -136,8 +138,10 @@
super.onCreate(savedInstanceState);
getWindow().requestFeature(Window.FEATURE_NO_TITLE);
getWindow().setDecorFitsSystemWindows(false);
+ getWindow().setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN);
mTestView = new TestView(this);
mEditText = new EditText(this);
+ mEditText.setImeOptions(EditorInfo.IME_FLAG_NO_FULLSCREEN);
mTestView.addView(mEditText);
mTestView.mEvaluator = () -> {
if (mEvaluator != null) {
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEventStreamTestUtils.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEventStreamTestUtils.java
index f08633f..1b71ff0 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEventStreamTestUtils.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEventStreamTestUtils.java
@@ -340,4 +340,21 @@
throw new RuntimeException("notExpectEvent failed: " + stream.dump(), e);
}
}
+
+ /**
+ * Clear all events with {@code eventName} in given {@code stream} and returns a forked
+ * {@link ImeEventStream} without events with {@code eventName}.
+ * <p>It is used to make sure previous events influence the test. </p>
+ *
+ * @param stream {@link ImeEventStream} to be cleared
+ * @param eventName The targeted cleared event name
+ * @return A forked {@link ImeEventStream} without event with {@code eventName}
+ */
+ public static ImeEventStream clearAllEvents(@NonNull ImeEventStream stream,
+ @NonNull String eventName) {
+ while (stream.seekToFirst(event -> eventName.equals(event.getEventName())).isPresent()) {
+ stream.skip(1);
+ }
+ return stream.copy();
+ }
}
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeSettings.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeSettings.java
index 917f7b3..6731e85 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeSettings.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeSettings.java
@@ -52,6 +52,7 @@
private static final String INLINE_SUGGESTIONS_ENABLED = "InlineSuggestionsEnabled";
private static final String INLINE_SUGGESTION_VIEW_CONTENT_DESC =
"InlineSuggestionViewContentDesc";
+ private static final String STRICT_MODE_ENABLED = "StrictModeEnabled";
@NonNull
private final PersistableBundle mBundle;
@@ -127,6 +128,10 @@
return mBundle.getString(INLINE_SUGGESTION_VIEW_CONTENT_DESC, defaultValue);
}
+ public boolean isStrictModeEnabled() {
+ return mBundle.getBoolean(STRICT_MODE_ENABLED, false);
+ }
+
static Bundle serializeToBundle(@NonNull String eventCallbackActionName,
@Nullable Builder builder) {
final Bundle result = new Bundle();
@@ -280,5 +285,10 @@
return this;
}
+ /** Sets whether to enable {@link android.os.StrictMode} or not. */
+ public Builder setStrictModeEnabled(boolean enabled) {
+ mBundle.putBoolean(STRICT_MODE_ENABLED, enabled);
+ return this;
+ }
}
}
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/MockIme.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/MockIme.java
index b0c66cf..3acf57b 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/MockIme.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/MockIme.java
@@ -36,6 +36,7 @@
import android.os.Looper;
import android.os.Process;
import android.os.ResultReceiver;
+import android.os.StrictMode;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
@@ -44,6 +45,7 @@
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
+import android.view.ViewConfiguration;
import android.view.Window;
import android.view.WindowInsets;
import android.view.WindowManager;
@@ -59,9 +61,9 @@
import android.view.inputmethod.InputContentInfo;
import android.view.inputmethod.InputMethod;
import android.widget.FrameLayout;
+import android.widget.HorizontalScrollView;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import android.widget.HorizontalScrollView;
import android.widget.TextView;
import android.widget.inline.InlinePresentationSpec;
@@ -288,8 +290,7 @@
return ImeEvent.RETURN_VALUE_UNAVAILABLE;
}
case "getDisplayId":
- return getSystemService(WindowManager.class)
- .getDefaultDisplay().getDisplayId();
+ return getDisplay().getDisplayId();
case "verifyLayoutInflaterContext":
return getLayoutInflater().getContext() == this;
case "setHeight":
@@ -299,6 +300,17 @@
case "setInlineSuggestionsExtras":
mInlineSuggestionsExtras = command.getExtras();
return ImeEvent.RETURN_VALUE_UNAVAILABLE;
+ case "verifyGetDisplay":
+ Context configContext = createConfigurationContext(new Configuration());
+ return getDisplay() != null && configContext.getDisplay() != null;
+ case "verifyGetWindowManager":
+ configContext = createConfigurationContext(new Configuration());
+ return getSystemService(WindowManager.class) != null
+ && configContext.getSystemService(WindowManager.class) != null;
+ case "verifyGetViewConfiguration":
+ configContext = createConfigurationContext(new Configuration());
+ return ViewConfiguration.get(this) != null
+ && ViewConfiguration.get(configContext) != null;
}
}
return ImeEvent.RETURN_VALUE_UNAVAILABLE;
@@ -368,6 +380,16 @@
mClientPackageName.set(mSettings.getClientPackageName());
mImeEventActionName.set(mSettings.getEventCallbackActionName());
+ // TODO(b/159593676): consider to detect more violations
+ if (mSettings.isStrictModeEnabled()) {
+ StrictMode.setVmPolicy(
+ new StrictMode.VmPolicy.Builder()
+ .detectIncorrectContextUse()
+ .penaltyLog()
+ .build());
+ StrictMode.setViolationLogger(info -> getTracer().onStrictModeViolated(() -> {}));
+ }
+
getTracer().onCreate(() -> {
super.onCreate();
mHandlerThread.start();
@@ -1040,5 +1062,10 @@
return recordEventInternal("onInlineSuggestionsResponse", supplier::getAsBoolean,
arguments);
}
+
+ void onStrictModeViolated(@NonNull Runnable runnable) {
+ final Bundle arguments = new Bundle();
+ recordEventInternal("onStrictModeViolated", runnable, arguments);
+ }
}
}
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/MockImeSession.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/MockImeSession.java
index 699da4c..5a7d94a 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/MockImeSession.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/MockImeSession.java
@@ -1006,4 +1006,19 @@
public ImeCommand callSetInlineSuggestionsExtras(@NonNull Bundle bundle) {
return callCommandInternal("setInlineSuggestionsExtras", bundle);
}
+
+ @NonNull
+ public ImeCommand callVerifyGetDisplay() {
+ return callCommandInternal("verifyGetDisplay", new Bundle());
+ }
+
+ @NonNull
+ public ImeCommand callVerifyGetWindowManager() {
+ return callCommandInternal("verifyGetWindowManager", new Bundle());
+ }
+
+ @NonNull
+ public ImeCommand callVerifyGetViewConfiguration() {
+ return callCommandInternal("verifyGetViewConfiguration", new Bundle());
+ }
}
diff --git a/tests/tests/content/src/android/content/pm/cts/FeatureTest.java b/tests/tests/content/src/android/content/pm/cts/FeatureTest.java
index 99d7268..beab1c4 100644
--- a/tests/tests/content/src/android/content/pm/cts/FeatureTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/FeatureTest.java
@@ -76,6 +76,11 @@
return;
}
+ // Skip the tests for low-RAM devices
+ if (mActivityManager.isLowRamDevice()) {
+ return;
+ }
+
fail("Device should support managed profiles, but "
+ PackageManager.FEATURE_MANAGED_USERS + " is not enabled");
}
diff --git a/tests/tests/media/src/android/media/cts/MediaRouter2Test.java b/tests/tests/media/src/android/media/cts/MediaRouter2Test.java
index 3f6e690..48466d5 100644
--- a/tests/tests/media/src/android/media/cts/MediaRouter2Test.java
+++ b/tests/tests/media/src/android/media/cts/MediaRouter2Test.java
@@ -285,6 +285,8 @@
final CountDownLatch successLatch2 = new CountDownLatch(1);
final CountDownLatch failureLatch = new CountDownLatch(1);
final CountDownLatch stopLatch = new CountDownLatch(1);
+ final CountDownLatch onReleaseSessionLatch = new CountDownLatch(1);
+
final List<RoutingController> createdControllers = new ArrayList<>();
// Create session with this route
@@ -311,6 +313,16 @@
}
};
+ StubMediaRoute2ProviderService service = mService;
+ if (service != null) {
+ service.setProxy(new StubMediaRoute2ProviderService.Proxy() {
+ @Override
+ public void onReleaseSession(long requestId, String sessionId) {
+ onReleaseSessionLatch.countDown();
+ }
+ });
+ }
+
Map<String, MediaRoute2Info> routes = waitAndGetRoutes(sampleRouteType);
MediaRoute2Info route1 = routes.get(ROUTE_ID1);
MediaRoute2Info route2 = routes.get(ROUTE_ID2);
@@ -337,15 +349,19 @@
RoutingController controller1 = createdControllers.get(0);
RoutingController controller2 = createdControllers.get(1);
- // The first controller is expected to be released.
- assertTrue(controller1.isReleased());
-
assertNotEquals(controller1.getId(), controller2.getId());
assertTrue(createRouteMap(controller1.getSelectedRoutes()).containsKey(
ROUTE_ID1));
assertTrue(createRouteMap(controller2.getSelectedRoutes()).containsKey(
ROUTE_ID2));
+ // Transferred controllers shouldn't be obtainable.
+ assertFalse(mRouter2.getControllers().contains(controller1));
+ assertTrue(mRouter2.getControllers().contains(controller2));
+
+ // Should be able to release transferred controllers.
+ controller1.release();
+ assertTrue(onReleaseSessionLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
} finally {
releaseControllers(createdControllers);
mRouter2.unregisterRouteCallback(routeCallback);
diff --git a/tests/tests/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java b/tests/tests/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
index a19ba64..34ca9a4 100644
--- a/tests/tests/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
+++ b/tests/tests/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
@@ -80,6 +80,7 @@
import com.android.testutils.ArrayTrackRecord;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import com.android.testutils.DevSdkIgnoreRunner;
+import com.android.testutils.SkipPresubmit;
import org.junit.After;
import org.junit.Before;
@@ -189,6 +190,7 @@
cb.assertNoCallback();
}
+ @SkipPresubmit(reason = "Flaky: b/159718782; add to presubmit after fixing")
@Test
public void testRegisterCallbackWithCarrierPrivileges() throws Exception {
assumeTrue(mPackageManager.hasSystemFeature(FEATURE_TELEPHONY));
diff --git a/tests/tests/net/src/android/net/cts/DnsResolverTest.java b/tests/tests/net/src/android/net/cts/DnsResolverTest.java
index e6f75c3..4acbbcf 100644
--- a/tests/tests/net/src/android/net/cts/DnsResolverTest.java
+++ b/tests/tests/net/src/android/net/cts/DnsResolverTest.java
@@ -47,6 +47,7 @@
import android.util.Log;
import com.android.net.module.util.DnsPacket;
+import com.android.testutils.SkipPresubmit;
import java.net.Inet4Address;
import java.net.Inet6Address;
@@ -585,6 +586,7 @@
doTestContinuousQueries(mExecutor);
}
+ @SkipPresubmit(reason = "Flaky: b/159762682; add to presubmit after fixing")
public void testContinuousQueriesInline() throws Exception {
doTestContinuousQueries(mExecutorInline);
}
diff --git a/tests/tests/os/Android.bp b/tests/tests/os/Android.bp
index b118392..e04630b 100644
--- a/tests/tests/os/Android.bp
+++ b/tests/tests/os/Android.bp
@@ -26,6 +26,7 @@
"truth-prebuilt",
"guava",
"junit",
+ "CtsMockInputMethodLib"
],
jni_uses_platform_apis: true,
jni_libs: [
diff --git a/tests/tests/os/CtsOsTestCases.xml b/tests/tests/os/CtsOsTestCases.xml
index 3718c59..7ce85d6 100644
--- a/tests/tests/os/CtsOsTestCases.xml
+++ b/tests/tests/os/CtsOsTestCases.xml
@@ -22,6 +22,15 @@
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsOsTestCases.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="force-install-mode" value="FULL"/>
+ <option name="test-file-name" value="CtsMockInputMethod.apk" />
+ </target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="screen-always-on" value="on" />
+ </target_preparer>
+
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="android.os.cts" />
<option name="runtime-hint" value="3m15s" />
diff --git a/tests/tests/os/src/android/os/cts/SimpleTestActivity.java b/tests/tests/os/src/android/os/cts/SimpleTestActivity.java
index 4242315..22c706f 100644
--- a/tests/tests/os/src/android/os/cts/SimpleTestActivity.java
+++ b/tests/tests/os/src/android/os/cts/SimpleTestActivity.java
@@ -16,7 +16,30 @@
package android.os.cts;
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE;
+
import android.app.Activity;
+import android.os.Bundle;
+import android.widget.EditText;
+import android.widget.LinearLayout;
public class SimpleTestActivity extends Activity {
+ private EditText mEditText;
+
+ @Override
+ protected void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ mEditText = new EditText(this);
+ final LinearLayout layout = new LinearLayout(this);
+ layout.setOrientation(LinearLayout.VERTICAL);
+ layout.addView(mEditText);
+ setContentView(layout);
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ getWindow().setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+ mEditText.requestFocus();
+ }
}
\ No newline at end of file
diff --git a/tests/tests/os/src/android/os/cts/StrictModeTest.java b/tests/tests/os/src/android/os/cts/StrictModeTest.java
index 8ed37ca..b1023f6 100644
--- a/tests/tests/os/src/android/os/cts/StrictModeTest.java
+++ b/tests/tests/os/src/android/os/cts/StrictModeTest.java
@@ -17,9 +17,15 @@
package android.os.cts;
import static android.content.Context.WINDOW_SERVICE;
+import static android.content.pm.PackageManager.FEATURE_INPUT_METHODS;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.clearAllEvents;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectCommand;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.notExpectEvent;
+
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
@@ -32,7 +38,7 @@
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.pm.PackageManager;
-import android.content.res.Resources;
+import android.content.res.Configuration;
import android.hardware.display.DisplayManager;
import android.inputmethodservice.InputMethodService;
import android.net.TrafficStats;
@@ -63,10 +69,16 @@
import android.view.ViewConfiguration;
import android.view.WindowManager;
+import androidx.annotation.IntDef;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
+import com.android.cts.mockime.ImeEvent;
+import com.android.cts.mockime.ImeEventStream;
+import com.android.cts.mockime.ImeSettings;
+import com.android.cts.mockime.MockImeSession;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -78,6 +90,8 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.net.HttpURLConnection;
import java.net.Socket;
import java.net.URL;
@@ -96,10 +110,49 @@
public class StrictModeTest {
private static final String TAG = "StrictModeTest";
private static final String REMOTE_SERVICE_ACTION = "android.app.REMOTESERVICE";
+ private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(10); // 10 seconds
+ private static final long NOT_EXPECT_TIMEOUT = TimeUnit.SECONDS.toMillis(2);
private StrictMode.ThreadPolicy mThreadPolicy;
private StrictMode.VmPolicy mVmPolicy;
+ /**
+ * Verify mode to verifying if APIs violates incorrect context violation.
+ *
+ * @see #VERIFY_MODE_GET_DISPLAY
+ * @see #VERIFY_MODE_GET_WINDOW_MANAGER
+ * @see #VERIFY_MODE_GET_VIEW_CONFIGURATION
+ */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(flag = true, value = {
+ VERIFY_MODE_GET_DISPLAY,
+ VERIFY_MODE_GET_WINDOW_MANAGER,
+ VERIFY_MODE_GET_VIEW_CONFIGURATION,
+ })
+ private @interface VerifyMode {}
+
+ /**
+ * Verifies if {@link Context#getDisplay} from {@link InputMethodService} and context created
+ * from {@link InputMethodService#createConfigurationContext(Configuration)} violates
+ * incorrect context violation.
+ */
+ private static final int VERIFY_MODE_GET_DISPLAY = 1;
+ /**
+ * Verifies if get {@link android.view.WindowManager} from {@link InputMethodService} and
+ * context created from {@link InputMethodService#createConfigurationContext(Configuration)}
+ * violates incorrect context violation.
+ *
+ * @see Context#getSystemService(String)
+ * @see Context#getSystemService(Class)
+ */
+ private static final int VERIFY_MODE_GET_WINDOW_MANAGER = 2;
+ /**
+ * Verifies if passing {@link InputMethodService} and context created
+ * from {@link InputMethodService#createConfigurationContext(Configuration)} to
+ * {@link android.view.ViewConfiguration#get(Context)} violates incorrect context violation.
+ */
+ private static final int VERIFY_MODE_GET_VIEW_CONFIGURATION = 3;
+
private Context getContext() {
return ApplicationProvider.getApplicationContext();
}
@@ -647,6 +700,9 @@
final Activity activity = InstrumentationRegistry.getInstrumentation()
.startActivitySync(intent);
assertNoViolation(() -> activity.getSystemService(WINDOW_SERVICE));
+
+ // TODO(b/159593676): move the logic to CtsInputMethodTestCases
+ verifyIms(VERIFY_MODE_GET_WINDOW_MANAGER);
}
@Test
@@ -669,10 +725,13 @@
Intent intent = new Intent(getContext(), SimpleTestActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
final Activity activity = InstrumentationRegistry.getInstrumentation()
.startActivitySync(intent);
assertNoViolation(() -> activity.getDisplay());
+ // TODO(b/159593676): move the logic to CtsInputMethodTestCases
+ verifyIms(VERIFY_MODE_GET_DISPLAY);
try {
getContext().getApplicationContext().getDisplay();
} catch (UnsupportedOperationException e) {
@@ -691,14 +750,14 @@
final Context baseContext = getContext();
assertViolation(
- "Tried to access UI constants from a non-visual Context.",
+ "Tried to access UI constants from a non-visual Context:",
() -> ViewConfiguration.get(baseContext));
final Display display = baseContext.getSystemService(DisplayManager.class)
.getDisplay(DEFAULT_DISPLAY);
final Context displayContext = baseContext.createDisplayContext(display);
assertViolation(
- "Tried to access UI constants from a non-visual Context.",
+ "Tried to access UI constants from a non-visual Context:",
() -> ViewConfiguration.get(displayContext));
final Context windowContext =
@@ -711,14 +770,55 @@
.startActivitySync(intent);
assertNoViolation(() -> ViewConfiguration.get(activity));
- final TestInputMethodService ims = new TestInputMethodService(getContext());
- assertNoViolation(() -> ViewConfiguration.get(ims));
+ // TODO(b/159593676): move the logic to CtsInputMethodTestCases
+ verifyIms(VERIFY_MODE_GET_VIEW_CONFIGURATION);
}
- private static class TestInputMethodService extends InputMethodService {
- private TestInputMethodService(Context baseContext) {
- attachBaseContext(baseContext);
+ // TODO(b/159593676): move the logic to CtsInputMethodTestCases
+ /**
+ * Verify if APIs violates incorrect context violations by {@code mode}.
+ *
+ * @see VerifyMode
+ */
+ private void verifyIms(@VerifyMode int mode) throws Exception {
+ // If devices do not support installable IMEs, finish the test gracefully. We don't use
+ // assumeTrue here because we do pass some cases, so showing "pass" instead of "skip" makes
+ // sense here.
+ if (!supportsInstallableIme()) {
+ return;
}
+
+ try (final MockImeSession imeSession = MockImeSession.create(getContext(),
+ InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+ new ImeSettings.Builder().setStrictModeEnabled(true))) {
+ final ImeEventStream stream = imeSession.openEventStream();
+ expectEvent(stream, event -> "onStartInput".equals(event.getEventName()), TIMEOUT);
+ final ImeEventStream forkedStream = clearAllEvents(stream, "onStrictModeViolated");
+ final ImeEvent imeEvent;
+ switch (mode) {
+ case VERIFY_MODE_GET_DISPLAY:
+ imeEvent = expectCommand(forkedStream, imeSession.callVerifyGetDisplay(),
+ TIMEOUT);
+ break;
+ case VERIFY_MODE_GET_WINDOW_MANAGER:
+ imeEvent = expectCommand(forkedStream, imeSession.callVerifyGetWindowManager(),
+ TIMEOUT);
+ break;
+ case VERIFY_MODE_GET_VIEW_CONFIGURATION:
+ imeEvent = expectCommand(forkedStream,
+ imeSession.callVerifyGetViewConfiguration(), TIMEOUT);
+ break;
+ default:
+ imeEvent = null;
+ }
+ assertTrue(imeEvent.getReturnBooleanValue());
+ notExpectEvent(stream, event -> "onStrictModeViolated".equals(event.getEventName()),
+ NOT_EXPECT_TIMEOUT);
+ }
+ }
+
+ private boolean supportsInstallableIme() {
+ return getContext().getPackageManager().hasSystemFeature(FEATURE_INPUT_METHODS);
}
private static void runWithRemoteServiceBound(Context context, Consumer<ISecondary> consumer)
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/ConcurrencyTest.java b/tests/tests/wifi/src/android/net/wifi/cts/ConcurrencyTest.java
index 76085fa..ced02b8 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/ConcurrencyTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/ConcurrencyTest.java
@@ -127,6 +127,8 @@
mMySync.pendingSync.set(MySync.NETWORK_INFO);
mMySync.expectedNetworkInfo = (NetworkInfo) intent.getExtra(
WifiP2pManager.EXTRA_NETWORK_INFO, null);
+ Log.d(TAG, "Get WIFI_P2P_CONNECTION_CHANGED_ACTION: "
+ + mMySync.expectedNetworkInfo);
mMySync.notify();
}
}
@@ -520,6 +522,10 @@
mWifiP2pManager.removeGroup(mWifiP2pChannel, mActionListener);
assertTrue(waitForServiceResponse(mMyResponse));
assertTrue(mMyResponse.success);
+ assertTrue(waitForBroadcasts(MySync.NETWORK_INFO));
+ assertNotNull(mMySync.expectedNetworkInfo);
+ assertEquals(NetworkInfo.DetailedState.DISCONNECTED,
+ mMySync.expectedNetworkInfo.getDetailedState());
}
private String getDeviceName() {
@@ -604,6 +610,10 @@
mWifiP2pManager.removeGroup(mWifiP2pChannel, mActionListener);
assertTrue(waitForServiceResponse(mMyResponse));
assertTrue(mMyResponse.success);
+ assertTrue(waitForBroadcasts(MySync.NETWORK_INFO));
+ assertNotNull(mMySync.expectedNetworkInfo);
+ assertEquals(NetworkInfo.DetailedState.DISCONNECTED,
+ mMySync.expectedNetworkInfo.getDetailedState());
WifiP2pGroupList persistentGroups = getPersistentGroups();
assertNotNull(persistentGroups);
@@ -636,6 +646,10 @@
mWifiP2pManager.removeGroup(mWifiP2pChannel, mActionListener);
assertTrue(waitForServiceResponse(mMyResponse));
assertTrue(mMyResponse.success);
+ assertTrue(waitForBroadcasts(MySync.NETWORK_INFO));
+ assertNotNull(mMySync.expectedNetworkInfo);
+ assertEquals(NetworkInfo.DetailedState.DISCONNECTED,
+ mMySync.expectedNetworkInfo.getDetailedState());
resetResponse(mMyResponse);
ShellIdentityUtils.invokeWithShellPermissions(() -> {