Merge "Remove hosttestlib" am: 63deaadeaf am: d5c0944852 am: a59fd70be2 am: 5676f4ff10 am: 3511743aab
Original change: https://android-review.googlesource.com/c/platform/cts/+/1359763
Change-Id: Ic63d3c396802b2ccfc9102b6509f757ecd157a18
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..03af56d
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,13 @@
+BasedOnStyle: Google
+
+AccessModifierOffset: -4
+AlignOperands: false
+AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakBeforeMultilineStrings: false
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+ConstructorInitializerIndentWidth: 6
+ContinuationIndentWidth: 8
+IndentWidth: 4
+PenaltyBreakBeforeFirstCallParameter: 100000
+SpacesBeforeTrailingComments: 1
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 7b9c427..d0e9978 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -6,6 +6,7 @@
clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
hostsidetests
tests/tests/binder_ndk
+ tests/tests/view/jni
[Hook Scripts]
checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 167b6c8..1c12dbb 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -110,6 +110,7 @@
<activity android:name=".admin.PolicySerializationTestActivity"
android:label="@string/da_policy_serialization_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -124,6 +125,7 @@
<activity android:name=".admin.DeviceAdminUninstallTestActivity"
android:label="@string/da_uninstall_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -136,6 +138,7 @@
<activity android:name=".admin.tapjacking.DeviceAdminTapjackingTestActivity"
android:label="@string/da_tapjacking_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -147,6 +150,7 @@
</activity>
<receiver android:name=".admin.tapjacking.EmptyDeviceAdminReceiver"
+ android:exported="true"
android:permission="android.permission.BIND_DEVICE_ADMIN">
<meta-data android:name="android.app.device_admin"
android:resource="@xml/tapjacking_device_admin" />
@@ -163,6 +167,7 @@
<activity
android:name=".battery.BatterySaverTestActivity"
android:label="@string/battery_saver_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -174,6 +179,7 @@
<activity android:name=".forcestop.RecentTaskRemovalTestActivity"
android:label="@string/remove_from_recents_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -185,6 +191,7 @@
<activity android:name=".companion.CompanionDeviceTestActivity"
android:label="@string/companion_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -205,6 +212,7 @@
<activity android:name=".admin.ScreenLockTestActivity"
android:label="@string/da_screen_lock_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -220,6 +228,7 @@
<activity
android:name=".bluetooth.BluetoothTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bluetooth_test" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -243,6 +252,7 @@
<activity
android:name=".bluetooth.BluetoothToggleActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_toggle_bluetooth" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -269,6 +279,7 @@
<activity
android:name=".bluetooth.HidDeviceActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_hid_device" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -292,6 +303,7 @@
<activity
android:name=".bluetooth.HidHostActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_hid_host" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -315,6 +327,7 @@
<activity
android:name=".bluetooth.SecureServerActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_secure_server" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -340,6 +353,7 @@
<activity
android:name=".bluetooth.InsecureServerActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_insecure_server" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -365,6 +379,7 @@
<activity
android:name=".bluetooth.SecureClientActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_secure_client" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -390,6 +405,7 @@
<activity
android:name=".bluetooth.InsecureClientActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_insecure_client" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -416,6 +432,7 @@
<activity
android:name=".bluetooth.ConnectionAccessServerActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_connection_access_server" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -438,6 +455,7 @@
<activity
android:name=".bluetooth.ConnectionAccessClientActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/bt_connection_access_client" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -499,6 +517,7 @@
<activity
android:name=".bluetooth.BleInsecureClientTestListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_insecure_client_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -526,6 +545,7 @@
<activity
android:name=".bluetooth.BleInsecureClientStartActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_client_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -553,6 +573,7 @@
android:name=".bluetooth.BleInsecureConnectionPriorityClientTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/ble_connection_priority_client_name"
+ android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -584,6 +605,7 @@
android:name=".bluetooth.BleInsecureEncryptedClientTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/ble_encrypted_client_name"
+ android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -616,6 +638,7 @@
<activity
android:name=".bluetooth.BleInsecureServerTestListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_insecure_server_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -642,6 +665,7 @@
<activity
android:name=".bluetooth.BleInsecureServerStartActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_server_start_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -668,6 +692,7 @@
<activity
android:name=".bluetooth.BleInsecureConnectionPriorityServerTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_connection_priority_server_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -699,6 +724,7 @@
android:name=".bluetooth.BleInsecureEncryptedServerTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/ble_encrypted_server_name"
+ android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -731,6 +757,7 @@
<activity
android:name=".bluetooth.BleSecureClientTestListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_secure_client_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -757,6 +784,7 @@
<activity
android:name=".bluetooth.BleSecureClientStartActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_client_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -784,6 +812,7 @@
android:name=".bluetooth.BleSecureConnectionPriorityClientTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/ble_connection_priority_client_name"
+ android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -814,6 +843,7 @@
android:name=".bluetooth.BleSecureEncryptedClientTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/ble_encrypted_client_name"
+ android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -845,6 +875,7 @@
<activity
android:name=".bluetooth.BleSecureServerTestListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_secure_server_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -871,6 +902,7 @@
<activity
android:name=".bluetooth.BleSecureServerStartActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_server_start_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -897,6 +929,7 @@
<activity
android:name=".bluetooth.BleSecureConnectionPriorityServerTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_connection_priority_server_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -927,6 +960,7 @@
android:name=".bluetooth.BleSecureEncryptedServerTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/ble_encrypted_server_name"
+ android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -958,6 +992,7 @@
<activity
android:name=".bluetooth.BleCocInsecureClientTestListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_coc_insecure_client_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -984,6 +1019,7 @@
<activity
android:name=".bluetooth.BleCocInsecureClientStartActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_coc_client_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1015,6 +1051,7 @@
<activity
android:name=".bluetooth.BleCocInsecureServerTestListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_coc_insecure_server_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1041,6 +1078,7 @@
<activity
android:name=".bluetooth.BleCocInsecureServerStartActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_coc_server_start_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1072,6 +1110,7 @@
<activity
android:name=".bluetooth.BleCocSecureClientTestListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_coc_secure_client_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1098,6 +1137,7 @@
<activity
android:name=".bluetooth.BleCocSecureClientStartActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_coc_client_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1129,6 +1169,7 @@
<activity
android:name=".bluetooth.BleCocSecureServerTestListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_coc_secure_server_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1155,6 +1196,7 @@
<activity
android:name=".bluetooth.BleCocSecureServerStartActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_coc_server_start_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1186,6 +1228,7 @@
<activity
android:name=".bluetooth.BleScannerTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_scanner_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1212,6 +1255,7 @@
<activity
android:name=".bluetooth.BleScannerPowerLevelActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_power_level_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1241,6 +1285,7 @@
<activity
android:name=".bluetooth.BleAdvertiserTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_advertiser_test_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1267,6 +1312,7 @@
<activity
android:name=".bluetooth.BleAdvertiserPowerLevelActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/ble_power_level_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1284,6 +1330,7 @@
<activity android:name=".biometrics.BiometricTestList"
android:label="@string/biometric_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1299,6 +1346,7 @@
<activity
android:name=".biometrics.SensorConfigurationTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_sensor_configuration_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1317,6 +1365,7 @@
<activity
android:name=".biometrics.CredentialNotEnrolledTests"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_credential_not_enrolled_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1335,6 +1384,7 @@
<activity
android:name=".biometrics.CredentialEnrolledTests"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_credential_enrolled_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1353,6 +1403,7 @@
<activity
android:name=".biometrics.CredentialCryptoTests"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_credential_crypto_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1371,6 +1422,7 @@
<activity
android:name=".biometrics.BiometricStrongTests"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_strong_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1389,6 +1441,7 @@
<activity
android:name=".biometrics.BiometricWeakTests"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_weak_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1407,6 +1460,7 @@
<activity
android:name=".biometrics.UserAuthenticationCredentialCipherTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_credential_cipher_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1425,6 +1479,7 @@
<activity
android:name=".biometrics.UserAuthenticationBiometricCipherTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_biometric_cipher_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1443,6 +1498,7 @@
<activity
android:name=".biometrics.UserAuthenticationBiometricOrCredentialCipherTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_biometric_credential_cipher_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1461,6 +1517,7 @@
<activity
android:name=".biometrics.UserAuthenticationCredentialSignatureTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_credential_signature_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1479,6 +1536,7 @@
<activity
android:name=".biometrics.UserAuthenticationBiometricSignatureTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_biometric_signature_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1497,6 +1555,7 @@
<activity
android:name=".biometrics.UserAuthenticationBiometricOrCredentialSignatureTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_biometric_or_credential_signature_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1515,6 +1574,7 @@
<activity
android:name=".biometrics.UserAuthenticationCredentialMacTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_credential_mac_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1533,6 +1593,7 @@
<activity
android:name=".biometrics.UserAuthenticationBiometricMacTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_biometric_mac_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1551,6 +1612,7 @@
<activity
android:name=".biometrics.UserAuthenticationBiometricOrCredentialMacTest"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/biometric_test_set_user_authentication_biometric_or_credential_mac_label" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1568,6 +1630,7 @@
<activity android:name=".security.IdentityCredentialAuthentication"
android:label="@string/sec_identity_credential_authentication_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1582,6 +1645,7 @@
<activity android:name=".security.FingerprintBoundKeysTest"
android:label="@string/sec_fingerprint_bound_key_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1596,6 +1660,7 @@
<activity android:name=".security.ProtectedConfirmationTest"
android:label="@string/sec_protected_confirmation_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1606,6 +1671,7 @@
<activity android:name=".security.ScreenLockBoundKeysTest"
android:label="@string/sec_lock_bound_key_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1620,6 +1686,7 @@
<activity android:name=".security.LockConfirmBypassTest"
android:label="@string/lock_confirm_test_title"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1634,6 +1701,7 @@
<activity android:name=".security.SetNewPasswordComplexityTest"
android:label="@string/set_complexity_test_title"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1648,6 +1716,7 @@
<activity android:name=".streamquality.StreamingVideoActivity"
android:label="@string/streaming_video"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1664,7 +1733,8 @@
android:screenOrientation="nosensor" />
<!-- FeatureSummaryActivity is replaced by CTS SystemFeaturesTest
- <activity android:name=".features.FeatureSummaryActivity" android:label="@string/feature_summary">
+ <activity android:name=".features.FeatureSummaryActivity" android:label="@string/feature_summary"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.cts.intent.category.MANUAL_TEST" />
@@ -1675,6 +1745,7 @@
<activity android:name=".location.LocationListenerActivity"
android:label="@string/location_listener_activity"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="com.android.cts.verifier.location.SET_LOCATION_AND_CHECK" />
@@ -1683,6 +1754,7 @@
</activity>
<activity android:name=".net.ConnectivityBackgroundTestActivity"
+ android:exported="true"
android:label="@string/network_background_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1693,6 +1765,7 @@
</activity>
<activity android:name=".net.MultiNetworkConnectivityTestActivity"
+ android:exported="true"
android:label="@string/multinetwork_connectivity_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1707,6 +1780,7 @@
<activity android:name=".nfc.NfcTestActivity"
android:label="@string/nfc_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2024,7 +2098,8 @@
<meta-data android:name="android.nfc.cardemulation.off_host_apdu_service" android:resource="@xml/uicc_transaction_event_aid_list"/>
</service>
- <receiver android:name=".nfc.offhost.UiccTransactionEventReceiver">
+ <receiver android:name=".nfc.offhost.UiccTransactionEventReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.nfc.action.TRANSACTION_DETECTED" >
</action>
@@ -2042,6 +2117,7 @@
<!-- Service used for Camera ITS tests -->
<service android:name=".camera.its.ItsService"
+ android:exported="true"
android:foregroundServiceType="camera">
<intent-filter>
<action android:name="com.android.cts.verifier.camera.its.START"/>
@@ -2055,6 +2131,7 @@
-->
<receiver android:name=".sensors.helpers.SensorDeviceAdminReceiver"
android:label="@string/snsr_device_admin_receiver"
+ android:exported="true"
android:permission="android.permission.BIND_DEVICE_ADMIN">
<meta-data android:name="android.app.device_admin"
android:resource="@xml/sensor_device_admin" />
@@ -2065,6 +2142,7 @@
<activity android:name=".sensors.AccelerometerMeasurementTestActivity"
android:label="@string/snsr_accel_m_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -2079,6 +2157,7 @@
<activity android:name=".sensors.GyroscopeMeasurementTestActivity"
android:label="@string/snsr_gyro_m_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -2093,6 +2172,7 @@
<activity android:name=".sensors.HeartRateMonitorTestActivity"
android:label="@string/snsr_heartrate_test"
+ android:exported="true"
android:screenOrientation="nosensor">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2105,6 +2185,7 @@
<activity android:name=".sensors.MagneticFieldMeasurementTestActivity"
android:label="@string/snsr_mag_m_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2116,6 +2197,7 @@
</activity>
<activity android:name=".sensors.OffBodySensorTestActivity"
+ android:exported="true"
android:label="@string/snsr_offbody_sensor_test">
<!-- <receiver android:name="com.android.cts.verifier.sensors.OffBodySensorTestActivity$AlarmReceiver"></receiver>-->
<intent-filter>
@@ -2129,6 +2211,7 @@
android:name=".sensors.RVCVXCheckTestActivity"
android:keepScreenOn="true"
android:label="@string/snsr_rvcvxchk_test"
+ android:exported="true"
android:screenOrientation="locked" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2153,6 +2236,7 @@
<!-- TODO: enable when a full set of verifications can be implemented -->
<!--activity android:name=".sensors.RotationVectorTestActivity"
android:label="@string/snsr_rot_vec_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2165,6 +2249,7 @@
<activity android:name=".sensors.BatchingTestActivity"
android:label="@string/snsr_batch_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2178,6 +2263,7 @@
<!-- TODO: enable when a more reliable way to identify time synchronization is available -->
<!--activity android:name=".sensors.SensorSynchronizationTestActivity"
android:label="@string/snsr_synch_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2190,6 +2276,7 @@
<activity android:name=".sensors.DynamicSensorDiscoveryTestActivity"
android:label="@string/snsr_dynamic_sensor_discovery_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -2203,6 +2290,7 @@
<activity android:name=".camera.formats.CameraFormatsActivity"
android:label="@string/camera_format"
+ android:exported="true"
android:screenOrientation="landscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2216,6 +2304,7 @@
</activity>
<activity android:name=".camera.intents.CameraIntentsActivity"
+ android:exported="true"
android:label="@string/camera_intents">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2233,6 +2322,7 @@
<activity android:name=".camera.orientation.CameraOrientationActivity"
android:label="@string/camera_orientation"
+ android:exported="true"
android:screenOrientation="landscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2249,6 +2339,7 @@
android:name=".camera.fov.PhotoCaptureActivity"
android:label="@string/camera_fov_calibration"
android:screenOrientation="landscape"
+ android:exported="true"
android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" >
<intent-filter android:label="@string/camera_fov_calibration" >
<action android:name="android.intent.action.MAIN" />
@@ -2277,6 +2368,7 @@
<activity android:name=".camera.video.CameraVideoActivity"
android:label="@string/camera_video"
+ android:exported="true"
android:screenOrientation="landscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2293,6 +2385,7 @@
android:label="@string/camera_its_test"
android:launchMode="singleTop"
android:configChanges="keyboardHidden|screenSize"
+ android:exported="true"
android:screenOrientation="landscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2306,6 +2399,7 @@
<activity android:name=".camera.flashlight.CameraFlashlightActivity"
android:label="@string/camera_flashlight_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2319,6 +2413,7 @@
<activity android:name=".camera.performance.CameraPerformanceActivity"
android:label="@string/camera_performance_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2333,6 +2428,7 @@
<activity android:name=".camera.bokeh.CameraBokehActivity"
android:label="@string/camera_bokeh_test"
android:configChanges="keyboardHidden|screenSize"
+ android:exported="true"
android:screenOrientation="landscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2346,6 +2442,7 @@
<activity android:name=".usb.accessory.UsbAccessoryTestActivity"
android:label="@string/usb_accessory_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2357,7 +2454,8 @@
android:value="android.hardware.type.watch" />
</activity>
- <activity android:name=".usb.accessory.AccessoryAttachmentHandler">
+ <activity android:name=".usb.accessory.AccessoryAttachmentHandler"
+ android:exported="true">
<intent-filter>
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
</intent-filter>
@@ -2368,6 +2466,7 @@
<activity android:name=".usb.device.UsbDeviceTestActivity"
android:label="@string/usb_device_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2380,7 +2479,8 @@
android:value="android.hardware.type.watch" />
</activity>
- <activity android:name=".usb.mtp.MtpHostTestActivity" android:label="@string/mtp_host_test">
+ <activity android:name=".usb.mtp.MtpHostTestActivity" android:label="@string/mtp_host_test"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.cts.intent.category.MANUAL_TEST" />
@@ -2394,6 +2494,7 @@
<!-- Turned off Sensor Power Test in initial L release
<activity android:name=".sensors.SensorPowerTestActivity"
android:label="@string/sensor_power_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2406,6 +2507,7 @@
-->
<activity android:name=".p2p.P2pTestListActivity"
android:label="@string/p2p_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2420,6 +2522,7 @@
</activity>
<activity android:name=".managedprovisioning.IntermediateRecentActivity"
android:label="@string/provisioning_byod_recents"
+ android:exported="true"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.RECENTS" />
@@ -2428,6 +2531,7 @@
</activity>
<activity android:name=".wifi.TestListActivity"
android:label="@string/wifi_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2438,6 +2542,7 @@
</activity>
<activity android:name=".wifiaware.TestListActivity"
android:label="@string/aware_test"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2448,6 +2553,7 @@
</activity>
<activity android:name=".notifications.NotificationListenerVerifierActivity"
+ android:exported="true"
android:label="@string/nls_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2456,7 +2562,8 @@
<meta-data android:name="test_category" android:value="@string/test_category_notifications" />
</activity>
- <receiver android:name=".notifications.BlockChangeReceiver">
+ <receiver android:name=".notifications.BlockChangeReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.app.action.NOTIFICATION_CHANNEL_BLOCK_STATE_CHANGED"/>
<action android:name="android.app.action.NOTIFICATION_CHANNEL_GROUP_BLOCK_STATE_CHANGED"/>
@@ -2464,13 +2571,15 @@
</intent-filter>
</receiver>
- <receiver android:name=".notifications.AutomaticZenRuleStatusReceiver">
+ <receiver android:name=".notifications.AutomaticZenRuleStatusReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.app.action.AUTOMATIC_ZEN_RULE_STATUS_CHANGED"/>
</intent-filter>
</receiver>
<activity android:name=".notifications.ConditionProviderVerifierActivity"
+ android:exported="true"
android:label="@string/cp_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2490,6 +2599,7 @@
</activity>
<activity android:name=".notifications.AttentionManagementVerifierActivity"
+ android:exported="true"
android:label="@string/attention_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2501,6 +2611,7 @@
</activity>
<activity android:name=".notifications.BubblesVerifierActivity"
+ android:exported="true"
android:label="@string/bubbles_notification_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2513,6 +2624,7 @@
<activity android:name=".notifications.BubbleActivity"
android:label="@string/bubble_activity_title"
+ android:exported="true"
android:resizeableActivity="true">
<intent-filter>
<action android:name="android.intent.action.SEND" />
@@ -2526,6 +2638,7 @@
</activity>
<activity android:name=".notifications.MediaPlayerVerifierActivity"
+ android:exported="true"
android:label="@string/qs_media_player_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2557,6 +2670,7 @@
<activity android:name=".notifications.ShortcutThrottlingResetActivity"
android:label="@string/shortcut_reset_test"
+ android:exported="true"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2568,6 +2682,7 @@
</activity>
<activity android:name=".qstiles.TileServiceVerifierActivity"
+ android:exported="true"
android:label="@string/tiles_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2582,6 +2697,7 @@
android:icon="@android:drawable/ic_dialog_alert"
android:label="@string/tile_service_name"
android:enabled="false"
+ android:exported="true"
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -2590,6 +2706,7 @@
<activity android:name=".vr.VrListenerVerifierActivity"
android:configChanges="uiMode"
+ android:exported="true"
android:label="@string/vr_tests">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2644,6 +2761,7 @@
<service android:name=".notifications.InteractiveVerifierActivity$DismissService"/>
<activity android:name=".security.CAInstallNotificationVerifierActivity"
+ android:exported="true"
android:label="@string/cacert_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2655,6 +2773,7 @@
<meta-data android:name="test_required_features" android:value="android.software.device_admin" />
</activity>
<activity android:name=".security.CANotifyOnBootActivity"
+ android:exported="true"
android:label="@string/caboot_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2667,6 +2786,7 @@
</activity>
<activity android:name=".security.KeyChainTest"
+ android:exported="true"
android:label="@string/keychain_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2679,6 +2799,7 @@
</activity>
<activity android:name=".security.CaCertInstallViaIntentTest"
+ android:exported="true"
android:label="@string/cacert_install_via_intent">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2871,6 +2992,7 @@
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity-alias android:name=".CtsVerifierActivity" android:label="@string/app_name"
+ android:exported="true"
android:targetActivity=".TestListActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2881,6 +3003,7 @@
<!-- remove comment from the next activity to see the sample test surfacing in the app -->
<!-- activity android:name=".sample.SampleTestActivity"
+ android:exported="true"
android:label="@string/sample_framework_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2890,6 +3013,7 @@
</activity -->
<activity android:name=".widget.WidgetTestActivity"
+ android:exported="true"
android:label="@string/widget_framework_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2903,6 +3027,7 @@
</activity>
<activity android:name=".deskclock.DeskClockTestsActivity"
+ android:exported="true"
android:label="@string/deskclock_tests">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2919,6 +3044,7 @@
<activity
android:name="com.android.cts.verifier.sensors.StepCounterTestActivity"
android:label="@string/snsr_step_counter_test"
+ android:exported="true"
android:screenOrientation="nosensor" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2933,6 +3059,7 @@
<activity
android:name="com.android.cts.verifier.sensors.StepSensorPermissionTestActivity"
android:label="@string/snsr_step_permission_test"
+ android:exported="true"
android:screenOrientation="nosensor" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2950,6 +3077,7 @@
<activity
android:name="com.android.cts.verifier.sensors.DeviceSuspendTestActivity"
android:label="@string/snsr_device_suspend_test"
+ android:exported="true"
android:screenOrientation="nosensor" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2977,6 +3105,7 @@
<activity
android:name="com.android.cts.verifier.sensors.SignificantMotionTestActivity"
android:label="@string/snsr_significant_motion_test"
+ android:exported="true"
android:screenOrientation="nosensor" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2994,6 +3123,7 @@
<activity
android:name="com.android.cts.verifier.sensors.EventSanitizationTestActivity"
android:label="@string/snsr_event_sanitization_test"
+ android:exported="true"
android:screenOrientation="nosensor" >
<intent-filter>
@@ -3016,6 +3146,7 @@
<activity
android:name="com.android.cts.verifier.sensors.HingeAngleTestActivity"
android:label="@string/snsr_hinge_angle_test"
+ android:exported="true"
android:screenOrientation="nosensor" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3030,7 +3161,8 @@
android:value="android.hardware.sensor.hinge_angle" />
</activity>
- <receiver android:name=".widget.WidgetCtsProvider">
+ <receiver android:name=".widget.WidgetCtsProvider"
+ android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
@@ -3045,6 +3177,7 @@
android:exported="false" />
<activity android:name=".projection.cube.ProjectionCubeActivity"
+ android:exported="true"
android:label="@string/pca_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3055,6 +3188,7 @@
</activity>
<activity android:name=".projection.widgets.ProjectionWidgetActivity"
+ android:exported="true"
android:label="@string/pwa_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3065,6 +3199,7 @@
</activity>
<activity android:name=".projection.list.ProjectionListActivity"
+ android:exported="true"
android:label="@string/pla_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3076,6 +3211,7 @@
</activity>
<activity android:name=".projection.video.ProjectionVideoActivity"
+ android:exported="true"
android:label="@string/pva_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3087,6 +3223,7 @@
</activity>
<activity android:name=".projection.touch.ProjectionTouchActivity"
+ android:exported="true"
android:label="@string/pta_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3099,6 +3236,7 @@
<activity android:name=".projection.offscreen.ProjectionOffscreenActivity"
+ android:exported="true"
android:label="@string/poa_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3114,6 +3252,7 @@
android:process=":projectionservice" />
<activity android:name=".managedprovisioning.DeviceOwnerNegativeTestActivity"
+ android:exported="true"
android:label="@string/negative_device_owner">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3128,6 +3267,7 @@
<activity android:name=".managedprovisioning.DeviceOwnerNegativeTestActivity$TrampolineActivity" />
<activity android:name=".managedprovisioning.EnterprisePrivacyInfoOnlyTestActivity"
+ android:exported="true"
android:label="@string/enterprise_privacy_test">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_ENTERPRISE_PRIVACY_INFO_ONLY" />
@@ -3136,6 +3276,7 @@
</activity>
<activity android:name=".managedprovisioning.DeviceOwnerPositiveTestActivity"
+ android:exported="true"
android:label="@string/positive_device_owner">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3150,6 +3291,7 @@
</activity>
<activity android:name=".managedprovisioning.ManagedUserPositiveTestActivity"
+ android:exported="true"
android:label="@string/managed_user_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3159,6 +3301,7 @@
</activity>
<activity android:name=".managedprovisioning.DeviceOwnerRequestingBugreportTestActivity"
+ android:exported="true"
android:label="@string/device_owner_requesting_bugreport_tests">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3179,6 +3322,7 @@
</activity>
<activity android:name=".managedprovisioning.CrossProfilePermissionControlActivity"
+ android:exported="true"
android:label="@string/provisioning_byod_cross_profile_permission_control">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.CROSS_PROFILE_PERMISSION_CONTROL" />
@@ -3191,6 +3335,7 @@
</activity>
<activity android:name=".managedprovisioning.LockTaskUiTestActivity"
+ android:exported="true"
android:label="@string/device_owner_lock_task_ui_test">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.STOP_LOCK_TASK" />
@@ -3203,6 +3348,7 @@
</activity>
<activity android:name=".managedprovisioning.VpnTestActivity"
+ android:exported="true"
android:label="@string/device_owner_vpn_test">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.VPN" />
@@ -3211,6 +3357,7 @@
</activity>
<service android:name=".managedprovisioning.VpnTestActivity$MyTestVpnService"
+ android:exported="true"
android:permission="android.permission.BIND_VPN_SERVICE">
<intent-filter>
<action android:name="android.net.VpnService"/>
@@ -3218,6 +3365,7 @@
</service>
<activity android:name=".managedprovisioning.AlwaysOnVpnSettingsTestActivity"
+ android:exported="true"
android:label="@string/provisioning_byod_always_on_vpn">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.ALWAYS_ON_VPN_SETTINGS_TEST" />
@@ -3226,6 +3374,7 @@
</activity>
<activity android:name=".managedprovisioning.KeyChainTestActivity"
+ android:exported="true"
android:label="@string/provisioning_byod_keychain">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.KEYCHAIN" />
@@ -3234,6 +3383,7 @@
</activity>
<activity android:name=".managedprovisioning.PermissionLockdownTestActivity"
+ android:exported="true"
android:label="@string/device_profile_owner_permission_lockdown_test">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_PERMISSION_LOCKDOWN" />
@@ -3243,6 +3393,7 @@
<activity-alias
android:name=".managedprovisioning.ManagedProfilePermissionLockdownTestActivity"
+ android:exported="true"
android:targetActivity=".managedprovisioning.PermissionLockdownTestActivity">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.MANAGED_PROFILE_CHECK_PERMISSION_LOCKDOWN" />
@@ -3255,6 +3406,7 @@
</activity>
<activity android:name=".managedprovisioning.PolicyTransparencyTestListActivity"
+ android:exported="true"
android:label="@string/device_profile_owner_policy_transparency_test">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_POLICY_TRANSPARENCY" />
@@ -3262,7 +3414,8 @@
</intent-filter>
</activity>
- <activity android:name=".managedprovisioning.PolicyTransparencyTestActivity">
+ <activity android:name=".managedprovisioning.PolicyTransparencyTestActivity"
+ android:exported="true">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.SHOW_POLICY_TRANSPARENCY_TEST" />
<category android:name="android.intent.category.DEFAULT" />
@@ -3270,6 +3423,7 @@
</activity>
<activity android:name=".managedprovisioning.EnterprisePrivacyTestListActivity"
+ android:exported="true"
android:label="@string/enterprise_privacy_test">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_ENTERPRISE_PRIVACY" />
@@ -3279,6 +3433,7 @@
<activity android:name=".managedprovisioning.EnterprisePrivacyTestDefaultAppActivity"
android:label="@string/enterprise_privacy_default_app"
+ android:exported="true"
android:enabled="false">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -3321,6 +3476,7 @@
<activity android:name=".managedprovisioning.CommandReceiverActivity"
android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true"
android:noHistory="true">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.EXECUTE_COMMAND" />
@@ -3328,7 +3484,8 @@
</intent-filter>
</activity>
- <activity android:name=".managedprovisioning.SetSupportMessageActivity">
+ <activity android:name=".managedprovisioning.SetSupportMessageActivity"
+ android:exported="true">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.SET_SUPPORT_MSG" />
<category android:name="android.intent.category.DEFAULT" />
@@ -3337,6 +3494,7 @@
<service android:name=".managedprovisioning.PolicyTransparencyTestActivity$DummyInputMethod"
android:label="@string/dummy_input_method_label"
+ android:exported="true"
android:permission="android.permission.BIND_INPUT_METHOD">
<intent-filter>
<action android:name="android.view.InputMethod" />
@@ -3346,6 +3504,7 @@
<service android:name=".managedprovisioning.PolicyTransparencyTestActivity$DummyAccessibilityService"
android:label="@string/dummy_accessibility_service_label"
+ android:exported="true"
android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
<intent-filter>
<action android:name="android.accessibilityservice.AccessibilityService" />
@@ -3353,6 +3512,7 @@
</service>
<activity android:name=".managedprovisioning.AuthenticationBoundKeyTestActivity"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.action.AUTH_BOUND_KEY_TEST" />
@@ -3362,6 +3522,7 @@
<activity android:name=".managedprovisioning.ByodFlowTestActivity"
android:launchMode="singleTask"
+ android:exported="true"
android:label="@string/provisioning_byod">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3384,13 +3545,15 @@
</activity>
<receiver
- android:name=".managedprovisioning.ByodFlowTestActivity$ProvisioningCompleteReceiver">
+ android:name=".managedprovisioning.ByodFlowTestActivity$ProvisioningCompleteReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.app.action.MANAGED_PROFILE_PROVISIONED" />
</intent-filter>
</receiver>
<activity android:name=".managedprovisioning.ByodProvisioningTestActivity"
+ android:exported="true"
android:label="@string/provisioning_tests_byod">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3402,7 +3565,8 @@
<activity android:name=".managedprovisioning.ByodProvisioningTestActivity$ProvisioningStartingActivity" />
- <activity android:name=".managedprovisioning.ByodHelperActivity">
+ <activity android:name=".managedprovisioning.ByodHelperActivity"
+ android:exported="true">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.BYOD_QUERY" />
<action android:name="com.android.cts.verifier.managedprovisioning.BYOD_REMOVE" />
@@ -3435,7 +3599,8 @@
</intent-filter>
</activity>
- <activity android:name=".managedprovisioning.ByodPrimaryHelperActivity">
+ <activity android:name=".managedprovisioning.ByodPrimaryHelperActivity"
+ android:exported="true">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.BYOD_INSTALL_APK_IN_PRIMARY" />
<category android:name="android.intent.category.DEFAULT" />
@@ -3456,7 +3621,8 @@
android:resource="@xml/filepaths" />
</provider>
- <activity android:name=".managedprovisioning.ByodIconSamplerActivity">
+ <activity android:name=".managedprovisioning.ByodIconSamplerActivity"
+ android:exported="true">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.BYOD_SAMPLE_ICON" />
<category android:name="android.intent.category.DEFAULT"></category>
@@ -3464,6 +3630,7 @@
</activity>
<activity android:name=".managedprovisioning.HandleIntentActivity"
+ android:exported="true"
android:enabled="false">
<intent-filter>
<!-- We need to have at least one activity listening to these intents on the device
@@ -3535,7 +3702,8 @@
</intent-filter>
</activity>
- <activity android:name=".managedprovisioning.CrossProfileTestActivity">
+ <activity android:name=".managedprovisioning.CrossProfileTestActivity"
+ android:exported="true">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.CROSS_PROFILE_TO_PERSONAL" />
<action android:name="com.android.cts.verifier.managedprovisioning.CROSS_PROFILE_TO_WORK" />
@@ -3555,7 +3723,8 @@
</intent-filter>
</activity>
- <activity android:name=".managedprovisioning.WorkStatusTestActivity">
+ <activity android:name=".managedprovisioning.WorkStatusTestActivity"
+ android:exported="true">
<intent-filter>
<action android:name="com.android.cts.verifier.managedprovisioning.WORK_STATUS_ICON" />
<action android:name="com.android.cts.verifier.managedprovisioning.WORK_STATUS_TOAST" />
@@ -3568,6 +3737,7 @@
</activity>
<activity android:name=".managedprovisioning.WorkProfileWidgetActivity"
+ android:exported="true"
android:label="@string/provisioning_byod_work_profile_widget">
<intent-filter>
<action android:name="com.android.cts.verifier.byod.test_work_profile_widget"/>
@@ -3577,6 +3747,7 @@
<receiver android:name=".managedprovisioning.DeviceAdminTestReceiver"
android:label="@string/afw_device_admin"
+ android:exported="true"
android:permission="android.permission.BIND_DEVICE_ADMIN">
<meta-data android:name="android.app.device_admin"
android:resource="@xml/device_admin_byod" />
@@ -3594,6 +3765,7 @@
<activity android:name=".os.TimeoutResetActivity"/>
<activity android:name=".tv.TvInputDiscoveryTestActivity"
+ android:exported="true"
android:label="@string/tv_input_discover_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3605,6 +3777,7 @@
</activity>
<activity android:name=".tv.ParentalControlTestActivity"
+ android:exported="true"
android:label="@string/tv_parental_control_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3616,6 +3789,7 @@
</activity>
<activity android:name=".tv.MultipleTracksTestActivity"
+ android:exported="true"
android:label="@string/tv_multiple_tracks_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3627,6 +3801,7 @@
</activity>
<activity android:name=".tv.TimeShiftTestActivity"
+ android:exported="true"
android:label="@string/tv_time_shift_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3639,6 +3814,7 @@
<activity android:name=".tv.AppLinkTestActivity"
android:label="@string/tv_app_link_test"
+ android:exported="true"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3650,6 +3826,7 @@
</activity>
<activity android:name=".tv.MicrophoneDeviceTestActivity"
+ android:exported="true"
android:label="@string/tv_microphone_device_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3673,6 +3850,7 @@
</activity>
<activity android:name=".tv.display.DisplayHdrCapabilitiesTestActivity"
android:label="@string/tv_hdr_capabilities_test"
+ android:exported="true"
android:configChanges="orientation|screenSize|density|smallestScreenSize|screenLayout">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3684,6 +3862,7 @@
</activity>
<activity android:name=".tv.display.DisplayModesTestActivity"
android:label="@string/tv_display_modes_test"
+ android:exported="true"
android:configChanges="orientation|screenSize|density|smallestScreenSize|screenLayout">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3696,6 +3875,7 @@
<activity android:name=".screenpinning.ScreenPinningTestActivity"
+ android:exported="true"
android:label="@string/screen_pinning_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3706,13 +3886,15 @@
android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" />
</activity>
- <activity android:name=".tv.MockTvInputSetupActivity">
+ <activity android:name=".tv.MockTvInputSetupActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
<activity android:name=".audio.RingerModeActivity"
+ android:exported="true"
android:label="@string/ringer_mode_tests">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3725,6 +3907,7 @@
<activity android:name=".audio.HifiUltrasoundTestActivity"
android:label="@string/hifi_ultrasound_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3736,6 +3919,7 @@
<activity android:name=".audio.HifiUltrasoundSpeakerTestActivity"
android:label="@string/hifi_ultrasound_speaker_test"
+ android:exported="true"
android:screenOrientation="locked">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3746,6 +3930,7 @@
</activity>
<activity android:name=".audio.AudioOutputDeviceNotificationsActivity"
+ android:exported="true"
android:label="@string/audio_out_devices_notifications_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3757,6 +3942,7 @@
</activity>
<activity android:name=".audio.AudioInputDeviceNotificationsActivity"
+ android:exported="true"
android:label="@string/audio_in_devices_notifications_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3768,6 +3954,7 @@
</activity>
<activity android:name=".audio.AudioOutputRoutingNotificationsActivity"
+ android:exported="true"
android:label="@string/audio_output_routingnotifications_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3779,6 +3966,7 @@
</activity>
<activity android:name=".audio.AudioInputRoutingNotificationsActivity"
+ android:exported="true"
android:label="@string/audio_input_routingnotifications_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3790,6 +3978,7 @@
</activity>
<activity android:name=".audio.USBAudioPeripheralAttributesActivity"
+ android:exported="true"
android:label="@string/audio_uap_attribs_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3802,6 +3991,7 @@
</activity>
<activity android:name=".audio.USBAudioPeripheralNotificationsTest"
+ android:exported="true"
android:label="@string/audio_uap_notifications_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3814,6 +4004,7 @@
</activity>
<activity android:name=".audio.USBAudioPeripheralPlayActivity"
+ android:exported="true"
android:label="@string/audio_uap_play_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3826,6 +4017,7 @@
</activity>
<activity android:name=".audio.USBAudioPeripheralRecordActivity"
+ android:exported="true"
android:label="@string/audio_uap_record_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3838,6 +4030,7 @@
</activity>
<activity android:name=".audio.USBAudioPeripheralButtonsActivity"
+ android:exported="true"
android:label="@string/audio_uap_buttons_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3850,6 +4043,7 @@
</activity>
<activity android:name=".audio.USBRestrictRecordAActivity"
+ android:exported="true"
android:label="@string/audio_usb_restrict_record_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3862,6 +4056,7 @@
</activity>
<activity android:name=".audio.ProAudioActivity"
+ android:exported="true"
android:label="@string/pro_audio_latency_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3871,10 +4066,18 @@
<meta-data android:name="test_required_features" android:value="android.hardware.usb.host:android.hardware.audio.pro" />
</activity>
- <!-- ProAudio test invokes the "Loopback" App -->
- <activity android:name="org.drrickorang.loopback"/>
+ <activity android:name=".audio.AnalogHeadsetAudioActivity"
+ android:exported="true"
+ android:label="@string/audio_headset_audio_test">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.cts.intent.category.MANUAL_TEST" />
+ </intent-filter>
+ <meta-data android:name="test_category" android:value="@string/test_category_audio" />
+ </activity>
<activity android:name=".audio.AudioLoopbackLatencyActivity"
+ android:exported="true"
android:label="@string/audio_loopback_latency_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3887,6 +4090,7 @@
</activity>
<activity android:name=".audio.MidiActivity"
+ android:exported="true"
android:label="@string/midi_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3898,6 +4102,7 @@
</activity>
<activity android:name=".audio.NDKMidiActivity"
+ android:exported="true"
android:label="@string/ndk_midi_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3909,6 +4114,7 @@
</activity>
<service android:name="com.android.midi.MidiEchoTestService"
+ android:exported="true"
android:permission="android.permission.BIND_MIDI_DEVICE_SERVICE">
<intent-filter>
<action android:name="android.media.midi.MidiDeviceService" />
@@ -3918,6 +4124,7 @@
</service>
<activity android:name=".audio.AudioFrequencyLineActivity"
+ android:exported="true"
android:label="@string/audio_frequency_line_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3928,6 +4135,7 @@
</activity>
<activity android:name=".audio.AudioFrequencySpeakerActivity"
+ android:exported="true"
android:label="@string/audio_frequency_speaker_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3938,6 +4146,7 @@
</activity>
<activity android:name=".audio.AudioFrequencyMicActivity"
+ android:exported="true"
android:label="@string/audio_frequency_mic_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3948,6 +4157,7 @@
</activity>
<activity android:name=".audio.AudioFrequencyUnprocessedActivity"
+ android:exported="true"
android:label="@string/audio_frequency_unprocessed_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3958,6 +4168,7 @@
</activity>
<activity android:name=".audio.AudioFrequencyVoiceRecognitionActivity"
+ android:exported="true"
android:label="@string/audio_frequency_voice_recognition_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3968,6 +4179,7 @@
</activity>
<activity android:name=".audio.AudioAEC"
+ android:exported="true"
android:label="@string/audio_aec_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -3978,6 +4190,7 @@
</activity>
<service android:name=".tv.MockTvInputService"
+ android:exported="true"
android:permission="android.permission.BIND_TV_INPUT">
<intent-filter>
<action android:name="android.media.tv.TvInputService" />
@@ -3986,7 +4199,8 @@
android:resource="@xml/mock_tv_input_service" />
</service>
- <receiver android:name=".tv.TvInputReceiver">
+ <receiver android:name=".tv.TvInputReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS" />
</intent-filter>
@@ -3995,6 +4209,7 @@
</receiver>
<activity android:name=".car.CarDockTestActivity"
+ android:exported="true"
android:label="@string/car_dock_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4018,6 +4233,7 @@
<!-- See explaination in CarDockTestActivity.java -->
<activity-alias android:name=".car.CarDockActivity1"
+ android:exported="true"
android:targetActivity=".car.CarDockActivity" >
<meta-data
android:name="android.dock_home"
@@ -4031,6 +4247,7 @@
<activity-alias android:name=".car.CarDockActivity2"
android:targetActivity=".car.CarDockActivity"
+ android:exported="true"
android:enabled="false" >
<meta-data
android:name="android.dock_home"
@@ -4043,6 +4260,7 @@
</activity-alias>
<activity android:name=".car.GearSelectionTestActivity"
+ android:exported="true"
android:label="@string/gear_selection_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4055,6 +4273,7 @@
</activity>
<activity android:name=".car.NightModeTestActivity"
+ android:exported="true"
android:label="@string/night_mode_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4067,6 +4286,7 @@
</activity>
<activity android:name=".car.ParkingBrakeOnTestActivity"
+ android:exported="true"
android:label="@string/parking_brake_on_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4081,6 +4301,7 @@
<!-- 6DoF sensor test -->
<activity
android:name="com.android.cts.verifier.sensors.sixdof.Activities.StartActivity"
+ android:exported="true"
android:label="@string/six_dof_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4094,6 +4315,7 @@
</activity>
<activity android:name=".voicemail.VoicemailBroadcastActivity"
+ android:exported="true"
android:label="@string/voicemail_broadcast_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4117,7 +4339,8 @@
android:value="config_voice_capable"/>
</activity>
- <receiver android:name=".voicemail.VoicemailBroadcastReceiver">
+ <receiver android:name=".voicemail.VoicemailBroadcastReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION" />
</intent-filter>
@@ -4125,6 +4348,7 @@
<activity
android:name=".voicemail.VisualVoicemailServiceActivity"
+ android:exported="true"
android:label="@string/visual_voicemail_service_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4144,6 +4368,7 @@
<activity
android:name=".dialer.DialerIncomingCallTestActivity"
+ android:exported="true"
android:label="@string/dialer_incoming_call_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4162,6 +4387,7 @@
</activity>
<service android:name=".dialer.DialerCallTestService"
+ android:exported="true"
android:permission="android.permission.BIND_INCALL_SERVICE">
<meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />
<intent-filter>
@@ -4171,6 +4397,7 @@
<activity
android:name=".dialer.DialerShowsHunOnIncomingCallActivity"
+ android:exported="true"
android:label="@string/dialer_shows_hun_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4190,6 +4417,7 @@
<activity
android:name=".voicemail.CallSettingsCheckActivity"
+ android:exported="true"
android:label="@string/call_settings_check_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4209,6 +4437,7 @@
<activity
android:name=".voicemail.VoicemailSettingsCheckActivity"
+ android:exported="true"
android:label="@string/ringtone_settings_check_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4228,6 +4457,7 @@
<activity
android:name=".dialer.DialerImplementsTelecomIntentsActivity"
+ android:exported="true"
android:label="@string/dialer_telecom_intents_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4256,6 +4486,7 @@
<activity
android:name=".telecom.EnablePhoneAccountTestActivity"
+ android:exported="true"
android:label="@string/telecom_enable_phone_account_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4275,6 +4506,7 @@
<activity
android:name=".telecom.OutgoingCallTestActivity"
+ android:exported="true"
android:label="@string/telecom_outgoing_call_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4294,6 +4526,7 @@
<activity
android:name=".telecom.SelfManagedIncomingCallTestActivity"
+ android:exported="true"
android:label="@string/telecom_incoming_self_mgd_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4313,6 +4546,7 @@
<activity
android:name=".telecom.IncomingCallTestActivity"
+ android:exported="true"
android:label="@string/telecom_incoming_call_test">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -4331,6 +4565,7 @@
</activity>
<activity android:name=".telecom.TelecomDefaultDialerTestActivity"
+ android:exported="true"
android:label="@string/telecom_default_dialer_test_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4349,6 +4584,7 @@
</activity>
<activity android:name=".telecom.CtsVerifierInCallUi"
+ android:exported="true"
android:label="@string/telecom_in_call_ui_label">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4360,12 +4596,14 @@
android:label="@string/device_owner_customize_lockscreen_message" />
<service android:name="com.android.cts.verifier.telecom.CtsConnectionService"
+ android:exported="true"
android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
<intent-filter>
<action android:name="android.telecom.ConnectionService" />
</intent-filter>
</service>
<service android:name="com.android.cts.verifier.telecom.CtsSelfManagedConnectionService"
+ android:exported="true"
android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
<intent-filter>
<action android:name="android.telecom.ConnectionService" />
@@ -4373,6 +4611,7 @@
</service>
<activity android:name=".instantapps.NotificationTestActivity"
+ android:exported="true"
android:label="@string/ia_notification">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4382,6 +4621,7 @@
<meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" />
</activity>
<activity android:name=".instantapps.RecentAppsTestActivity"
+ android:exported="true"
android:label="@string/ia_recents">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4391,6 +4631,7 @@
<meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" />
</activity>
<activity android:name=".instantapps.AppInfoTestActivity"
+ android:exported="true"
android:label="@string/ia_app_info">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4402,6 +4643,7 @@
</activity>
<activity android:name=".displaycutout.DisplayCutoutTestActivity"
+ android:exported="true"
android:label="@string/display_cutout_test">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -4409,6 +4651,15 @@
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_display_cutout" />
</activity>
+ <activity android:name=".speech.tts.TtsTestActivity"
+ android:label="@string/tts_test">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.cts.intent.category.MANUAL_TEST" />
+ </intent-filter>
+ <meta-data android:name="test_category" android:value="@string/test_category_other" />
+ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" />
+ </activity>
</application>
<queries>
diff --git a/apps/CtsVerifier/res/layout/audio_dev_notify.xml b/apps/CtsVerifier/res/layout/audio_dev_notify.xml
index aa6d3c4..6fa178d 100644
--- a/apps/CtsVerifier/res/layout/audio_dev_notify.xml
+++ b/apps/CtsVerifier/res/layout/audio_dev_notify.xml
@@ -21,35 +21,11 @@
style="@style/RootLayoutPadding">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:scrollbars="vertical"
- android:gravity="bottom"
- android:id="@+id/audio_general_headset_port_exists"
- android:text="@string/audio_general_headset_port_exists" />
+ android:orientation="vertical">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/audio_general_headset_no"
- android:text="@string/audio_general_headset_no" />
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/audio_general_headset_yes"
- android:text="@string/audio_general_headset_yes" />
- </LinearLayout>
+ <include layout="@layout/audio_wired_query_layout" />
<TextView
android:layout_width="match_parent"
diff --git a/apps/CtsVerifier/res/layout/audio_frequency_line_activity.xml b/apps/CtsVerifier/res/layout/audio_frequency_line_activity.xml
index 41292d1..3ae6d43 100644
--- a/apps/CtsVerifier/res/layout/audio_frequency_line_activity.xml
+++ b/apps/CtsVerifier/res/layout/audio_frequency_line_activity.xml
@@ -30,40 +30,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
>
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scrollbars="vertical"
- android:gravity="bottom"
- android:id="@+id/audio_general_headset_port_exists"
- android:text="@string/audio_general_headset_port_exists" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/audio_general_headset_no"
- android:text="@string/audio_general_headset_no"
- android:nextFocusForward="@+id/audio_general_headset_yes"
- android:nextFocusDown="@+id/audio_frequency_line_plug_ready_btn"
- android:nextFocusRight="@+id/audio_general_headset_yes"/>
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/audio_general_headset_yes"
- android:text="@string/audio_general_headset_yes"
- android:nextFocusForward="@+id/audio_frequency_line_plug_ready_btns"
- android:nextFocusDown="@+id/audio_frequency_line_plug_ready_btn"
- android:nextFocusLeft="@+id/audio_general_headset_no"
- android:nextFocusRight="@+id/audio_frequency_line_plug_ready_btn" />
-
- </LinearLayout>
+ <include layout="@layout/audio_wired_query_layout" />
<TextView
android:layout_width="match_parent"
diff --git a/apps/CtsVerifier/res/layout/audio_headset_audio_activity.xml b/apps/CtsVerifier/res/layout/audio_headset_audio_activity.xml
new file mode 100644
index 0000000..005c5e6
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/audio_headset_audio_activity.xml
@@ -0,0 +1,149 @@
+<?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.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <!-- Has Headset Buttons -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/analog_headset_query"/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginLeft="10dp">
+ <Button
+ android:text="@string/audio_general_yes"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:id="@+id/headset_analog_port_yes"/>
+ <Button
+ android:text="@string/audio_general_no"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:id="@+id/headset_analog_port_no"/>
+ </LinearLayout>
+ </LinearLayout>
+
+ <!-- Device Connection -->
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/headset_analog_name"/>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/headset_analog_plug_message"/>
+
+ <!-- Player Controls -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginLeft="10dp">
+ <Button
+ android:text="@string/analog_headset_play"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:id="@+id/headset_analog_play"/>
+ <Button
+ android:text="@string/analog_headset_stop"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:id="@+id/headset_analog_stop"/>
+ </LinearLayout>
+ </LinearLayout>
+
+ <!-- Playback Status -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/analog_headset_success_question"/>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginLeft="10dp">
+ <Button
+ android:text="@string/audio_general_yes"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:id="@+id/headset_analog_play_yes"/>
+ <Button
+ android:text="@string/audio_general_no"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:id="@+id/headset_analog_play_no"/>
+ </LinearLayout>
+ </LinearLayout>
+
+ <!-- Keycodes -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/analog_headset_keycodes_label"/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginLeft="10dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/analog_headset_headsethook"
+ android:paddingHorizontal="10dp"
+ android:id="@+id/headset_keycode_headsethook"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/analog_headset_volup"
+ android:paddingHorizontal="10dp"
+ android:id="@+id/headset_keycode_volume_up"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/analog_headset_voldown"
+ android:paddingHorizontal="10dp"
+ android:id="@+id/headset_keycode_volume_down"/>
+ </LinearLayout>
+ </LinearLayout>
+ <include layout="@layout/pass_fail_buttons" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/audio_input_routingnotifications_test.xml b/apps/CtsVerifier/res/layout/audio_input_routingnotifications_test.xml
index e09475c..16943c9 100644
--- a/apps/CtsVerifier/res/layout/audio_input_routingnotifications_test.xml
+++ b/apps/CtsVerifier/res/layout/audio_input_routingnotifications_test.xml
@@ -25,31 +25,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scrollbars="vertical"
- android:gravity="bottom"
- android:id="@+id/audio_general_headset_port_exists"
- android:text="@string/audio_general_headset_port_exists" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/audio_general_headset_no"
- android:text="@string/audio_general_headset_no" />
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/audio_general_headset_yes"
- android:text="@string/audio_general_headset_yes" />
- </LinearLayout>
+ <include layout="@layout/audio_wired_query_layout" />
<TextView
android:layout_width="match_parent"
diff --git a/apps/CtsVerifier/res/layout/audio_output_routingnotifications_test.xml b/apps/CtsVerifier/res/layout/audio_output_routingnotifications_test.xml
index dc55e2a..1cdb131 100644
--- a/apps/CtsVerifier/res/layout/audio_output_routingnotifications_test.xml
+++ b/apps/CtsVerifier/res/layout/audio_output_routingnotifications_test.xml
@@ -25,32 +25,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scrollbars="vertical"
- android:gravity="bottom"
- android:id="@+id/audio_general_headset_port_exists"
- android:text="@string/audio_general_headset_port_exists" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/audio_general_headset_no"
- android:text="@string/audio_general_headset_no" />
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/audio_general_headset_yes"
- android:text="@string/audio_general_headset_yes" />
-
- </LinearLayout>
+ <include layout="@layout/audio_wired_query_layout" />
<TextView
android:layout_width="match_parent"
diff --git a/apps/CtsVerifier/res/layout/audio_wired_query_layout.xml b/apps/CtsVerifier/res/layout/audio_wired_query_layout.xml
new file mode 100644
index 0000000..bc8038b
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/audio_wired_query_layout.xml
@@ -0,0 +1,32 @@
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scrollbars="vertical"
+ android:gravity="bottom"
+ android:id="@+id/audio_wired_port_exists"
+ android:text="@string/audio_wired_exists" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/audio_wired_no"
+ android:text="@string/audio_wired_no" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/audio_wired_yes"
+ android:text="@string/audio_wired_yes" />
+ </LinearLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/tts_main.xml b/apps/CtsVerifier/res/layout/tts_main.xml
new file mode 100644
index 0000000..f4f1cab
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/tts_main.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:padding="16dp">
+
+ <ScrollView android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <TextView android:id="@+id/status"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/tts_test_steps" />
+
+ </ScrollView>
+
+ <Button android:id="@+id/accessibility_settings_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/tts_accessibility_settings_button" />
+
+ </LinearLayout>
+
+ <include layout="@layout/pass_fail_buttons" />
+
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 4a0314c..35666ce 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -4896,9 +4896,9 @@
<string name="midiFailedJNILbl">Failed - JNI Error.</string>
<!-- Audio general text -->
- <string name="audio_general_headset_port_exists">Does this device have a headset port?</string>
- <string name="audio_general_headset_no">No</string>
- <string name="audio_general_headset_yes">Yes</string>
+ <string name="audio_wired_exists">Does this device support wired USB or Analog audio peripherals?</string>
+ <string name="audio_wired_no">No</string>
+ <string name="audio_wired_yes">Yes</string>
<string name="audio_general_deficiency_found">WARNING: Some results show potential deficiencies on the system.
Please consider addressing them for a future release.</string>
<string name="audio_general_test_passed">Test Result: Successful</string>
@@ -5055,7 +5055,24 @@
<string name="vr_test_usb_noise_instructions">TEST USB NOISE: Connect USB microphone and position it right next to microphone under test.
Position speakers 40 cms from device under test. Press [PLAY] to play broadband white noise. Press [TEST]</string>
-
+ <!-- Analog Headset Test -->
+ <string name="audio_headset_audio_test">Analog Headset Audio Test</string>
+ <string name="analog_headset_query">Does this Android device have an analog headset jack?</string>
+ <string name="analog_headset_play">Play</string>
+ <string name="analog_headset_stop">Stop</string>
+ <string name="analog_headset_success_question">Was the audio correctly played through the headset/headphones?</string>
+ <string name="analog_headset_keycodes_label">Headset Keycodes</string>
+ <string name="analog_headset_headsethook">HEADSETHOOK</string>
+ <string name="analog_headset_volup">VOLUME_UP</string>
+ <string name="analog_headset_voldown">VOLUME_DOWN</string>
+ <string name="analog_headset_test">Analog Headset Test</string>
+ <string name="analog_headset_test_info">
+ This test tests the following functionality with respect to wired analog headset/headphones.\n
+ 1. Correct audio playback.\n
+ 2. Plug intents.\n
+ 3. Headset keycodes.\n
+ To run this test it is necessary to have an Android device with a 3.5mm analog headset jack and a compatible analog headset with Hook, Volume Up and Volume Down buttons.
+ </string>
<!-- Audio AEC Test -->
<string name="audio_aec_test">Audio Acoustic Echo Cancellation (AEC) Test</string>
<string name="audio_aec_info">
@@ -5642,6 +5659,15 @@
Note: Devices declaring feature android.hardware.audio.pro MUST implement USB host mode (CDD 5.10 C-1-3) and if they omit a 4 conductor 3.5mm audio jack MUST support USB audio class (CDD 5.10 C-3-1)
</string>
+ <string name="loopback_test_question">Does this device allow for the connection of a loopback audio peripheral?</string>
+ <string name="loopback_dlg_caption">Loopback Peripheral Required</string>
+ <string name="loopback_dlg_text">This test requires an Audio Loopback Peripheral to be connected to the device.\n
+ This can be done in one of three ways:\n
+ 1. Connect a <a href="https://source.android.com/devices/audio/latency/loopback">Loopback Plug</a> to the 3.5mm headset jack.\n
+ 2. Connect a <a href="https://source.android.com/devices/audio/latency/loopback">Loopback Plug</a> to a USB-C headset adapter.\n
+ 3. Connect a USB audio interface peripheral and connect the outputs to the inputs with an audio patch cable.
+ </string>
+
<string name="display_cutout_test">DisplayCutout Test</string>
<string name="display_cutout_test_instruction">\n
This test is to make sure that the area inside the safe insets from the DisplayCutout should be
@@ -5651,12 +5677,21 @@
2. All buttons are clickable. \n
</string>
- <string name="loopback_test_question">Does this device allow for the connection of a loopback audio peripheral?</string>
- <string name="loopback_dlg_caption">Loopback Peripheral Required</string>
- <string name="loopback_dlg_text">This test requires an Audio Loopback Peripheral to be connected to the device.\n
- This can be done in one of three ways:\n
- 1. Connect a <a href="https://source.android.com/devices/audio/latency/loopback">Loopback Plug</a> to the 3.5mm headset jack.\n
- 2. Connect a <a href="https://source.android.com/devices/audio/latency/loopback">Loopback Plug</a> to a USB-C headset adapter.\n
- 3. Connect a USB audio interface peripheral and connect the outputs to the inputs with an audio patch cable.
+ <!-- TTS Test Resources -->
+ <string name="tts_test">TTS Test</string>
+ <string name="tts_test_info">
+ 1. Install the CtsTtsEngineSelectorTestHelper and CtsTtsEngineSelectorTestHelper2 apps on the device.\n
+ 2. Click on the "Go To Accessibility Settings" button.\n
+ 3. Go to Text-to-speech output > Preferred engine.\n
+ 4. Ensure that two engines are listed, both named "TTS CTS Test Helper App".\n
+ 5. Ensure that each engine can be selected.
</string>
+ <string name="tts_test_steps">
+ 1. Install the CtsTtsEngineSelectorTestHelper and CtsTtsEngineSelectorTestHelper2 apps on the device.\n
+ 2. Click on the "Go To Accessibility Settings" button.\n
+ 3. Go to Text-to-speech output > Preferred engine.\n
+ 4. Ensure that two engines are listed, both named "TTS CTS Test Helper App".\n
+ 5. Ensure that each engine can be selected.
+ </string>
+ <string name="tts_accessibility_settings_button">Go To Accessibility Settings</string>
</resources>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AnalogHeadsetAudioActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AnalogHeadsetAudioActivity.java
new file mode 100644
index 0000000..999c4cb
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AnalogHeadsetAudioActivity.java
@@ -0,0 +1,406 @@
+/*
+ * 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 com.android.cts.verifier.audio;
+
+import com.android.compatibility.common.util.ReportLog;
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+
+import com.android.cts.verifier.audio.audiolib.SignalGenerator;
+import com.android.cts.verifier.audio.audiolib.StreamPlayer;
+import com.android.cts.verifier.audio.audiolib.WaveTableFloatFiller;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+import android.graphics.Color;
+
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
+import android.media.AudioManager;
+
+import android.os.Bundle;
+import android.os.Handler;
+
+import android.util.Log;
+
+import android.view.KeyEvent;
+import android.view.View;
+
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R; // needed to access resource in CTSVerifier project namespace.
+
+public class AnalogHeadsetAudioActivity
+ extends PassFailButtons.Activity
+ implements View.OnClickListener {
+ private static final String TAG = AnalogHeadsetAudioActivity.class.getSimpleName();
+ private static final boolean DEBUG = false;
+
+ private AudioManager mAudioManager;
+
+ // UI
+ private Button mHasAnalogPortYesBtn;
+ private Button mHasAnalogPortNoBtn;
+
+ private Button mPlayButton;
+ private Button mStopButton;
+ private Button mPlaybackSuccessBtn;
+ private Button mPlaybackFailBtn;
+
+ private TextView mHeadsetNameText;
+ private TextView mHeadsetPlugMessage;
+
+ private TextView mHeadsetHookText;
+ private TextView mHeadsetVolUpText;
+ private TextView mHeadsetVolDownText;
+
+ // Devices
+ private AudioDeviceInfo mHeadsetDeviceInfo;
+ private boolean mHasHeadsetPort;
+ private boolean mPlugIntentReceived;
+ private boolean mPlaybackSuccess;
+
+ // Intents
+ private HeadsetPlugReceiver mHeadsetPlugReceiver;
+
+ // Buttons
+ private boolean mHasHeadsetHook;
+ private boolean mHasVolUp;
+ private boolean mHasVolDown;
+
+ // Player
+ protected boolean mIsPlaying = false;
+ protected StreamPlayer mPlayer = null;
+ protected WaveTableFloatFiller mFiller = null;
+
+ protected float[] mWavBuffer = null;
+
+ // A more than adequate (and non-critical) size.
+ private static final int WAVBUFF_SIZE_IN_SAMPLES = 2048;
+
+ public AnalogHeadsetAudioActivity() {
+ super();
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.audio_headset_audio_activity);
+
+ mHeadsetNameText = (TextView)findViewById(R.id.headset_analog_name);
+ mHeadsetPlugMessage = (TextView)findViewById(R.id.headset_analog_plug_message);
+
+ // Analog Port?
+ mHasAnalogPortYesBtn = (Button)findViewById(R.id.headset_analog_port_yes);
+ mHasAnalogPortYesBtn.setOnClickListener(this);
+ mHasAnalogPortNoBtn = (Button)findViewById(R.id.headset_analog_port_no);
+ mHasAnalogPortNoBtn.setOnClickListener(this);
+
+ // Player Controls.
+ mPlayButton = (Button)findViewById(R.id.headset_analog_play);
+ mPlayButton.setOnClickListener(this);
+ mStopButton = (Button)findViewById(R.id.headset_analog_stop);
+ mStopButton.setOnClickListener(this);
+
+ // Play Status
+ mPlaybackSuccessBtn = (Button)findViewById(R.id.headset_analog_play_yes);
+ mPlaybackSuccessBtn.setOnClickListener(this);
+ mPlaybackFailBtn = (Button)findViewById(R.id.headset_analog_play_no);
+ mPlaybackFailBtn.setOnClickListener(this);
+
+ // Keycodes
+ mHeadsetHookText = (TextView)findViewById(R.id.headset_keycode_headsethook);
+ mHeadsetVolUpText = (TextView)findViewById(R.id.headset_keycode_volume_up);
+ mHeadsetVolDownText = (TextView)findViewById(R.id.headset_keycode_volume_down);
+
+ mAudioManager = (AudioManager)getSystemService(AUDIO_SERVICE);
+
+ setupPlayer();
+
+ mAudioManager.registerAudioDeviceCallback(new ConnectListener(), new Handler());
+
+ mHeadsetPlugReceiver = new HeadsetPlugReceiver();
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(Intent.ACTION_HEADSET_PLUG);
+ registerReceiver(mHeadsetPlugReceiver, filter);
+
+ showKeyMessagesState();
+
+ setInfoResources(R.string.analog_headset_test, R.string.analog_headset_test_info, -1);
+
+ getPassButton().setEnabled(false);
+ }
+
+ //
+ // Reporting
+ //
+ private boolean calculatePass() {
+ if (!mHasHeadsetPort) {
+ return true;
+ } else {
+ return mPlugIntentReceived &&
+ mHeadsetDeviceInfo != null &&
+ mPlaybackSuccess &&
+ mHasHeadsetHook && mHasVolUp && mHasVolDown;
+ }
+ }
+
+ private void reportHeadsetPort(boolean has) {
+ mHasHeadsetPort = has;
+ getReportLog().addValue(
+ "User Reports Headset Port",
+ has ? 1 : 0,
+ ResultType.NEUTRAL,
+ ResultUnit.NONE);
+ if (has) {
+ mHasAnalogPortNoBtn.setEnabled(false);
+ } else {
+ mHasAnalogPortYesBtn.setEnabled(false);
+ }
+ enablePlayerButtons(has && mHeadsetDeviceInfo != null);
+
+ if (!has) {
+ // no port, so can't test. Let them pass
+ getPassButton().setEnabled(true);
+ }
+ }
+
+ private void reportPlugIntent(Intent intent) {
+ // [C-1-4] MUST trigger ACTION_HEADSET_PLUG upon a plug insert,
+ // but only after all contacts on plug are touching their relevant segments on the jack.
+ mPlugIntentReceived = true;
+
+ // state - 0 for unplugged, 1 for plugged.
+ // name - Headset type, human readable string
+ // microphone - 1 if headset has a microphone, 0 otherwise
+
+ int state = intent.getIntExtra("state", -1);
+ if (state != -1) {
+
+ StringBuilder sb = new StringBuilder();
+ sb.append("ACTION_HEADSET_PLUG received - " + (state == 0 ? "Unplugged" : "Plugged"));
+
+ String name = intent.getStringExtra("name");
+ if (name != null) {
+ sb.append(" - " + name);
+ }
+
+ int hasMic = intent.getIntExtra("microphone", 0);
+ if (hasMic == 1) {
+ sb.append(" [mic]");
+ }
+
+ mHeadsetPlugMessage.setText(sb.toString());
+ }
+ getReportLog().addValue(
+ "ACTION_HEADSET_PLUG Intent Received. State: ",
+ state,
+ ResultType.NEUTRAL,
+ ResultUnit.NONE);
+ }
+
+ private void reportPlaybackStatus(boolean success) {
+ // [C-1-1] MUST support audio playback to stereo headphones
+ // and stereo headsets with a microphone.
+ mPlaybackSuccess = success;
+ if (success) {
+ mPlaybackFailBtn.setEnabled(false);
+ } else {
+ mPlaybackSuccessBtn.setEnabled(false);
+ }
+ getPassButton().setEnabled(calculatePass());
+
+ getReportLog().addValue(
+ "User reported headset/headphones playback",
+ success ? 1 : 0,
+ ResultType.NEUTRAL,
+ ResultUnit.NONE);
+ }
+
+ //
+ // UI
+ //
+ private void showConnectedDevice() {
+ if (mHeadsetDeviceInfo != null) {
+ mHeadsetNameText.setText(
+ mHeadsetDeviceInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADSET
+ ? "Headset Connected"
+ : "Headphones Connected");
+ } else {
+ mHeadsetNameText.setText("No Headset/Headphones Connected");
+ }
+ }
+
+ private void enablePlayerButtons(boolean enabled) {
+ mPlayButton.setEnabled(enabled);
+ mStopButton.setEnabled(enabled);
+ }
+
+ private void showKeyMessagesState() {
+ mHeadsetHookText.setTextColor(mHasHeadsetHook ? Color.WHITE : Color.GRAY);
+ mHeadsetVolUpText.setTextColor(mHasVolUp ? Color.WHITE : Color.GRAY);
+ mHeadsetVolDownText.setTextColor(mHasVolDown ? Color.WHITE : Color.GRAY);
+ }
+
+ //
+ // Player
+ //
+ protected void setupPlayer() {
+ // the +1 is so we can repeat the 0th sample and simplify the interpolation calculation.
+ mWavBuffer = new float[WAVBUFF_SIZE_IN_SAMPLES + 1];
+
+ SignalGenerator.fillFloatSine(mWavBuffer);
+ mFiller = new WaveTableFloatFiller(mWavBuffer);
+
+ mPlayer = new StreamPlayer(this);
+ }
+
+ protected void startPlay() {
+ if (!mIsPlaying) {
+ int numChans = 2;
+ mPlayer.open(numChans, mFiller);
+ mPlayer.start();
+ mIsPlaying = true;
+ }
+ }
+
+ protected void stopPlay() {
+ if (mIsPlaying) {
+ mPlayer.stop();
+ mPlayer.close();
+ mIsPlaying = false;
+ }
+ }
+
+ //
+ // View.OnClickHandler
+ //
+ @Override
+ public void onClick(View view) {
+ switch (view.getId()) {
+ case R.id.headset_analog_port_yes:
+ reportHeadsetPort(true);
+ break;
+
+ case R.id.headset_analog_port_no:
+ reportHeadsetPort(false);
+ break;
+
+ case R.id.headset_analog_play:
+ startPlay();
+ break;
+
+ case R.id.headset_analog_stop:
+ stopPlay();
+ break;
+
+ case R.id.headset_analog_play_yes:
+ reportPlaybackStatus(true);
+ break;
+
+ case R.id.headset_analog_play_no:
+ reportPlaybackStatus(false);
+ break;
+ }
+ }
+
+ //
+ // Devices
+ //
+ private void scanPeripheralList(AudioDeviceInfo[] devices) {
+ mHeadsetDeviceInfo = null;
+ for(AudioDeviceInfo devInfo : devices) {
+ if (devInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADSET ||
+ devInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADPHONES) {
+ mHeadsetDeviceInfo = devInfo;
+
+ getReportLog().addValue(
+ (devInfo.getType() == AudioDeviceInfo.TYPE_WIRED_HEADSET
+ ? "Headset" : "Headphones") + " connected",
+ 0,
+ ResultType.NEUTRAL,
+ ResultUnit.NONE);
+ break;
+ }
+ }
+
+ showConnectedDevice();
+ enablePlayerButtons(mHeadsetDeviceInfo != null);
+ }
+
+ private class ConnectListener extends AudioDeviceCallback {
+ /*package*/ ConnectListener() {}
+
+ //
+ // AudioDevicesManager.OnDeviceConnectionListener
+ //
+ @Override
+ public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+ Log.i(TAG, "onAudioDevicesAdded() num:" + addedDevices.length);
+
+ scanPeripheralList(mAudioManager.getDevices(AudioManager.GET_DEVICES_ALL));
+ }
+
+ @Override
+ public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+ Log.i(TAG, "onAudioDevicesRemoved() num:" + removedDevices.length);
+
+ scanPeripheralList(mAudioManager.getDevices(AudioManager.GET_DEVICES_ALL));
+ }
+ }
+
+ private class HeadsetPlugReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ reportPlugIntent(intent);
+ }
+ }
+
+ //
+ // Keycodes
+ //
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ // Log.i(TAG, "onKeyDown(" + keyCode + ")");
+ switch (keyCode) {
+ case KeyEvent.KEYCODE_HEADSETHOOK:
+ mHasHeadsetHook = true;
+ showKeyMessagesState();
+ getPassButton().setEnabled(calculatePass());
+ break;
+
+ case KeyEvent.KEYCODE_VOLUME_UP:
+ mHasVolUp = true;
+ showKeyMessagesState();
+ getPassButton().setEnabled(calculatePass());
+ break;
+
+ case KeyEvent.KEYCODE_VOLUME_DOWN:
+ mHasVolDown = true;
+ showKeyMessagesState();
+ getPassButton().setEnabled(calculatePass());
+ break;
+ }
+ return super.onKeyDown(keyCode, event);
+ }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
index 1ee118d..5af519b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
@@ -51,8 +51,8 @@
OnBtnClickListener mBtnClickListener = new OnBtnClickListener();
- Button mHeadsetPortYes;
- Button mHeadsetPortNo;
+ Button mWiredPortYes;
+ Button mWiredPortNo;
Button mLoopbackPlugReady;
Button mTestButton;
@@ -106,19 +106,19 @@
Log.i(TAG, "audio loopback test");
startAudioTest();
break;
- case R.id.audio_general_headset_yes:
- Log.i(TAG, "User confirms Headset Port existence");
+ case R.id.audio_wired_yes:
+ Log.i(TAG, "User confirms wired Port existence");
mLoopbackPlugReady.setEnabled(true);
recordHeasetPortFound(true);
- mHeadsetPortYes.setEnabled(false);
- mHeadsetPortNo.setEnabled(false);
+ mWiredPortYes.setEnabled(false);
+ mWiredPortNo.setEnabled(false);
break;
- case R.id.audio_general_headset_no:
- Log.i(TAG, "User denies Headset Port existence");
+ case R.id.audio_wired_no:
+ Log.i(TAG, "User denies wired Port existence");
recordHeasetPortFound(false);
getPassButton().setEnabled(true);
- mHeadsetPortYes.setEnabled(false);
- mHeadsetPortNo.setEnabled(false);
+ mWiredPortYes.setEnabled(false);
+ mWiredPortNo.setEnabled(false);
break;
}
}
@@ -129,10 +129,10 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.audio_frequency_line_activity);
- mHeadsetPortYes = (Button)findViewById(R.id.audio_general_headset_yes);
- mHeadsetPortYes.setOnClickListener(mBtnClickListener);
- mHeadsetPortNo = (Button)findViewById(R.id.audio_general_headset_no);
- mHeadsetPortNo.setOnClickListener(mBtnClickListener);
+ mWiredPortYes = (Button)findViewById(R.id.audio_wired_yes);
+ mWiredPortYes.setOnClickListener(mBtnClickListener);
+ mWiredPortNo = (Button)findViewById(R.id.audio_wired_no);
+ mWiredPortNo.setOnClickListener(mBtnClickListener);
mLoopbackPlugReady = (Button)findViewById(R.id.audio_frequency_line_plug_ready_btn);
mLoopbackPlugReady.setOnClickListener(mBtnClickListener);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputDeviceNotificationsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputDeviceNotificationsActivity.java
index e253635..64c2314 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputDeviceNotificationsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputDeviceNotificationsActivity.java
@@ -36,7 +36,7 @@
* Tests Audio Device Connection events for output by prompting the user to insert/remove a
* wired headset (or microphone) and noting the presence (or absence) of notifications.
*/
-public class AudioInputDeviceNotificationsActivity extends HeadsetHonorSystemActivity {
+public class AudioInputDeviceNotificationsActivity extends AudioWiredDeviceBaseActivity {
Context mContext;
TextView mConnectView;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputRoutingNotificationsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputRoutingNotificationsActivity.java
index eefa9e4..69a511f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputRoutingNotificationsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputRoutingNotificationsActivity.java
@@ -39,7 +39,7 @@
/**
* Tests AudioRecord (re)Routing messages.
*/
-public class AudioInputRoutingNotificationsActivity extends HeadsetHonorSystemActivity {
+public class AudioInputRoutingNotificationsActivity extends AudioWiredDeviceBaseActivity {
private static final String TAG = "AudioInputRoutingNotificationsActivity";
Button recordBtn;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputDeviceNotificationsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputDeviceNotificationsActivity.java
index ad8ba68..0e4f6da 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputDeviceNotificationsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputDeviceNotificationsActivity.java
@@ -36,7 +36,7 @@
* Tests Audio Device Connection events for output devices by prompting the user to
* insert/remove a wired headset and noting the presence (or absence) of notifications.
*/
-public class AudioOutputDeviceNotificationsActivity extends HeadsetHonorSystemActivity {
+public class AudioOutputDeviceNotificationsActivity extends AudioWiredDeviceBaseActivity {
Context mContext;
TextView mConnectView;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputRoutingNotificationsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputRoutingNotificationsActivity.java
index a6d8846..016303f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputRoutingNotificationsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputRoutingNotificationsActivity.java
@@ -39,7 +39,7 @@
/**
* Tests AudioTrack and AudioRecord (re)Routing messages.
*/
-public class AudioOutputRoutingNotificationsActivity extends HeadsetHonorSystemActivity {
+public class AudioOutputRoutingNotificationsActivity extends AudioWiredDeviceBaseActivity {
private static final String TAG = "AudioOutputRoutingNotificationsActivity";
Context mContext;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/HeadsetHonorSystemActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioWiredDeviceBaseActivity.java
similarity index 68%
rename from apps/CtsVerifier/src/com/android/cts/verifier/audio/HeadsetHonorSystemActivity.java
rename to apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioWiredDeviceBaseActivity.java
index a82b994..2e308f2 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/HeadsetHonorSystemActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioWiredDeviceBaseActivity.java
@@ -34,18 +34,17 @@
import android.view.View.OnClickListener;
import android.widget.Button;
-//import android.widget.TextView;
-abstract class HeadsetHonorSystemActivity extends PassFailButtons.Activity {
- private static final String TAG = "HeadsetHonorSystemActivity";
+abstract class AudioWiredDeviceBaseActivity extends PassFailButtons.Activity {
+ private static final String TAG = AudioWiredDeviceBaseActivity.class.getSimpleName();
private OnBtnClickListener mBtnClickListener = new OnBtnClickListener();
abstract protected void enableTestButtons(boolean enabled);
- private void recordHeadsetPortFound(boolean found) {
+ private void recordWiredPortFound(boolean found) {
getReportLog().addValue(
- "User Reported Headset Port",
+ "User Reported Wired Port",
found ? 1.0 : 0,
ResultType.NEUTRAL,
ResultUnit.NONE);
@@ -53,10 +52,8 @@
protected void setup() {
// The "Honor" system buttons
- ((Button)findViewById(R.id.audio_general_headset_no)).
- setOnClickListener(mBtnClickListener);
- ((Button)findViewById(R.id.audio_general_headset_yes)).
- setOnClickListener(mBtnClickListener);
+ ((Button)findViewById(R.id.audio_wired_no)).setOnClickListener(mBtnClickListener);
+ ((Button)findViewById(R.id.audio_wired_yes)).setOnClickListener(mBtnClickListener);
enableTestButtons(false);
}
@@ -65,16 +62,16 @@
@Override
public void onClick(View v) {
switch (v.getId()) {
- case R.id.audio_general_headset_no:
- Log.i(TAG, "User denies Headset Port existence");
+ case R.id.audio_wired_no:
+ Log.i(TAG, "User denies wired device existence");
enableTestButtons(false);
- recordHeadsetPortFound(false);
+ recordWiredPortFound(false);
break;
- case R.id.audio_general_headset_yes:
- Log.i(TAG, "User confirms Headset Port existence");
+ case R.id.audio_wired_yes:
+ Log.i(TAG, "User confirms wired device existence");
enableTestButtons(true);
- recordHeadsetPortFound(true);
+ recordWiredPortFound(true);
break;
}
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java
index 8f0a9b0..5a2846c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java
@@ -52,9 +52,6 @@
protected final boolean mIsMandatedRequired;
- // This will be overriden...
- protected int mSystemSampleRate = 48000;
-
// Widgets
private TextView mProfileNameTx;
private TextView mProfileDescriptionTx;
@@ -138,9 +135,6 @@
mAudioManager = (AudioManager)getSystemService(AUDIO_SERVICE);
mAudioManager.registerAudioDeviceCallback(new ConnectListener(), new Handler());
-
- mSystemSampleRate = Integer.parseInt(
- mAudioManager.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE));
}
protected void connectPeripheralStatusWidgets() {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayerActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayerActivity.java
index fc666aa..d76ff95 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayerActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayerActivity.java
@@ -28,8 +28,6 @@
public abstract class USBAudioPeripheralPlayerActivity extends USBAudioPeripheralActivity {
private static final String TAG = "USBAudioPeripheralPlayerActivity";
- protected int mSystemBufferSize;
-
// Player
protected boolean mIsPlaying = false;
protected StreamPlayer mPlayer = null;
@@ -46,8 +44,6 @@
}
protected void setupPlayer() {
- mSystemBufferSize =
- StreamPlayer.calcNumBurstFrames((AudioManager)getSystemService(Context.AUDIO_SERVICE));
// the +1 is so we can repeat the 0th sample and simplify the interpolation calculation.
mWavBuffer = new float[WAVBUFF_SIZE_IN_SAMPLES + 1];
@@ -55,13 +51,13 @@
SignalGenerator.fillFloatSine(mWavBuffer);
mFiller = new WaveTableFloatFiller(mWavBuffer);
- mPlayer = new StreamPlayer();
+ mPlayer = new StreamPlayer(this);
}
protected void startPlay() {
if (mOutputDevInfo != null && !mIsPlaying) {
int numChans = USBDeviceInfoHelper.calcMaxChannelCount(mOutputDevInfo);
- mPlayer.open(numChans, mSystemSampleRate, mSystemBufferSize, mFiller);
+ mPlayer.open(numChans, mFiller);
mPlayer.start();
mIsPlaying = true;
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
index d51eac3..0c00294 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
@@ -16,7 +16,9 @@
package com.android.cts.verifier.audio;
+import android.content.Context;
import android.graphics.Color;
+import android.media.AudioManager;
import android.os.Bundle;
import android.os.Looper;
import android.os.Message;
@@ -24,6 +26,7 @@
import android.view.View;
import android.widget.Button;
+import com.android.cts.verifier.audio.audiolib.StreamPlayer;
import com.android.cts.verifier.audio.audiolib.StreamRecorder;
import com.android.cts.verifier.audio.audiolib.StreamRecorderListener;
import com.android.cts.verifier.audio.audiolib.WaveScopeView;
@@ -72,7 +75,7 @@
}
if (mRecorder == null) {
- mRecorder = new StreamRecorder();
+ mRecorder = new StreamRecorder(this);
} else if (mRecorder.isRecording()) {
mRecorder.stop();
}
@@ -84,7 +87,7 @@
}
Log.i(TAG, " numChans:" + numChans);
- if (mRecorder.open(numChans, mSystemSampleRate, mSystemBufferSize)) {
+ if (mRecorder.open(numChans)) {
connectWaveView(); // Setup the WaveView
mIsRecording = mRecorder.start();
@@ -130,7 +133,7 @@
setupPlayer();
- mRecorder = new StreamRecorder();
+ mRecorder = new StreamRecorder(this);
mRecordListener = new RecordListener();
mWaveView = (WaveScopeView)findViewById(R.id.uap_recordWaveView);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioSystemParams.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioSystemParams.java
new file mode 100644
index 0000000..5cb7bdf
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioSystemParams.java
@@ -0,0 +1,57 @@
+/*
+ * 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 com.android.cts.verifier.audio.audiolib;
+
+import android.content.Context;
+import android.media.AudioManager;
+
+class AudioSystemParams {
+ // This value will be calculated in init()
+ private int mSystemSampleRate;
+
+ // This value will be calculated in init()
+ private int mSystemBufferFrames;
+
+ // The system burst buffer size as reported by AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER
+ // This value will be calculated in init()
+ private int mSystemBurstFrames;
+
+ public void init(Context context) {
+ AudioManager audioManager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
+
+ String framesPerBuffer = audioManager.getProperty(
+ AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
+ mSystemBurstFrames = Integer.parseInt(framesPerBuffer, 10);
+
+ mSystemBufferFrames = mSystemBurstFrames;
+
+ mSystemSampleRate = Integer.parseInt(
+ audioManager.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE));
+ }
+
+ public int getSystemSampleRate() {
+ return mSystemSampleRate;
+ }
+
+ public int getSystemBufferFrames() {
+ return mSystemBufferFrames;
+ }
+
+ public int getSystemBurstFrames() {
+ return mSystemBurstFrames;
+ }
+}
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java
index bebc2a7..cf68e18 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java
@@ -31,6 +31,10 @@
@SuppressWarnings("unused")
private static String TAG = "StreamPlayer";
+ // System
+ private AudioSystemParams mSystemAudioParams = new AudioSystemParams();
+
+ // Player
private int mSampleRate;
private int mNumChans;
@@ -50,7 +54,9 @@
private AudioDeviceInfo mRoutingDevice;
- public StreamPlayer() {}
+ public StreamPlayer(Context context) {
+ mSystemAudioParams.init(context);
+ }
public int getSampleRate() { return mSampleRate; }
public int getNumBurstFrames() { return mNumBurstFrames; }
@@ -98,21 +104,16 @@
/ AudioUtils.calcFrameSizeInBytes(encoding, numChannels);
}
- public static int calcNumBurstFrames(AudioManager am) {
- String framesPerBuffer = am.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
- return Integer.parseInt(framesPerBuffer, 10);
- }
-
- public boolean open(int numChans, int sampleRate, int numBurstFrames, AudioFiller filler) {
+ public boolean open(int numChans, AudioFiller filler) {
// Log.i(TAG, "StreamPlayer.open(chans:" + numChans + ", rate:" + sampleRate +
// ", frames:" + numBurstFrames);
mNumChans = numChans;
- mSampleRate = sampleRate;
- mNumBurstFrames = numBurstFrames;
+ mSampleRate = mSystemAudioParams.getSystemSampleRate();
+ mNumBurstFrames = mSystemAudioParams.getSystemBurstFrames();
mNumAudioTrackFrames =
- calcNumBufferFrames(sampleRate, numChans, AudioFormat.ENCODING_PCM_FLOAT);
+ calcNumBufferFrames(mSampleRate, numChans, AudioFormat.ENCODING_PCM_FLOAT);
mFiller = filler;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java
index 2ec742e..0336ba1 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java
@@ -16,8 +16,11 @@
package com.android.cts.verifier.audio.audiolib;
+import android.content.Context;
+
import android.media.AudioDeviceInfo;
import android.media.AudioFormat;
+import android.media.AudioManager;
import android.media.AudioRecord;
import android.util.Log;
@@ -31,9 +34,11 @@
@SuppressWarnings("unused")
private static final String TAG = "StreamRecorder";
+ // System
+ private AudioSystemParams mSystemAudioParams = new AudioSystemParams();
+
// Sample Buffer
private float[] mBurstBuffer;
- private int mNumBurstFrames;
private int mNumChannels;
// Recording attributes
@@ -48,9 +53,12 @@
private AudioDeviceInfo mRoutingDevice = null;
- public StreamRecorder() {}
+ public StreamRecorder(Context context) {
+ mSystemAudioParams.init(context);
- public int getNumBurstFrames() { return mNumBurstFrames; }
+ }
+
+// public int getNumBmNumBurstFramesurstFrames() { return ; }
public int getSampleRate() { return mSampleRate; }
/*
@@ -116,9 +124,9 @@
}
}
- private boolean open_internal(int numChans, int sampleRate) {
+ private boolean open_internal(int numChans) {
mNumChannels = numChans;
- mSampleRate = sampleRate;
+ mSampleRate = mSystemAudioParams.getSystemSampleRate();
final int frameSize =
AudioUtils.calcFrameSizeInBytes(AudioFormat.ENCODING_PCM_FLOAT, mNumChannels);
@@ -152,11 +160,10 @@
}
}
- public boolean open(int numChans, int sampleRate, int numBurstFrames) {
- boolean sucess = open_internal(numChans, sampleRate);
- if (sucess) {
- mNumBurstFrames = numBurstFrames;
- mBurstBuffer = new float[mNumBurstFrames * mNumChannels];
+ public boolean open(int numChans) {
+ boolean success = open_internal(numChans);
+ if (success) {
+ mBurstBuffer = new float[mSystemAudioParams.getSystemBurstFrames() * mNumChannels];
// put some non-zero data in the burst buffer.
// this is to verify that the record is putting SOMETHING into each channel.
for(int index = 0; index < mBurstBuffer.length; index++) {
@@ -164,7 +171,7 @@
}
}
- return sucess;
+ return success;
}
public void close() {
@@ -210,7 +217,7 @@
private class StreamRecorderRunnable implements Runnable {
@Override
public void run() {
- final int numBurstSamples = mNumBurstFrames * mNumChannels;
+ final int numBurstSamples = mSystemAudioParams.getSystemBurstFrames() * mNumChannels;
while (mRecording) {
int numReadSamples = mAudioRecord.read(
mBurstBuffer, 0, numBurstSamples, AudioRecord.READ_BLOCKING);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/battery/OWNERS b/apps/CtsVerifier/src/com/android/cts/verifier/battery/OWNERS
new file mode 100644
index 0000000..854a7f4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/battery/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 330055
+omakoto@google.com
+kwekua@google.com
+yamasani@google.com
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/displaycutout/OWNERS b/apps/CtsVerifier/src/com/android/cts/verifier/displaycutout/OWNERS
new file mode 100644
index 0000000..545d263
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/displaycutout/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 339570
+roosa@google.com
+shawnlin@google.com
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/speech/tts/TtsTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/speech/tts/TtsTestActivity.java
new file mode 100644
index 0000000..f95162d
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/speech/tts/TtsTestActivity.java
@@ -0,0 +1,39 @@
+package com.android.cts.verifier.speech.tts;
+
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.view.View;
+import android.widget.Button;
+import androidx.annotation.Nullable;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+/**
+ * Guide the user to run test for the TTS API.
+ */
+public class TtsTestActivity extends PassFailButtons.Activity {
+
+ private Button mAccessibilitySettingsButton;
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.tts_main);
+ setInfoResources(R.string.tts_test, R.string.tts_test_info, -1);
+ setPassFailButtonClickListeners();
+
+ mAccessibilitySettingsButton = findViewById(R.id.accessibility_settings_button);
+ mAccessibilitySettingsButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ try {
+ startActivityForResult(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS), 0);
+ } catch (ActivityNotFoundException e) {}
+ }
+ });
+ }
+
+}
diff --git a/apps/CtsVerifierUSBCompanion/AndroidManifest.xml b/apps/CtsVerifierUSBCompanion/AndroidManifest.xml
index 594f4ee..e6bcb79 100644
--- a/apps/CtsVerifierUSBCompanion/AndroidManifest.xml
+++ b/apps/CtsVerifierUSBCompanion/AndroidManifest.xml
@@ -16,32 +16,35 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.verifierusbcompanion">
+ package="com.android.cts.verifierusbcompanion">
- <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="25" />
+ <uses-sdk android:minSdkVersion="12"
+ android:targetSdkVersion="25"/>
- <uses-feature android:name="android.hardware.usb.accessory" />
- <uses-feature android:name="android.hardware.usb.host" />
+ <uses-feature android:name="android.hardware.usb.accessory"/>
+ <uses-feature android:name="android.hardware.usb.host"/>
<application android:label="@string/app_name"
- android:icon="@drawable/icon">
+ android:icon="@drawable/icon">
<activity android:name=".Main"
- android:screenOrientation="portrait"
- android:configChanges="orientation|keyboardHidden">
+ android:screenOrientation="portrait"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".AccessoryAttachmentHandler">
+ <activity android:name=".AccessoryAttachmentHandler"
+ android:exported="true">
<intent-filter>
- <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
+ <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
</intent-filter>
<meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
- android:resource="@xml/accessory_filter" />
+ android:resource="@xml/accessory_filter"/>
</activity>
</application>
</manifest>
diff --git a/apps/EmptyDeviceAdmin/AndroidManifest.xml b/apps/EmptyDeviceAdmin/AndroidManifest.xml
index 2ee9422..3683f9e 100644
--- a/apps/EmptyDeviceAdmin/AndroidManifest.xml
+++ b/apps/EmptyDeviceAdmin/AndroidManifest.xml
@@ -15,19 +15,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.emptydeviceadmin" >
+ package="com.android.cts.emptydeviceadmin">
<uses-sdk android:minSdkVersion="12"/>
<application android:label="Test Device Admin">
- <receiver
- android:name=".EmptyDeviceAdmin"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
- <meta-data
- android:name="android.app.device_admin"
- android:resource="@xml/device_admin"/>
+ <receiver android:name=".EmptyDeviceAdmin"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
+ <meta-data android:name="android.app.device_admin"
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
diff --git a/apps/EmptyDeviceOwner/AndroidManifest.xml b/apps/EmptyDeviceOwner/AndroidManifest.xml
index d6a97eb..7cb6d45 100644
--- a/apps/EmptyDeviceOwner/AndroidManifest.xml
+++ b/apps/EmptyDeviceOwner/AndroidManifest.xml
@@ -15,23 +15,24 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.emptydeviceowner" >
+ package="com.android.cts.emptydeviceowner">
<uses-sdk android:minSdkVersion="12"/>
- <application android:label="Test Device Owner" android:testOnly="true">
- <receiver
- android:name=".EmptyDeviceAdmin"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
- <meta-data
- android:name="android.app.device_admin"
- android:resource="@xml/device_admin"/>
+ <application android:label="Test Device Owner"
+ android:testOnly="true">
+ <receiver android:name=".EmptyDeviceAdmin"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
+ <meta-data android:name="android.app.device_admin"
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver android:name=".DeviceOwnerChangedReceiver">
+ <receiver android:name=".DeviceOwnerChangedReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.app.action.DEVICE_OWNER_CHANGED"/>
</intent-filter>
diff --git a/apps/MainlineModuleDetector/AndroidManifest.xml b/apps/MainlineModuleDetector/AndroidManifest.xml
index 4cc8f8c..dce1cae 100644
--- a/apps/MainlineModuleDetector/AndroidManifest.xml
+++ b/apps/MainlineModuleDetector/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!-- Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,15 +15,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.mainlinemoduledetector"
- android:versionCode="1"
- android:versionName="1.0">
+ package="com.android.cts.mainlinemoduledetector"
+ android:versionCode="1"
+ android:versionName="1.0">
<application>
- <activity android:name=".MainlineModuleDetector">
+ <activity android:name=".MainlineModuleDetector"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/apps/NotificationBot/AndroidManifest.xml b/apps/NotificationBot/AndroidManifest.xml
index 0388cbc..95d9178 100644
--- a/apps/NotificationBot/AndroidManifest.xml
+++ b/apps/NotificationBot/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,31 +15,34 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.robot"
- android:versionCode="1"
- android:versionName="1.0">
+ package="com.android.cts.robot"
+ android:versionCode="1"
+ android:versionName="1.0">
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21"/>
+ <uses-sdk android:minSdkVersion="19"
+ android:targetSdkVersion="21"/>
<application android:label="@string/app_name"
- android:icon="@drawable/icon"
- android:debuggable="true">
+ android:icon="@drawable/icon"
+ android:debuggable="true">
<!-- Required because a bare service won't show up in the app notifications list. -->
- <activity android:name=".NotificationBotActivity">
+ <activity android:name=".NotificationBotActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- services used by the CtsVerifier to test notifications. -->
- <receiver android:name=".NotificationBot" android:exported="true">
+ <receiver android:name=".NotificationBot"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.robot.ACTION_POST" />
- <action android:name="com.android.cts.robot.ACTION_CANCEL" />
- <action android:name="com.android.cts.robot.ACTION_RESET_SETUP_NOTIFICATION" />
- <action android:name="com.android.cts.robot.ACTION_INLINE_REPLY" />
+ <action android:name="com.android.cts.robot.ACTION_POST"/>
+ <action android:name="com.android.cts.robot.ACTION_CANCEL"/>
+ <action android:name="com.android.cts.robot.ACTION_RESET_SETUP_NOTIFICATION"/>
+ <action android:name="com.android.cts.robot.ACTION_INLINE_REPLY"/>
</intent-filter>
</receiver>
</application>
diff --git a/apps/OomCatcher/AndroidManifest.xml b/apps/OomCatcher/AndroidManifest.xml
index 25513e2..daa6fb3 100644
--- a/apps/OomCatcher/AndroidManifest.xml
+++ b/apps/OomCatcher/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?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");
@@ -16,15 +15,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.oomcatcher"
- android:versionCode="1"
- android:versionName="1.0">
+ package="com.android.cts.oomcatcher"
+ android:versionCode="1"
+ android:versionName="1.0">
<application>
- <activity android:name=".OomCatcher">
+ <activity android:name=".OomCatcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/apps/PermissionApp/AndroidManifest.xml b/apps/PermissionApp/AndroidManifest.xml
index 41e5aaa..7e4c2ff 100644
--- a/apps/PermissionApp/AndroidManifest.xml
+++ b/apps/PermissionApp/AndroidManifest.xml
@@ -16,24 +16,24 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.permissionapp">
+ package="com.android.cts.permissionapp">
<uses-sdk android:minSdkVersion="23"/>
<permission android:name="com.android.cts.permissionapp.permA"
- android:protectionLevel="dangerous"
- android:label="@string/permA"
- android:permissionGroup="com.android.cts.permissionapp.groupAB"
- android:description="@string/permA" />
+ android:protectionLevel="dangerous"
+ android:label="@string/permA"
+ android:permissionGroup="com.android.cts.permissionapp.groupAB"
+ android:description="@string/permA"/>
<permission android:name="com.android.cts.permissionapp.permB"
- android:protectionLevel="dangerous"
- android:label="@string/permB"
- android:permissionGroup="com.android.cts.permissionapp.groupAB"
- android:description="@string/permB" />
+ android:protectionLevel="dangerous"
+ android:label="@string/permB"
+ android:permissionGroup="com.android.cts.permissionapp.groupAB"
+ android:description="@string/permB"/>
<permission-group android:description="@string/groupAB"
- android:label="@string/groupAB"
- android:name="com.android.cts.permissionapp.groupAB" />
+ android:label="@string/groupAB"
+ android:name="com.android.cts.permissionapp.groupAB"/>
<uses-permission android:name="com.android.cts.permissionapp.permA"/>
<uses-permission android:name="com.android.cts.permissionapp.permB"/>
@@ -45,15 +45,15 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<application android:label="CtsPermissionApp"
- android:icon="@drawable/ic_permissionapp">
- <activity android:name=".PermissionActivity" >
+ android:icon="@drawable/ic_permissionapp">
+ <activity android:name=".PermissionActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.permission.action.CHECK_HAS_PERMISSION" />
- <action android:name="com.android.cts.permission.action.REQUEST_PERMISSION" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.permission.action.CHECK_HAS_PERMISSION"/>
+ <action android:name="com.android.cts.permission.action.REQUEST_PERMISSION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/apps/TtsTestApp/Android.bp b/apps/TtsTestApp/Android.bp
new file mode 100644
index 0000000..1270c5502
--- /dev/null
+++ b/apps/TtsTestApp/Android.bp
@@ -0,0 +1,44 @@
+// 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_helper_app {
+ name: "CtsTtsEngineSelectorTestHelper",
+ defaults: ["cts_defaults"],
+ srcs: ["src/**/*.java"],
+ manifest: "AndroidManifest.xml",
+ sdk_version: "test_current",
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts10",
+ "general-tests",
+ ]
+}
+
+android_test_helper_app {
+ name: "CtsTtsEngineSelectorTestHelper2",
+ defaults: ["cts_defaults"],
+ srcs: ["src/**/*.java"],
+ manifest: "AndroidManifest.xml",
+ sdk_version: "test_current",
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts10",
+ "general-tests",
+ ],
+ aaptflags: [
+ "--rename-manifest-package com.google.android.cts.tts.helper2"
+ ]
+}
diff --git a/apps/TtsTestApp/AndroidManifest.xml b/apps/TtsTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..5fdac07
--- /dev/null
+++ b/apps/TtsTestApp/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.cts.tts.helper">
+<application
+ android:label="TTS CTS Test Helper App">
+ <service
+ android:name=".TTSHelperService"
+ android:exported="true">
+ <intent-filter android:priority="100">
+ <action android:name="android.intent.action.TTS_SERVICE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </service>
+</application>
+</manifest>
diff --git a/apps/TtsTestApp/OWNERS b/apps/TtsTestApp/OWNERS
new file mode 100644
index 0000000..c984212
--- /dev/null
+++ b/apps/TtsTestApp/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 63521
+rni@google.com
+weiguo@google.com
+joshimbriani@google.com
diff --git a/apps/TtsTestApp/src/com/android/cts/tts/helper/TTSHelperService.java b/apps/TtsTestApp/src/com/android/cts/tts/helper/TTSHelperService.java
new file mode 100644
index 0000000..33ea454
--- /dev/null
+++ b/apps/TtsTestApp/src/com/android/cts/tts/helper/TTSHelperService.java
@@ -0,0 +1,39 @@
+package com.android.cts.tts.helper;
+
+import android.speech.tts.SynthesisCallback;
+import android.speech.tts.SynthesisRequest;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TextToSpeechService;
+
+/**
+ * Stub implementation of TTS service
+ */
+public class TTSHelperService extends TextToSpeechService {
+
+ public TTSHelperService() {}
+
+ @Override
+ protected int onIsLanguageAvailable(String lang, String country, String variant) {
+ return TextToSpeech.LANG_AVAILABLE;
+ }
+
+ @Override
+ public int onLoadLanguage(String lang, String country, String variant) {
+ return TextToSpeech.LANG_AVAILABLE;
+ }
+
+ @Override
+ protected void onStop() {
+ return;
+ }
+
+ @Override
+ protected void onSynthesizeText(SynthesisRequest request, SynthesisCallback callback) {
+ return;
+ }
+
+ @Override
+ protected String[] onGetLanguage() {
+ return new String[] {"", "", ""};
+ }
+}
diff --git a/apps/VpnApp/api23/AndroidManifest.xml b/apps/VpnApp/api23/AndroidManifest.xml
index cd2f19b..58b851f 100644
--- a/apps/VpnApp/api23/AndroidManifest.xml
+++ b/apps/VpnApp/api23/AndroidManifest.xml
@@ -15,13 +15,14 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.vpnfirewall">
+ package="com.android.cts.vpnfirewall">
<uses-sdk android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<application android:label="@string/app">
- <activity android:name=".VpnClient">
+ <activity android:name=".VpnClient"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="com.android.cts.vpnfirewall.action.CONNECT_AND_FINISH"/>
@@ -30,7 +31,8 @@
</activity>
<service android:name=".ReflectorVpnService"
- android:permission="android.permission.BIND_VPN_SERVICE">
+ android:permission="android.permission.BIND_VPN_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.net.VpnService"/>
</intent-filter>
diff --git a/apps/VpnApp/api24/AndroidManifest.xml b/apps/VpnApp/api24/AndroidManifest.xml
index 964e741..2787175 100644
--- a/apps/VpnApp/api24/AndroidManifest.xml
+++ b/apps/VpnApp/api24/AndroidManifest.xml
@@ -15,13 +15,14 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.vpnfirewall">
+ package="com.android.cts.vpnfirewall">
<uses-sdk android:targetSdkVersion="24"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<application android:label="@string/app">
- <activity android:name=".VpnClient">
+ <activity android:name=".VpnClient"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="com.android.cts.vpnfirewall.action.CONNECT_AND_FINISH"/>
@@ -30,9 +31,11 @@
</activity>
<service android:name=".ReflectorVpnService"
- android:permission="android.permission.BIND_VPN_SERVICE">
+ android:permission="android.permission.BIND_VPN_SERVICE"
+ android:exported="true">
<!-- Dummy entry below to test the default value of always-on opt-opt flag -->
- <meta-data android:name="dummy-name" android:value="dummy-value"/>
+ <meta-data android:name="dummy-name"
+ android:value="dummy-value"/>
<intent-filter>
<action android:name="android.net.VpnService"/>
</intent-filter>
diff --git a/apps/VpnApp/latest/AndroidManifest.xml b/apps/VpnApp/latest/AndroidManifest.xml
index 418726a..76c5e35 100644
--- a/apps/VpnApp/latest/AndroidManifest.xml
+++ b/apps/VpnApp/latest/AndroidManifest.xml
@@ -15,13 +15,14 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.vpnfirewall">
+ package="com.android.cts.vpnfirewall">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<application android:label="@string/app">
- <activity android:name=".VpnClient">
+ <activity android:name=".VpnClient"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="com.android.cts.vpnfirewall.action.CONNECT_AND_FINISH"/>
@@ -30,7 +31,8 @@
</activity>
<service android:name=".ReflectorVpnService"
- android:permission="android.permission.BIND_VPN_SERVICE">
+ android:permission="android.permission.BIND_VPN_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.net.VpnService"/>
</intent-filter>
diff --git a/apps/VpnApp/notalwayson/AndroidManifest.xml b/apps/VpnApp/notalwayson/AndroidManifest.xml
index 4b9184e..c165d08 100644
--- a/apps/VpnApp/notalwayson/AndroidManifest.xml
+++ b/apps/VpnApp/notalwayson/AndroidManifest.xml
@@ -15,13 +15,14 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.vpnfirewall">
+ package="com.android.cts.vpnfirewall">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<application android:label="@string/app">
- <activity android:name=".VpnClient">
+ <activity android:name=".VpnClient"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="com.android.cts.vpnfirewall.action.CONNECT_AND_FINISH"/>
@@ -30,12 +31,13 @@
</activity>
<service android:name=".ReflectorVpnService"
- android:permission="android.permission.BIND_VPN_SERVICE">
+ android:permission="android.permission.BIND_VPN_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.net.VpnService"/>
</intent-filter>
<meta-data android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
- android:value="false"/>
+ android:value="false"/>
</service>
</application>
diff --git a/apps/hotspot/AndroidManifest.xml b/apps/hotspot/AndroidManifest.xml
index 277be5f..09c494f 100644
--- a/apps/hotspot/AndroidManifest.xml
+++ b/apps/hotspot/AndroidManifest.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.hotspot">
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.cts.hotspot">
+
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<application>
- <activity android:name=".MainActivity">
+ <activity android:name=".MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <receiver android:name=".Notify" android:exported="true">
+ <receiver android:name=".Notify"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.hotspot.TEST_ACTION" />
+ <action android:name="com.android.cts.hotspot.TEST_ACTION"/>
</intent-filter>
</receiver>
</application>
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/SettingsUtils.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/SettingsUtils.java
index 14f8285..03d4a50 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/SettingsUtils.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/SettingsUtils.java
@@ -197,4 +197,12 @@
public static String getSecureSetting(String key) {
return SystemUtil.runShellCommand("settings --user current get secure " + key).trim();
}
+
+ /**
+ * Get a global setting for the given user. Trims ending new line.
+ */
+ public static String getSecureSettingAsUser(int userId, String key) {
+ return SystemUtil.runShellCommand(
+ String.format("settings --user %d get secure %s", userId, key)).trim();
+ }
}
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/UserUtils.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/UserUtils.java
new file mode 100644
index 0000000..198e602
--- /dev/null
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/UserUtils.java
@@ -0,0 +1,39 @@
+/*
+ * 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 com.android.compatibility.common.util;
+
+import android.os.SystemProperties;
+
+/**
+ * Provides utilities to deal with user status.
+ */
+public final class UserUtils {
+
+ private static final String TAG = UserUtils.class.getSimpleName();
+ private static final String SYS_PROP_HEADLESS_SYSTEM_USER = "ro.fw.mu.headless_system_user";
+
+ private UserUtils() {
+ throw new AssertionError("Should not be instantiated");
+ }
+
+ /**
+ * Tells if the device is in headless system user mode.
+ */
+ public static boolean isHeadlessSystemUserMode() {
+ return SystemProperties.getBoolean(SYS_PROP_HEADLESS_SYSTEM_USER, false);
+ }
+}
diff --git a/hostsidetests/abioverride/TEST_MAPPING b/hostsidetests/abioverride/TEST_MAPPING
new file mode 100644
index 0000000..ae76c92
--- /dev/null
+++ b/hostsidetests/abioverride/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAbiOverrideHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/abioverride/app/AndroidManifest.xml b/hostsidetests/abioverride/app/AndroidManifest.xml
index 6135732..d7215df 100755
--- a/hostsidetests/abioverride/app/AndroidManifest.xml
+++ b/hostsidetests/abioverride/app/AndroidManifest.xml
@@ -16,15 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.abioverride.app">
+ package="android.abioverride.app">
- <application android:use32bitAbi="true" android:multiArch="true">
- <uses-library android:name="android.test.runner" />
+ <application android:use32bitAbi="true"
+ android:multiArch="true">
+ <uses-library android:name="android.test.runner"/>
- <activity android:name=".AbiOverrideActivity" >
+ <activity android:name=".AbiOverrideActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/angle/app/driverTest/AndroidManifest.xml b/hostsidetests/angle/app/driverTest/AndroidManifest.xml
index 865b836..73392df 100755
--- a/hostsidetests/angle/app/driverTest/AndroidManifest.xml
+++ b/hostsidetests/angle/app/driverTest/AndroidManifest.xml
@@ -16,24 +16,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.angleIntegrationTest.driverTest"
- android:targetSandboxVersion="2">
+ package="com.android.angleIntegrationTest.driverTest"
+ android:targetSandboxVersion="2">
<application android:debuggable="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="com.android.angleIntegrationTest.common.AngleIntegrationTestActivity" >
+ <activity android:name="com.android.angleIntegrationTest.common.AngleIntegrationTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.angleIntegrationTest.driverTest" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.angleIntegrationTest.driverTest"/>
</manifest>
-
-
diff --git a/hostsidetests/angle/app/driverTestSecondary/AndroidManifest.xml b/hostsidetests/angle/app/driverTestSecondary/AndroidManifest.xml
index a91da6d..e88a8c3 100755
--- a/hostsidetests/angle/app/driverTestSecondary/AndroidManifest.xml
+++ b/hostsidetests/angle/app/driverTestSecondary/AndroidManifest.xml
@@ -16,22 +16,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.angleIntegrationTest.driverTestSecondary"
- android:targetSandboxVersion="2">
+ package="com.android.angleIntegrationTest.driverTestSecondary"
+ android:targetSandboxVersion="2">
<application android:debuggable="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="com.android.angleIntegrationTest.common.AngleIntegrationTestActivity" >
+ <activity android:name="com.android.angleIntegrationTest.common.AngleIntegrationTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.angleIntegrationTest.driverTestSecondary" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.angleIntegrationTest.driverTestSecondary"/>
</manifest>
diff --git a/hostsidetests/apex/Android.bp b/hostsidetests/apex/Android.bp
index 33194a1..c1c9805 100644
--- a/hostsidetests/apex/Android.bp
+++ b/hostsidetests/apex/Android.bp
@@ -16,5 +16,5 @@
name: "CtsApexTestCases",
srcs: ["src/**/*.java"],
test_suites: ["cts", "general-tests", "mts"],
- libs: ["cts-tradefed", "tradefed"],
+ libs: ["cts-tradefed", "cts-shim-host-lib", "tradefed"],
}
diff --git a/hostsidetests/apex/src/android/apex/cts/ApexTest.java b/hostsidetests/apex/src/android/apex/cts/ApexTest.java
index c2ca8bc..5ccdaf3 100644
--- a/hostsidetests/apex/src/android/apex/cts/ApexTest.java
+++ b/hostsidetests/apex/src/android/apex/cts/ApexTest.java
@@ -16,6 +16,8 @@
package android.apex.cts;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.util.CommandResult;
@@ -90,19 +92,17 @@
// CTS shim APEX can be non-flattened - even when ro.apex.updatable=false.
// Don't count it.
- private final static String CTS_SHIM_APEX_NAME = "com.android.apex.cts.shim";
-
private int countFlattenedApexes(String dir) throws Exception {
CommandResult result = getDevice().executeShellV2Command(
"find " + dir + " -type f -name \"apex_manifest.pb\" ! -path \"*" +
- CTS_SHIM_APEX_NAME + "*\" | wc -l");
+ SHIM_APEX_PACKAGE_NAME + "*\" | wc -l");
return result.getExitCode() == 0 ? Integer.parseInt(result.getStdout().trim()) : 0;
}
private int countNonFlattenedApexes(String dir) throws Exception {
CommandResult result = getDevice().executeShellV2Command(
"find " + dir + " -type f -name \"*.apex\" ! -name \"" +
- CTS_SHIM_APEX_NAME + ".apex\" | wc -l");
+ SHIM_APEX_PACKAGE_NAME + ".apex\" | wc -l");
return result.getExitCode() == 0 ? Integer.parseInt(result.getStdout().trim()) : 0;
}
diff --git a/hostsidetests/appbinding/app/app1/AndroidManifest.xml b/hostsidetests/appbinding/app/app1/AndroidManifest.xml
index 12bc545..615315f 100644
--- a/hostsidetests/appbinding/app/app1/AndroidManifest.xml
+++ b/hostsidetests/appbinding/app/app1/AndroidManifest.xml
@@ -15,72 +15,75 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.appbinding.app" >
+ package="com.android.cts.appbinding.app">
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- Target to-be-bound service. -->
- <service
- android:name=".MyService"
- android:exported="true"
- android:process=":persistent"
- android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE">
+ <service android:name=".MyService"
+ android:exported="true"
+ android:process=":persistent"
+ android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE">
<intent-filter>
- <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE" />
+ <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"/>
</intent-filter>
</service>
<!-- Components needed to be an SMS app -->
- <activity android:name=".MySendToActivity">
+ <activity android:name=".MySendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
<receiver android:name=".sms.MySmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<receiver android:name=".sms.MyMmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<service android:name=".sms.MyRespondService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.appbinding.app" />
+ android:targetPackage="com.android.cts.appbinding.app"/>
</manifest>
diff --git a/hostsidetests/appbinding/app/app2/AndroidManifest.xml b/hostsidetests/appbinding/app/app2/AndroidManifest.xml
index 9541cd2..b0935a5 100644
--- a/hostsidetests/appbinding/app/app2/AndroidManifest.xml
+++ b/hostsidetests/appbinding/app/app2/AndroidManifest.xml
@@ -15,72 +15,75 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.appbinding.app" >
+ package="com.android.cts.appbinding.app">
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- Target to-be-bound service. -->
- <service
- android:name=".MyService2"
- android:exported="false"
- android:process=":persistent"
- android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE" >
+ <service android:name=".MyService2"
+ android:exported="false"
+ android:process=":persistent"
+ android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE">
<intent-filter>
- <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE" />
+ <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"/>
</intent-filter>
</service>
<!-- Components needed to be an SMS app -->
- <activity android:name=".MySendToActivity">
+ <activity android:name=".MySendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
<receiver android:name=".sms.MySmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<receiver android:name=".sms.MyMmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<service android:name=".sms.MyRespondService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.appbinding.app" />
+ android:targetPackage="com.android.cts.appbinding.app"/>
</manifest>
diff --git a/hostsidetests/appbinding/app/app3/AndroidManifest.xml b/hostsidetests/appbinding/app/app3/AndroidManifest.xml
index ef89aba..e62c282 100644
--- a/hostsidetests/appbinding/app/app3/AndroidManifest.xml
+++ b/hostsidetests/appbinding/app/app3/AndroidManifest.xml
@@ -15,71 +15,74 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.appbinding.app" >
+ package="com.android.cts.appbinding.app">
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- Target to-be-bound service. -->
- <service
- android:name=".MyService"
- android:exported="false"
- android:process=":persistent">
+ <service android:name=".MyService"
+ android:exported="false"
+ android:process=":persistent">
<intent-filter>
- <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE" />
+ <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"/>
</intent-filter>
</service>
<!-- Components needed to be an SMS app -->
- <activity android:name=".MySendToActivity">
+ <activity android:name=".MySendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
<receiver android:name=".sms.MySmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<receiver android:name=".sms.MyMmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<service android:name=".sms.MyRespondService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.appbinding.app" />
+ android:targetPackage="com.android.cts.appbinding.app"/>
</manifest>
diff --git a/hostsidetests/appbinding/app/app4/AndroidManifest.xml b/hostsidetests/appbinding/app/app4/AndroidManifest.xml
index 07bd5ed..b934439 100644
--- a/hostsidetests/appbinding/app/app4/AndroidManifest.xml
+++ b/hostsidetests/appbinding/app/app4/AndroidManifest.xml
@@ -15,81 +15,83 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.appbinding.app" >
+ package="com.android.cts.appbinding.app">
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- Target to-be-bound service. -->
- <service
- android:name=".MyService"
- android:exported="true"
- android:process=":persistent"
- android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE" >
+ <service android:name=".MyService"
+ android:exported="true"
+ android:process=":persistent"
+ android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE">
<intent-filter>
- <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE" />
+ <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"/>
</intent-filter>
</service>
- <service
- android:name=".MyService2"
- android:exported="true"
- android:process=":persistent"
- android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE" >
+ <service android:name=".MyService2"
+ android:exported="true"
+ android:process=":persistent"
+ android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE">
<intent-filter>
- <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE" />
+ <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"/>
</intent-filter>
</service>
<!-- Components needed to be an SMS app -->
- <activity android:name=".MySendToActivity">
+ <activity android:name=".MySendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
<receiver android:name=".sms.MySmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<receiver android:name=".sms.MyMmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<service android:name=".sms.MyRespondService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.appbinding.app" />
+ android:targetPackage="com.android.cts.appbinding.app"/>
</manifest>
diff --git a/hostsidetests/appbinding/app/app5/AndroidManifest.xml b/hostsidetests/appbinding/app/app5/AndroidManifest.xml
index 68f83a6..8397140 100644
--- a/hostsidetests/appbinding/app/app5/AndroidManifest.xml
+++ b/hostsidetests/appbinding/app/app5/AndroidManifest.xml
@@ -15,63 +15,67 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.appbinding.app" >
+ package="com.android.cts.appbinding.app">
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- No target services. -->
<!-- Components needed to be an SMS app -->
- <activity android:name=".MySendToActivity">
+ <activity android:name=".MySendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
<receiver android:name=".sms.MySmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<receiver android:name=".sms.MyMmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<service android:name=".sms.MyRespondService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.appbinding.app" />
+ android:targetPackage="com.android.cts.appbinding.app"/>
</manifest>
diff --git a/hostsidetests/appbinding/app/app6/AndroidManifest.xml b/hostsidetests/appbinding/app/app6/AndroidManifest.xml
index 68fea2c..4a256ea 100644
--- a/hostsidetests/appbinding/app/app6/AndroidManifest.xml
+++ b/hostsidetests/appbinding/app/app6/AndroidManifest.xml
@@ -15,71 +15,74 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.appbinding.app" >
+ package="com.android.cts.appbinding.app">
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- Target to-be-bound service found, but doesn't have :process. -->
- <service
- android:name=".MyService2"
- android:exported="false"
- android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE" >
+ <service android:name=".MyService2"
+ android:exported="false"
+ android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE">
<intent-filter>
- <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE" />
+ <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"/>
</intent-filter>
</service>
<!-- Components needed to be an SMS app -->
- <activity android:name=".MySendToActivity">
+ <activity android:name=".MySendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
<receiver android:name=".sms.MySmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<receiver android:name=".sms.MyMmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<service android:name=".sms.MyRespondService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.appbinding.app" />
+ android:targetPackage="com.android.cts.appbinding.app"/>
</manifest>
diff --git a/hostsidetests/appbinding/app/app7/AndroidManifest.xml b/hostsidetests/appbinding/app/app7/AndroidManifest.xml
index e0a3e9d..3e173e2 100644
--- a/hostsidetests/appbinding/app/app7/AndroidManifest.xml
+++ b/hostsidetests/appbinding/app/app7/AndroidManifest.xml
@@ -15,73 +15,76 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.appbinding.app" >
+ package="com.android.cts.appbinding.app">
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- Target to-be-bound service. -->
- <service
- android:name=".MyService"
- android:exported="true"
- android:process=":persistent"
- android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE"
- android:enabled="false">
+ <service android:name=".MyService"
+ android:exported="true"
+ android:process=":persistent"
+ android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE"
+ android:enabled="false">
<intent-filter>
- <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE" />
+ <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"/>
</intent-filter>
</service>
<!-- Components needed to be an SMS app -->
- <activity android:name=".MySendToActivity">
+ <activity android:name=".MySendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
<receiver android:name=".sms.MySmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<receiver android:name=".sms.MyMmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<service android:name=".sms.MyRespondService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.appbinding.app" />
+ android:targetPackage="com.android.cts.appbinding.app"/>
</manifest>
diff --git a/hostsidetests/appbinding/app/appb/AndroidManifest.xml b/hostsidetests/appbinding/app/appb/AndroidManifest.xml
index fac204e..4b6499e 100644
--- a/hostsidetests/appbinding/app/appb/AndroidManifest.xml
+++ b/hostsidetests/appbinding/app/appb/AndroidManifest.xml
@@ -15,72 +15,75 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.appbinding.app.b" >
+ package="com.android.cts.appbinding.app.b">
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- Target to-be-bound service. -->
- <service
- android:name="com.android.cts.appbinding.app.MyService"
- android:exported="true"
- android:process=":persistent"
- android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE" >
+ <service android:name="com.android.cts.appbinding.app.MyService"
+ android:exported="true"
+ android:process=":persistent"
+ android:permission="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE">
<intent-filter>
- <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE" />
+ <action android:name="android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"/>
</intent-filter>
</service>
<!-- Components needed to be an SMS app -->
- <activity android:name="com.android.cts.appbinding.app.MySendToActivity">
+ <activity android:name="com.android.cts.appbinding.app.MySendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
<receiver android:name="com.android.cts.appbinding.app.sms.MySmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<receiver android:name="com.android.cts.appbinding.app.sms.MyMmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<service android:name="com.android.cts.appbinding.app.sms.MyRespondService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.appbinding.app" />
+ android:targetPackage="com.android.cts.appbinding.app"/>
</manifest>
diff --git a/hostsidetests/appcompat/strictjavapackages/TEST_MAPPING b/hostsidetests/appcompat/strictjavapackages/TEST_MAPPING
new file mode 100644
index 0000000..70dfc61
--- /dev/null
+++ b/hostsidetests/appcompat/strictjavapackages/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsStrictJavaPackagesTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/appsecurity/OWNERS b/hostsidetests/appsecurity/OWNERS
index 6ad0c7a..60a8e5f 100644
--- a/hostsidetests/appsecurity/OWNERS
+++ b/hostsidetests/appsecurity/OWNERS
@@ -19,6 +19,8 @@
per-file DocumentsTest.java = zemiao@google.com
per-file EphemeralTest.java = toddke@google.com
per-file ExternalStorageHostTest.java = jsharkey@google.com
+per-file ExternalStorageHostTest.java = nandana@google.com
+per-file ExternalStorageHostTest.java = zezeozue@google.com
per-file InstantAppUserTest.java = toddke@google.com
per-file InstantCookieHostTest.java = toddke@google.com
per-file IsolatedSplitsTests.java = toddke@google.com
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/ResumeOnRebootHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/ResumeOnRebootHostTest.java
index 557596a..1ad7905 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/ResumeOnRebootHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/ResumeOnRebootHostTest.java
@@ -112,9 +112,6 @@
deviceClearLskf();
} finally {
removeTestPackages();
-
- getDevice().rebootUntilOnline();
- getDevice().waitForDeviceAvailable();
}
}
}
@@ -159,9 +156,6 @@
deviceClearLskf();
} finally {
removeTestPackages();
-
- getDevice().rebootUntilOnline();
- getDevice().waitForDeviceAvailable();
}
}
}
@@ -217,9 +211,6 @@
deviceClearLskf();
} finally {
removeTestPackages();
-
- getDevice().rebootUntilOnline();
- getDevice().waitForDeviceAvailable();
}
}
}
@@ -277,9 +268,6 @@
deviceClearLskf();
} finally {
removeTestPackages();
-
- getDevice().rebootUntilOnline();
- getDevice().waitForDeviceAvailable();
}
}
}
diff --git a/hostsidetests/appsecurity/test-apps/ApkVerityTestApp/Android.bp b/hostsidetests/appsecurity/test-apps/ApkVerityTestApp/Android.bp
index aca31e7..3786e75 100644
--- a/hostsidetests/appsecurity/test-apps/ApkVerityTestApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ApkVerityTestApp/Android.bp
@@ -33,6 +33,11 @@
use_embedded_native_libs: true,
sdk_version: "current",
certificate: ":cts-testkey1",
+ dist: {
+ targets: [
+ "cts",
+ ],
+ },
}
android_test_helper_app {
@@ -48,6 +53,11 @@
},
sdk_version: "current",
certificate: ":cts-testkey1",
+ dist: {
+ targets: [
+ "cts",
+ ],
+ },
}
cc_library_shared {
diff --git a/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/AppA/src/com/android/cts/appdataisolation/appa/IsolatedService.java b/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/AppA/src/com/android/cts/appdataisolation/appa/IsolatedService.java
index 5b1ec66..b2dd2df 100644
--- a/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/AppA/src/com/android/cts/appdataisolation/appa/IsolatedService.java
+++ b/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/AppA/src/com/android/cts/appdataisolation/appa/IsolatedService.java
@@ -16,7 +16,6 @@
package com.android.cts.appdataisolation.appa;
-import static com.android.cts.appdataisolation.common.FileUtils.assertDirDoesNotExist;
import static com.android.cts.appdataisolation.common.FileUtils.assertDirIsNotAccessible;
import android.app.Service;
@@ -35,25 +34,25 @@
public void assertDataIsolated() throws RemoteException {
try {
ApplicationInfo applicationInfo = getApplicationInfo();
- assertDirDoesNotExist(applicationInfo.dataDir);
- assertDirDoesNotExist(applicationInfo.deviceProtectedDataDir);
- assertDirDoesNotExist("/data/data/" + getPackageName());
- assertDirDoesNotExist("/data/misc/profiles/cur/0/" + getPackageName());
+ assertDirIsNotAccessible(applicationInfo.dataDir);
+ assertDirIsNotAccessible(applicationInfo.deviceProtectedDataDir);
+ assertDirIsNotAccessible("/data/data/" + getPackageName());
+ assertDirIsNotAccessible("/data/misc/profiles/cur/0/" + getPackageName());
assertDirIsNotAccessible("/data/misc/profiles/ref");
- assertDirDoesNotExist(FileUtils.replacePackageAWithPackageB(
+ assertDirIsNotAccessible(FileUtils.replacePackageAWithPackageB(
applicationInfo.dataDir));
- assertDirDoesNotExist(FileUtils.replacePackageAWithPackageB(
+ assertDirIsNotAccessible(FileUtils.replacePackageAWithPackageB(
applicationInfo.deviceProtectedDataDir));
- assertDirDoesNotExist("/data/data/" + FileUtils.APPB_PKG);
- assertDirDoesNotExist("/data/misc/profiles/cur/0/" + FileUtils.APPB_PKG);
+ assertDirIsNotAccessible("/data/data/" + FileUtils.APPB_PKG);
+ assertDirIsNotAccessible("/data/misc/profiles/cur/0/" + FileUtils.APPB_PKG);
- assertDirDoesNotExist(FileUtils.replacePackageAWithNotInstalledPkg(
+ assertDirIsNotAccessible(FileUtils.replacePackageAWithNotInstalledPkg(
applicationInfo.dataDir));
- assertDirDoesNotExist(FileUtils.replacePackageAWithNotInstalledPkg(
+ assertDirIsNotAccessible(FileUtils.replacePackageAWithNotInstalledPkg(
applicationInfo.deviceProtectedDataDir));
- assertDirDoesNotExist("/data/data/" + FileUtils.NOT_INSTALLED_PKG);
- assertDirDoesNotExist("/data/misc/profiles/cur/0/" + FileUtils.NOT_INSTALLED_PKG);
+ assertDirIsNotAccessible("/data/data/" + FileUtils.NOT_INSTALLED_PKG);
+ assertDirIsNotAccessible("/data/misc/profiles/cur/0/" + FileUtils.NOT_INSTALLED_PKG);
} catch (Throwable e) {
throw new IllegalStateException(e.getMessage());
}
diff --git a/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/AndroidManifest.xml
index 05676a8..6056e70 100644
--- a/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/AndroidManifest.xml
@@ -15,21 +15,23 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.authboundkeyapp">
+ package="com.android.cts.authboundkeyapp">
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
+ <uses-sdk android:minSdkVersion="21"
+ android:targetSdkVersion="27"/>
<application android:label="AuthBoundKeyApp">
- <activity android:name=".BaseActivity">
+ <activity android:name=".BaseActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.authboundkeyapp" />
+ android:targetPackage="com.android.cts.authboundkeyapp"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml
index 2f4d5fe..8d3efe6 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml
@@ -15,30 +15,32 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.documentprovider">
+ package="com.android.cts.documentprovider">
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
<application android:forceQueryable="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<provider android:name=".MyDocumentsProvider"
- android:authorities="com.android.cts.documentprovider"
- android:exported="true"
- android:grantUriPermissions="true"
- android:permission="android.permission.MANAGE_DOCUMENTS">
+ android:authorities="com.android.cts.documentprovider"
+ android:exported="true"
+ android:grantUriPermissions="true"
+ android:permission="android.permission.MANAGE_DOCUMENTS">
<intent-filter>
- <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+ <action android:name="android.content.action.DOCUMENTS_PROVIDER"/>
</intent-filter>
</provider>
<activity android:name=".GetContentActivity"
- android:label="CtsGetContent">
+ android:label="CtsGetContent"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.GET_CONTENT" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.OPENABLE" />
- <data android:mimeType="image/*" />
+ <action android:name="android.intent.action.GET_CONTENT"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.OPENABLE"/>
+ <data android:mimeType="image/*"/>
</intent-filter>
</activity>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml
index ea12f85..841e7b2 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml
@@ -15,118 +15,114 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.ephemeralapp1" >
- <uses-sdk
- android:minSdkVersion="24" android:targetSdkVersion="26" />
+ package="com.android.cts.ephemeralapp1">
+ <uses-sdk android:minSdkVersion="24"
+ android:targetSdkVersion="26"/>
- <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
+ <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.INSTANT_APP_FOREGROUND_SERVICE" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
- <uses-permission android:name="android.permission.VIBRATE" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.INSTANT_APP_FOREGROUND_SERVICE"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+ <uses-permission android:name="android.permission.READ_PHONE_NUMBERS"/>
+ <uses-permission android:name="android.permission.VIBRATE"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
- <application
- android:label="@string/app_name">
- <uses-library android:name="android.test.runner" />
- <activity
- android:name=".EphemeralActivity"
- android:theme="@android:style/Theme.NoDisplay" >
+ <application android:label="@string/app_name">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".EphemeralActivity"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<!-- TEST: normal app can start w/o knowing about this activity -->
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="cts.google.com" />
- <data android:path="/ephemeral" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="cts.google.com"/>
+ <data android:path="/ephemeral"/>
</intent-filter>
<!-- TEST: ephemeral apps can see this activity using query methods -->
<!-- TEST: normal apps can't see this activity using query methods -->
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<!-- TEST: ephemeral apps can start this activity using directed intent -->
<!-- TEST: normal apps can't start this activity using directed intent -->
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEARCH" />
+ <action android:name="android.intent.action.SEARCH"/>
</intent-filter>
<meta-data android:name="default-url"
- android:value="https://ephemeralapp1.cts.android.com/search" />
- <meta-data
- android:name="android.app.searchable"
- android:resource="@xml/searchable" />
+ android:value="https://ephemeralapp1.cts.android.com/search"/>
+ <meta-data android:name="android.app.searchable"
+ android:resource="@xml/searchable"/>
</activity>
- <activity
- android:name=".EphemeralResult"
- android:theme="@android:style/Theme.NoDisplay" >
+ <activity android:name=".EphemeralResult"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<!-- TEST: allow sending results from other instant apps -->
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="cts.google.com" />
- <data android:path="/result" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="cts.google.com"/>
+ <data android:path="/result"/>
</intent-filter>
</activity>
<provider android:name=".SearchSuggestionProvider"
- android:authorities="com.android.cts.ephemeralapp1.Search" />
+ android:authorities="com.android.cts.ephemeralapp1.Search"/>
- <activity
- android:name=".EphemeralActivity2"
- android:theme="@android:style/Theme.NoDisplay">
+ <activity android:name=".EphemeralActivity2"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<!-- TEST: ephemeral apps can start this activity using directed intent -->
<!-- TEST: normal apps can't start this activity using directed intent -->
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL_PRIVATE" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL_PRIVATE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity
- android:name=".EphemeralActivity3"
- android:theme="@android:style/Theme.NoDisplay">
+ <activity android:name=".EphemeralActivity3"
+ android:theme="@android:style/Theme.NoDisplay">
<!-- TEST: ephemeral apps can start this activity using directed intent -->
</activity>
- <activity android:name=".WebViewTestActivity" />
- <service
- android:name=".EphemeralService">
+ <activity android:name=".WebViewTestActivity"/>
+ <service android:name=".EphemeralService"
+ android:exported="true">
<!-- TEST: ephemeral apps can see this service using query methods -->
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<!-- TEST: ephemeral apps can start this service using directed intent -->
<intent-filter android:priority="-10">
- <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
- <provider
- android:name=".EphemeralProvider"
- android:authorities="com.android.cts.ephemeralapp1.provider"
- android:exported="true">
+ <provider android:name=".EphemeralProvider"
+ android:authorities="com.android.cts.ephemeralapp1.provider"
+ android:exported="true">
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
</intent-filter>
</provider>
<service android:name=".SomeService"/>
- <activity android:name=".StartForResultActivity" android:exported="false" />
+ <activity android:name=".StartForResultActivity"
+ android:exported="false"/>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.ephemeralapp1" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.ephemeralapp1"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml
index 3d814d8..415b268 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml
@@ -15,68 +15,63 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.ephemeralapp2" >
- <uses-sdk
- android:minSdkVersion="24" android:targetSdkVersion="26" />
+ package="com.android.cts.ephemeralapp2">
+ <uses-sdk android:minSdkVersion="24"
+ android:targetSdkVersion="26"/>
<!-- TEST: exists only for testing ephemeral app1 can't see this app -->
- <application
- android:label="@string/app_name">
- <uses-library android:name="android.test.runner" />
- <activity
- android:name=".EphemeralActivity"
- android:theme="@android:style/Theme.NoDisplay">
+ <application android:label="@string/app_name">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".EphemeralActivity"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="cts.google.com" />
- <data android:path="/other" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="cts.google.com"/>
+ <data android:path="/other"/>
</intent-filter>
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.START_OTHER_EPHEMERAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_OTHER_EPHEMERAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEARCH" />
+ <action android:name="android.intent.action.SEARCH"/>
</intent-filter>
<meta-data android:name="default-url"
- android:value="https://ephemeralapp2.cts.android.com/search" />
- <meta-data
- android:name="android.app.searchable"
- android:resource="@xml/searchable" />
+ android:value="https://ephemeralapp2.cts.android.com/search"/>
+ <meta-data android:name="android.app.searchable"
+ android:resource="@xml/searchable"/>
</activity>
<provider android:name=".SearchSuggestionProvider"
- android:authorities="com.android.cts.ephemeralapp2.Search" />
+ android:authorities="com.android.cts.ephemeralapp2.Search"/>
<!-- This should still not be visible to other Instant Apps -->
- <activity
- android:name=".ExposedActivity"
- android:visibleToInstantApps="true"
- android:theme="@android:style/Theme.NoDisplay" />
+ <activity android:name=".ExposedActivity"
+ android:visibleToInstantApps="true"
+ android:theme="@android:style/Theme.NoDisplay"/>
<!-- This should still not be visible to other Instant Apps -->
- <provider
- android:name=".EphemeralProvider"
- android:authorities="com.android.cts.ephemeralapp2.provider"
- android:exported="true">
+ <provider android:name=".EphemeralProvider"
+ android:authorities="com.android.cts.ephemeralapp2.provider"
+ android:exported="true">
<intent-filter android:priority="0">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
</intent-filter>
</provider>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.ephemeralapp2" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.ephemeralapp2"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml
index d9136d5..33f2c4f 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml
@@ -15,29 +15,26 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.implicitapp">
- <uses-sdk
- android:minSdkVersion="24" />
+ package="com.android.cts.implicitapp">
+ <uses-sdk android:minSdkVersion="24"/>
- <application
- android:label="@string/app_name">
- <uses-library android:name="android.test.runner" />
- <activity
- android:name=".ImplicitActivity"
- android:theme="@android:style/Theme.NoDisplay">
+ <application android:label="@string/app_name">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".ImplicitActivity"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<!-- TEST: implicitly exposes this activity to instant apps -->
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="cts.google.com" />
- <data android:path="/implicit" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="cts.google.com"/>
+ <data android:path="/implicit"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.implicitapp" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.implicitapp"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml
index e577260..6084e95 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml
@@ -15,123 +15,116 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.normalapp">
- <uses-sdk
- android:minSdkVersion="24" />
+ package="com.android.cts.normalapp">
+ <uses-sdk android:minSdkVersion="24"/>
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
- <application
- android:label="@string/app_name">
- <uses-library android:name="android.test.runner" />
- <activity
- android:name=".NormalActivity"
- android:theme="@android:style/Theme.NoDisplay">
+ <application android:label="@string/app_name">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".NormalActivity"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<!-- TEST: ephemeral apps can't see this activity using query methods -->
<intent-filter android:priority="-20">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<!-- TEST: ephemeral apps can't start this activity using directed intent -->
<intent-filter>
- <action android:name="com.android.cts.ephemeraltest.START_NORMAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_NORMAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEARCH" />
+ <action android:name="android.intent.action.SEARCH"/>
</intent-filter>
<meta-data android:name="default-url"
- android:value="https://normalapp.cts.android.com/search" />
- <meta-data
- android:name="android.app.searchable"
- android:resource="@xml/searchable" />
+ android:value="https://normalapp.cts.android.com/search"/>
+ <meta-data android:name="android.app.searchable"
+ android:resource="@xml/searchable"/>
</activity>
- <activity
- android:name=".NormalWebActivity"
- android:theme="@android:style/Theme.NoDisplay">
+ <activity android:name=".NormalWebActivity"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<!-- TEST: implicitly exposes this activity to ephemeral apps -->
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="cts.google.com" />
- <data android:path="/normal" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="cts.google.com"/>
+ <data android:path="/normal"/>
</intent-filter>
</activity>
- <activity
- android:name=".ExposedActivity"
- android:visibleToInstantApps="true"
- android:theme="@android:style/Theme.NoDisplay">
+ <activity android:name=".ExposedActivity"
+ android:visibleToInstantApps="true"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<!-- TEST: ephemeral apps can see this activity using query methods -->
<intent-filter android:priority="-10">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<!-- TEST: ephemeral apps can start this activity using directed intent -->
<intent-filter android:priority="-10">
- <action android:name="com.android.cts.ephemeraltest.START_EXPOSED" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_EXPOSED"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEARCH" />
+ <action android:name="android.intent.action.SEARCH"/>
</intent-filter>
<meta-data android:name="default-url"
- android:value="https://normalapp.cts.android.com/search" />
- <meta-data
- android:name="android.app.searchable"
- android:resource="@xml/searchable" />
+ android:value="https://normalapp.cts.android.com/search"/>
+ <meta-data android:name="android.app.searchable"
+ android:resource="@xml/searchable"/>
</activity>
<provider android:name=".SearchSuggestionProvider"
- android:authorities="com.android.cts.normalapp.Search" />
+ android:authorities="com.android.cts.normalapp.Search"/>
- <service
- android:name=".NormalService">
+ <service android:name=".NormalService"
+ android:exported="true">
<!-- TEST: ephemeral apps can't see this service using query methods -->
<intent-filter android:priority="-20">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<!-- TEST: ephemeral apps can't start this service using directed intent -->
<intent-filter>
- <action android:name="com.android.cts.ephemeraltest.START_NORMAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_NORMAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
- <service
- android:name=".ExposedService"
- android:visibleToInstantApps="true">
+ <service android:name=".ExposedService"
+ android:visibleToInstantApps="true"
+ android:exported="true">
<!-- TEST: ephemeral apps can see this service using query methods -->
<intent-filter android:priority="-10">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<!-- TEST: ephemeral apps can start this service using directed intent -->
<intent-filter android:priority="-10">
- <action android:name="com.android.cts.ephemeraltest.START_EXPOSED" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.ephemeraltest.START_EXPOSED"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
- <provider
- android:name=".NormalProvider"
- android:authorities="com.android.cts.normalapp.provider"
- android:exported="true">
+ <provider android:name=".NormalProvider"
+ android:authorities="com.android.cts.normalapp.provider"
+ android:exported="true">
<intent-filter android:priority="-20">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
</intent-filter>
</provider>
- <provider
- android:name=".ExposedProvider"
- android:authorities="com.android.cts.normalapp.exposed.provider"
- android:visibleToInstantApps="true"
- android:exported="true">
+ <provider android:name=".ExposedProvider"
+ android:authorities="com.android.cts.normalapp.exposed.provider"
+ android:visibleToInstantApps="true"
+ android:exported="true">
<intent-filter android:priority="-10">
- <action android:name="com.android.cts.ephemeraltest.QUERY" />
+ <action android:name="com.android.cts.ephemeraltest.QUERY"/>
</intent-filter>
</provider>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.normalapp" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.normalapp"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml
index b44e04a..c2dde3c 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml
@@ -15,25 +15,23 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.userapp"
- android:targetSandboxVersion="2">
+ package="com.android.cts.userapp"
+ android:targetSandboxVersion="2">
- <application
- android:label="@string/app_name">
- <uses-library android:name="android.test.runner" />
- <activity
- android:name=".UserActivity"
- android:directBootAware="true" >
+ <application android:label="@string/app_name">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".UserActivity"
+ android:directBootAware="true"
+ android:exported="true">
<!-- TEST: when installed as an instant app, normal apps can't query for it -->
<!-- TEST: when installed as a full app, normal apps can query for it -->
<intent-filter android:priority="0">
- <action android:name="com.android.cts.instantappusertest.QUERY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.instantappusertest.QUERY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.userapp" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.userapp"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml
index 6fab412..57320b3 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml
@@ -15,32 +15,35 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.isolatedsplitapp"
- android:isolatedSplits="true"
- android:targetSandboxVersion="2">
+ package="com.android.cts.isolatedsplitapp"
+ android:isolatedSplits="true"
+ android:targetSandboxVersion="2">
<application android:label="IsolatedSplitApp">
- <activity android:name=".BaseActivity">
+ <activity android:name=".BaseActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
-
- <service android:name=".BaseService" android:exported="true" />
-
- <receiver android:name=".BaseReceiver">
+
+ <service android:name=".BaseService"
+ android:exported="true"/>
+
+ <receiver android:name=".BaseReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.isolatedsplitapp.ACTION" />
+ <action android:name="com.android.cts.isolatedsplitapp.ACTION"/>
</intent-filter>
</receiver>
-
- <uses-library android:name="android.test.runner" />
+
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.isolatedsplitapp" />
+ android:targetPackage="com.android.cts.isolatedsplitapp"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/AndroidManifest.xml
index d9ca271..7e2e1da 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/AndroidManifest.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.isolatedsplitapp.feature_a"
- featureSplit="feature_a"
- android:targetSandboxVersion="2">
+ package="com.android.cts.isolatedsplitapp.feature_a"
+ featureSplit="feature_a"
+ android:targetSandboxVersion="2">
<application>
- <activity android:name=".FeatureAActivity">
+ <activity android:name=".FeatureAActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <receiver android:name=".FeatureAReceiver">
+ <receiver android:name=".FeatureAReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.isolatedsplitapp.ACTION" />
+ <action android:name="com.android.cts.isolatedsplitapp.ACTION"/>
</intent-filter>
</receiver>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/AndroidManifest.xml
index 8b4f16d..2b616cc 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/AndroidManifest.xml
@@ -15,22 +15,24 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.isolatedsplitapp.feature_b"
- featureSplit="feature_b"
- android:targetSandboxVersion="2">
+ package="com.android.cts.isolatedsplitapp.feature_b"
+ featureSplit="feature_b"
+ android:targetSandboxVersion="2">
- <uses-split android:name="feature_a" />
+ <uses-split android:name="feature_a"/>
<application>
- <activity android:name=".FeatureBActivity">
+ <activity android:name=".FeatureBActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <receiver android:name=".FeatureBReceiver">
+ <receiver android:name=".FeatureBReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.isolatedsplitapp.ACTION" />
+ <action android:name="com.android.cts.isolatedsplitapp.ACTION"/>
</intent-filter>
</receiver>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/AndroidManifest.xml
index 012543b..3e65a43 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/AndroidManifest.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.isolatedsplitapp.feature_c"
- featureSplit="feature_c"
- android:targetSandboxVersion="2">
+ package="com.android.cts.isolatedsplitapp.feature_c"
+ featureSplit="feature_c"
+ android:targetSandboxVersion="2">
<application>
- <activity android:name=".FeatureCActivity">
+ <activity android:name=".FeatureCActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <receiver android:name=".FeatureCReceiver">
+ <receiver android:name=".FeatureCReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.isolatedsplitapp.ACTION" />
+ <action android:name="com.android.cts.isolatedsplitapp.ACTION"/>
</intent-filter>
</receiver>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp
index bd67ea0..b7174d2 100644
--- a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/Android.bp
@@ -16,8 +16,8 @@
name: "CtsLocationPolicyApp",
defaults: ["cts_defaults"],
libs: [
- "android.test.runner",
- "android.test.base",
+ "android.test.runner.stubs",
+ "android.test.base.stubs",
],
static_libs: [
"androidx.test.rules",
diff --git a/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest.xml
index cf69eaa..4b09ae5 100644
--- a/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest.xml
@@ -13,28 +13,30 @@
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.cts.mediastorageapp">
+ package="com.android.cts.mediastorageapp">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="com.android.cts.mediastorageapp.StubActivity">
+ <activity android:name="com.android.cts.mediastorageapp.StubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.APP_GALLERY" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.APP_GALLERY"/>
</intent-filter>
</activity>
- <activity android:name="com.android.cts.mediastorageapp.GetResultActivity" />
+ <activity android:name="com.android.cts.mediastorageapp.GetResultActivity"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.mediastorageapp" />
+ android:targetPackage="com.android.cts.mediastorageapp"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest28.xml b/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest28.xml
index 93e4bc7..cefd4f8 100644
--- a/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest28.xml
+++ b/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest28.xml
@@ -13,32 +13,33 @@
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.cts.mediastorageapp28">
+ package="com.android.cts.mediastorageapp28">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="com.android.cts.mediastorageapp.StubActivity">
+ <activity android:name="com.android.cts.mediastorageapp.StubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.APP_GALLERY" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.APP_GALLERY"/>
</intent-filter>
</activity>
- <activity android:name="com.android.cts.mediastorageapp.GetResultActivity" />
+ <activity android:name="com.android.cts.mediastorageapp.GetResultActivity"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.mediastorageapp28" />
+ android:targetPackage="com.android.cts.mediastorageapp28"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-sdk
- android:minSdkVersion="28"
- android:targetSdkVersion="28" />
+ <uses-sdk android:minSdkVersion="28"
+ android:targetSdkVersion="28"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest29.xml b/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest29.xml
index a73ab0e..3412e0c 100644
--- a/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest29.xml
+++ b/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest29.xml
@@ -13,32 +13,32 @@
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.cts.mediastorageapp29">
+ package="com.android.cts.mediastorageapp29">
- <application
- android:requestLegacyExternalStorage="true">
- <uses-library android:name="android.test.runner" />
+ <application android:requestLegacyExternalStorage="true">
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="com.android.cts.mediastorageapp.StubActivity">
+ <activity android:name="com.android.cts.mediastorageapp.StubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.APP_GALLERY" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.APP_GALLERY"/>
</intent-filter>
</activity>
- <activity android:name="com.android.cts.mediastorageapp.GetResultActivity" />
+ <activity android:name="com.android.cts.mediastorageapp.GetResultActivity"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.mediastorageapp29" />
+ android:targetPackage="com.android.cts.mediastorageapp29"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-sdk
- android:minSdkVersion="29"
- android:targetSdkVersion="29" />
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/MediaStorageApp/src/com/android/cts/mediastorageapp/MediaStorageTest.java b/hostsidetests/appsecurity/test-apps/MediaStorageApp/src/com/android/cts/mediastorageapp/MediaStorageTest.java
index e3545b9..7ff47f7 100644
--- a/hostsidetests/appsecurity/test-apps/MediaStorageApp/src/com/android/cts/mediastorageapp/MediaStorageTest.java
+++ b/hostsidetests/appsecurity/test-apps/MediaStorageApp/src/com/android/cts/mediastorageapp/MediaStorageTest.java
@@ -211,6 +211,18 @@
fail("Expected write access to be blocked");
} catch (SecurityException | FileNotFoundException expected) {
}
+
+ // Verify that we can't grant ourselves access
+ for (int flag : new int[] {
+ Intent.FLAG_GRANT_READ_URI_PERMISSION,
+ Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+ }) {
+ try {
+ mContext.grantUriPermission(mContext.getPackageName(), blue, flag);
+ fail("Expected granting to be blocked for flag 0x" + Integer.toHexString(flag));
+ } catch (SecurityException expected) {
+ }
+ }
}
@Test
diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/NoRestartApp/AndroidManifest.xml
index c7550e0..366bc92 100644
--- a/hostsidetests/appsecurity/test-apps/NoRestartApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/AndroidManifest.xml
@@ -13,32 +13,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.android.cts.norestart"
- android:targetSandboxVersion="2"
- tools:ignore="MissingVersion" >
- <application
- tools:ignore="AllowBackup,MissingApplicationIcon" >
- <activity
- android:name=".NoRestartActivity"
- android:launchMode="singleTop" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.android.cts.norestart"
+ android:targetSandboxVersion="2"
+ tools:ignore="MissingVersion">
+
+ <application tools:ignore="AllowBackup,MissingApplicationIcon">
+ <activity android:name=".NoRestartActivity"
+ android:launchMode="singleTop"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.norestart.START" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.norestart.START"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.BROWSABLE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="https" />
- <data android:host="cts.android.com" />
- <data android:path="/norestart" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="https"/>
+ <data android:host="cts.android.com"/>
+ <data android:path="/norestart"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/AndroidManifest.xml
index b5f38c6..681264c 100644
--- a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/AndroidManifest.xml
@@ -13,124 +13,128 @@
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.orderedactivity"
- android:versionCode="10"
- android:versionName="1.0"
- android:targetSandboxVersion="2">
+ package="android.appsecurity.cts.orderedactivity"
+ android:versionCode="10"
+ android:versionName="1.0"
+ android:targetSandboxVersion="2">
<application android:label="@string/app_name">
<!-- Activities used for queries -->
- <activity android:name=".OrderActivity2">
- <intent-filter
- android:order="2">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <activity android:name=".OrderActivity2"
+ android:exported="true">
+ <intent-filter android:order="2">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:pathPrefix="/cts/package" />
+ android:host="www.google.com"
+ android:pathPrefix="/cts/package"/>
</intent-filter>
</activity>
- <activity android:name=".OrderActivity1">
- <intent-filter
- android:order="1">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <activity android:name=".OrderActivity1"
+ android:exported="true">
+ <intent-filter android:order="1">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:path="/cts/packageresolution" />
+ android:host="www.google.com"
+ android:path="/cts/packageresolution"/>
</intent-filter>
</activity>
- <activity android:name=".OrderActivityDefault">
+ <activity android:name=".OrderActivityDefault"
+ android:exported="true">
<intent-filter>
<!-- default order -->
- <action android:name="android.cts.intent.action.ORDERED" />
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com" />
+ android:host="www.google.com"/>
</intent-filter>
</activity>
- <activity android:name=".OrderActivity3">
- <intent-filter
- android:order="3">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <activity android:name=".OrderActivity3"
+ android:exported="true">
+ <intent-filter android:order="3">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:pathPrefix="/cts" />
+ android:host="www.google.com"
+ android:pathPrefix="/cts"/>
</intent-filter>
</activity>
<!-- Services used for queries -->
- <service android:name=".OrderServiceDefault">
+ <service android:name=".OrderServiceDefault"
+ android:exported="true">
<intent-filter>
<!-- default order -->
- <action android:name="android.cts.intent.action.ORDERED" />
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com" />
+ android:host="www.google.com"/>
</intent-filter>
</service>
- <service android:name=".OrderService2">
- <intent-filter
- android:order="2">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <service android:name=".OrderService2"
+ android:exported="true">
+ <intent-filter android:order="2">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:pathPrefix="/cts/package" />
+ android:host="www.google.com"
+ android:pathPrefix="/cts/package"/>
</intent-filter>
</service>
- <service android:name=".OrderService3">
- <intent-filter
- android:order="3">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <service android:name=".OrderService3"
+ android:exported="true">
+ <intent-filter android:order="3">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:pathPrefix="/cts" />
+ android:host="www.google.com"
+ android:pathPrefix="/cts"/>
</intent-filter>
</service>
- <service android:name=".OrderService1">
- <intent-filter
- android:order="1">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <service android:name=".OrderService1"
+ android:exported="true">
+ <intent-filter android:order="1">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:path="/cts/packageresolution" />
+ android:host="www.google.com"
+ android:path="/cts/packageresolution"/>
</intent-filter>
</service>
<!-- Broadcast receivers used for queries -->
- <receiver android:name=".OrderReceiver3">
- <intent-filter
- android:order="3">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <receiver android:name=".OrderReceiver3"
+ android:exported="true">
+ <intent-filter android:order="3">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:pathPrefix="/cts" />
+ android:host="www.google.com"
+ android:pathPrefix="/cts"/>
</intent-filter>
</receiver>
- <receiver android:name=".OrderReceiverDefault">
+ <receiver android:name=".OrderReceiverDefault"
+ android:exported="true">
<intent-filter>
<!-- default order -->
- <action android:name="android.cts.intent.action.ORDERED" />
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com" />
+ android:host="www.google.com"/>
</intent-filter>
</receiver>
- <receiver android:name=".OrderReceiver1">
- <intent-filter
- android:order="1">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <receiver android:name=".OrderReceiver1"
+ android:exported="true">
+ <intent-filter android:order="1">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:path="/cts/packageresolution" />
+ android:host="www.google.com"
+ android:path="/cts/packageresolution"/>
</intent-filter>
</receiver>
- <receiver android:name=".OrderReceiver2">
- <intent-filter
- android:order="2">
- <action android:name="android.cts.intent.action.ORDERED" />
+ <receiver android:name=".OrderReceiver2"
+ android:exported="true">
+ <intent-filter android:order="2">
+ <action android:name="android.cts.intent.action.ORDERED"/>
<data android:scheme="https"
- android:host="www.google.com"
- android:pathPrefix="/cts/package" />
+ android:host="www.google.com"
+ android:pathPrefix="/cts/package"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.appsecurity.cts.orderedactivity" />
+ android:targetPackage="android.appsecurity.cts.orderedactivity"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml
index 04ed8f4..5bd8916 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml
@@ -15,49 +15,57 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.splitapp"
- android:targetSandboxVersion="2">
+ package="com.android.cts.splitapp"
+ android:targetSandboxVersion="2">
- <uses-sdk android:minSdkVersion="4" />
+ <uses-sdk android:minSdkVersion="4"/>
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
- <application android:label="SplitApp" android:multiArch="true" android:forceQueryable="true">
- <activity android:name=".MyActivity">
+ <application android:label="SplitApp"
+ android:multiArch="true"
+ android:forceQueryable="true">
+ <activity android:name=".MyActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.service.wallpaper" android:resource="@xml/my_activity_meta" />
+ <meta-data android:name="android.service.wallpaper"
+ android:resource="@xml/my_activity_meta"/>
</activity>
<receiver android:name=".MyReceiver"
- android:enabled="@bool/my_receiver_enabled">
+ android:enabled="@bool/my_receiver_enabled"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DATE_CHANGED" />
+ <action android:name="android.intent.action.DATE_CHANGED"/>
</intent-filter>
</receiver>
- <receiver android:name=".LockedBootReceiver" android:exported="true" android:directBootAware="true">
+ <receiver android:name=".LockedBootReceiver"
+ android:exported="true"
+ android:directBootAware="true">
<intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
</intent-filter>
</receiver>
- <receiver android:name=".BootReceiver" android:exported="true">
+ <receiver android:name=".BootReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<provider android:name=".RemoteQueryProvider"
- android:authorities="com.android.cts.splitapp"
- android:exported="true"
- android:directBootAware="true">
+ android:authorities="com.android.cts.splitapp"
+ android:exported="true"
+ android:directBootAware="true">
</provider>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.splitapp" />
+ android:targetPackage="com.android.cts.splitapp"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/feature/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/feature/AndroidManifest.xml
index be3adfc..c1ce39e 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/feature/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/feature/AndroidManifest.xml
@@ -15,34 +15,40 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.splitapp"
- split="feature">
+ package="com.android.cts.splitapp"
+ split="feature">
- <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="27" />
+ <uses-sdk android:minSdkVersion="4"
+ android:targetSdkVersion="27"/>
<!-- New permission should be ignored -->
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.INTERNET"/>
<!-- New application flag should be ignored -->
<application android:largeHeap="true">
- <activity android:name=".FeatureActivity">
+ <activity android:name=".FeatureActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.service.wallpaper" android:resource="@xml/my_activity_meta" />
+ <meta-data android:name="android.service.wallpaper"
+ android:resource="@xml/my_activity_meta"/>
</activity>
<receiver android:name=".FeatureReceiver"
- android:enabled="@bool/feature_receiver_enabled">
+ android:enabled="@bool/feature_receiver_enabled"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DATE_CHANGED" />
+ <action android:name="android.intent.action.DATE_CHANGED"/>
</intent-filter>
</receiver>
- <service android:name=".FeatureService">
+ <service android:name=".FeatureService"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.splitapp.service" />
+ <action android:name="com.android.cts.splitapp.service"/>
</intent-filter>
</service>
- <provider android:name=".FeatureProvider" android:authorities="com.android.cts.splitapp.provider" />
+ <provider android:name=".FeatureProvider"
+ android:authorities="com.android.cts.splitapp.provider"/>
</application>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/feature/needsplit/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/feature/needsplit/AndroidManifest.xml
index 7ce1830..07f19e4 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/feature/needsplit/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/feature/needsplit/AndroidManifest.xml
@@ -15,35 +15,41 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.splitapp"
- split="feature"
- android:isSplitRequired="true">
+ package="com.android.cts.splitapp"
+ split="feature"
+ android:isSplitRequired="true">
- <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="27" />
+ <uses-sdk android:minSdkVersion="4"
+ android:targetSdkVersion="27"/>
<!-- New permission should be ignored -->
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.INTERNET"/>
<!-- New application flag should be ignored -->
<application android:largeHeap="true">
- <activity android:name=".FeatureActivity">
+ <activity android:name=".FeatureActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.service.wallpaper" android:resource="@xml/my_activity_meta" />
+ <meta-data android:name="android.service.wallpaper"
+ android:resource="@xml/my_activity_meta"/>
</activity>
<receiver android:name=".FeatureReceiver"
- android:enabled="@bool/feature_receiver_enabled">
+ android:enabled="@bool/feature_receiver_enabled"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DATE_CHANGED" />
+ <action android:name="android.intent.action.DATE_CHANGED"/>
</intent-filter>
</receiver>
- <service android:name=".FeatureService">
+ <service android:name=".FeatureService"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.splitapp.service" />
+ <action android:name="com.android.cts.splitapp.service"/>
</intent-filter>
</service>
- <provider android:name=".FeatureProvider" android:authorities="com.android.cts.splitapp.provider" />
+ <provider android:name=".FeatureProvider"
+ android:authorities="com.android.cts.splitapp.provider"/>
</application>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/needsplit/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/needsplit/AndroidManifest.xml
index a2c050c..b39e605 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/needsplit/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/needsplit/AndroidManifest.xml
@@ -15,44 +15,51 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.splitapp"
- android:targetSandboxVersion="2"
- android:isSplitRequired="true" >
+ package="com.android.cts.splitapp"
+ android:targetSandboxVersion="2"
+ android:isSplitRequired="true">
- <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="27" />
+ <uses-sdk android:minSdkVersion="4"
+ android:targetSdkVersion="27"/>
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<application android:label="SplitApp">
- <activity android:name=".MyActivity">
+ <activity android:name=".MyActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.service.wallpaper" android:resource="@xml/my_activity_meta" />
+ <meta-data android:name="android.service.wallpaper"
+ android:resource="@xml/my_activity_meta"/>
</activity>
<receiver android:name=".MyReceiver"
- android:enabled="@bool/my_receiver_enabled">
+ android:enabled="@bool/my_receiver_enabled"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DATE_CHANGED" />
+ <action android:name="android.intent.action.DATE_CHANGED"/>
</intent-filter>
</receiver>
- <receiver android:name=".LockedBootReceiver" android:exported="true" android:directBootAware="true">
+ <receiver android:name=".LockedBootReceiver"
+ android:exported="true"
+ android:directBootAware="true">
<intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
</intent-filter>
</receiver>
- <receiver android:name=".BootReceiver" android:exported="true">
+ <receiver android:name=".BootReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.splitapp" />
+ android:targetPackage="com.android.cts.splitapp"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/revision/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/revision/AndroidManifest.xml
index 727c6c5c..d61d7d4 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/revision/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/revision/AndroidManifest.xml
@@ -15,33 +15,36 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.splitapp"
- android:targetSandboxVersion="2"
- android:revisionCode="12">
+ package="com.android.cts.splitapp"
+ android:targetSandboxVersion="2"
+ android:revisionCode="12">
- <uses-sdk android:targetSdkVersion="27" />
+ <uses-sdk android:targetSdkVersion="27"/>
- <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.CAMERA"/>
<application android:label="SplitApp">
- <activity android:name=".MyActivity">
+ <activity android:name=".MyActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.service.wallpaper" android:resource="@xml/my_activity_meta" />
+ <meta-data android:name="android.service.wallpaper"
+ android:resource="@xml/my_activity_meta"/>
</activity>
<receiver android:name=".MyReceiver"
- android:enabled="@bool/my_receiver_enabled">
+ android:enabled="@bool/my_receiver_enabled"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DATE_CHANGED" />
+ <action android:name="android.intent.action.DATE_CHANGED"/>
</intent-filter>
</receiver>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.splitapp" />
+ android:targetPackage="com.android.cts.splitapp"/>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/dummyime/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/dummyime/AndroidManifest.xml
index 2f71a4b..4ae9246 100644
--- a/hostsidetests/appsecurity/test-apps/dummyime/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/dummyime/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright 2019, The Android Open Source Project
@@ -17,15 +18,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dummyime">
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
+ package="com.android.cts.dummyime">
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
<application android:label="Dummy IME">
<service android:name=".CtsDummyIme"
- android:permission="android.permission.BIND_INPUT_METHOD">
+ android:permission="android.permission.BIND_INPUT_METHOD"
+ android:exported="true">
<intent-filter>
- <action android:name="android.view.InputMethod" />
+ <action android:name="android.view.InputMethod"/>
</intent-filter>
- <meta-data android:name="android.view.im" android:resource="@xml/method" />
+ <meta-data android:name="android.view.im"
+ android:resource="@xml/method"/>
</service>
</application>
</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-companion-shareduid.xml b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-companion-shareduid.xml
index 642653f..1cbca72 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-companion-shareduid.xml
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-companion-shareduid.xml
@@ -13,19 +13,20 @@
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.tinyapp_companion"
- android:sharedUserId="android.appsecurity.cts.tinyapp.shareduser"
- android:versionCode="10"
- android:versionName="1.0"
- android:targetSandboxVersion="2">
+ package="android.appsecurity.cts.tinyapp_companion"
+ android:sharedUserId="android.appsecurity.cts.tinyapp.shareduser"
+ android:versionCode="10"
+ android:versionName="1.0"
+ android:targetSandboxVersion="2">
<application android:label="@string/app_name">
- <activity
- android:name=".MainActivity"
- android:label="@string/app_name" >
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-companion2-shareduid.xml b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-companion2-shareduid.xml
index f7a639d..7377b00 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-companion2-shareduid.xml
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-companion2-shareduid.xml
@@ -13,19 +13,20 @@
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.tinyapp_companion2"
- android:sharedUserId="android.appsecurity.cts.tinyapp.shareduser"
- android:versionCode="10"
- android:versionName="1.0"
- android:targetSandboxVersion="2">
+ package="android.appsecurity.cts.tinyapp_companion2"
+ android:sharedUserId="android.appsecurity.cts.tinyapp.shareduser"
+ android:versionCode="10"
+ android:versionName="1.0"
+ android:targetSandboxVersion="2">
<application android:label="@string/app_name">
- <activity
- android:name=".MainActivity"
- android:label="@string/app_name" >
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-sandbox-v1.xml b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-sandbox-v1.xml
index 8ca3557..e9e7c8c 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-sandbox-v1.xml
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-sandbox-v1.xml
@@ -13,18 +13,19 @@
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.tinyapp"
- android:versionCode="10"
- android:versionName="1.0"
- android:targetSandboxVersion="1">
+ package="android.appsecurity.cts.tinyapp"
+ android:versionCode="10"
+ android:versionName="1.0"
+ android:targetSandboxVersion="1">
<application android:label="@string/app_name">
- <activity
- android:name=".MainActivity"
- android:label="@string/app_name" >
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-shareduid.xml b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-shareduid.xml
index 2c4d3d9..6591656 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-shareduid.xml
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-shareduid.xml
@@ -13,19 +13,20 @@
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.tinyapp"
- android:sharedUserId="android.appsecurity.cts.tinyapp.shareduser"
- android:versionCode="10"
- android:versionName="1.0"
- android:targetSandboxVersion="2">
+ package="android.appsecurity.cts.tinyapp"
+ android:sharedUserId="android.appsecurity.cts.tinyapp.shareduser"
+ android:versionCode="10"
+ android:versionName="1.0"
+ android:targetSandboxVersion="2">
<application android:label="@string/app_name">
- <activity
- android:name=".MainActivity"
- android:label="@string/app_name" >
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-v2.xml b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-v2.xml
index ef62aac..2c94a97 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-v2.xml
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest-v2.xml
@@ -14,18 +14,19 @@
~ 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.tinyapp"
- android:versionCode="20"
- android:versionName="2.0"
- android:targetSandboxVersion="2">
+ package="android.appsecurity.cts.tinyapp"
+ android:versionCode="20"
+ android:versionName="2.0"
+ android:targetSandboxVersion="2">
<application android:label="@string/app_name">
- <activity
- android:name=".MainActivity"
- android:label="@string/app_name" >
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest.xml
index 1ead3a2..39217ec 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/AndroidManifest.xml
@@ -13,18 +13,19 @@
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.tinyapp"
- android:versionCode="10"
- android:versionName="1.0"
- android:targetSandboxVersion="2">
+ package="android.appsecurity.cts.tinyapp"
+ android:versionCode="10"
+ android:versionName="1.0"
+ android:targetSandboxVersion="2">
<application android:label="@string/app_name">
- <activity
- android:name=".MainActivity"
- android:label="@string/app_name" >
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/atrace/AtraceTestApp/AndroidManifest.xml b/hostsidetests/atrace/AtraceTestApp/AndroidManifest.xml
index 2f213ab..c60f51c 100644
--- a/hostsidetests/atrace/AtraceTestApp/AndroidManifest.xml
+++ b/hostsidetests/atrace/AtraceTestApp/AndroidManifest.xml
@@ -13,19 +13,21 @@
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.cts.atracetestapp"
- android:targetSandboxVersion="2">
+ package="com.android.cts.atracetestapp"
+ android:targetSandboxVersion="2">
<!--
- A simple app with a tracing section to test that apps tracing signals are
- emitted by atrace.
- -->
+ A simple app with a tracing section to test that apps tracing signals are
+ emitted by atrace.
+ -->
<application>
- <activity android:name=".AtraceTestAppActivity">
+ <activity android:name=".AtraceTestAppActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Profileable to enable tracing -->
@@ -33,5 +35,5 @@
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.atracetestapp" />
+ android:targetPackage="com.android.cts.atracetestapp"/>
</manifest>
diff --git a/hostsidetests/backup/SharedPreferencesRestoreApp/AndroidManifest.xml b/hostsidetests/backup/SharedPreferencesRestoreApp/AndroidManifest.xml
index e2eb7c5..9939d4e 100644
--- a/hostsidetests/backup/SharedPreferencesRestoreApp/AndroidManifest.xml
+++ b/hostsidetests/backup/SharedPreferencesRestoreApp/AndroidManifest.xml
@@ -16,26 +16,25 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.cts.backup.sharedprefrestoreapp">
+ package="android.cts.backup.sharedprefrestoreapp">
- <application
- android:backupAgent=".SharedPreferencesBackupAgent"
- android:killAfterRestore="false" >
+ <application android:backupAgent=".SharedPreferencesBackupAgent"
+ android:killAfterRestore="false">
<activity android:name=".SharedPrefsRestoreTestActivity"
- android:launchMode="singleInstance">
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action android:name="android.backup.cts.backuprestore.INIT" />
- <action android:name="android.backup.cts.backuprestore.UPDATE" />
- <action android:name="android.backup.cts.backuprestore.TEST" />
+ <action android:name="android.backup.cts.backuprestore.INIT"/>
+ <action android:name="android.backup.cts.backuprestore.UPDATE"/>
+ <action android:name="android.backup.cts.backuprestore.TEST"/>
</intent-filter>
</activity>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.cts.backup.sharedprefrestoreapp" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.cts.backup.sharedprefrestoreapp"/>
</manifest>
diff --git a/hostsidetests/backup/SuccessNotificationApp/AndroidManifest.xml b/hostsidetests/backup/SuccessNotificationApp/AndroidManifest.xml
index 307b0e1..7a5cd6f 100644
--- a/hostsidetests/backup/SuccessNotificationApp/AndroidManifest.xml
+++ b/hostsidetests/backup/SuccessNotificationApp/AndroidManifest.xml
@@ -16,17 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.cts.backup.successnotificationapp">
+ package="android.cts.backup.successnotificationapp">
<application>
- <receiver android:name=".SuccessNotificationReceiver">
+ <receiver android:name=".SuccessNotificationReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.BACKUP_FINISHED" />
+ <action android:name="android.intent.action.BACKUP_FINISHED"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.cts.backup.successnotificationapp" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.cts.backup.successnotificationapp"/>
</manifest>
diff --git a/hostsidetests/backup/SyncAdapterSettingsApp/AndroidManifest.xml b/hostsidetests/backup/SyncAdapterSettingsApp/AndroidManifest.xml
index a46ff41..dd96aa6 100644
--- a/hostsidetests/backup/SyncAdapterSettingsApp/AndroidManifest.xml
+++ b/hostsidetests/backup/SyncAdapterSettingsApp/AndroidManifest.xml
@@ -16,35 +16,35 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.cts.backup.syncadaptersettingsapp">
+ package="android.cts.backup.syncadaptersettingsapp">
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<application android:label="BackupSyncAdapterSettings">
<uses-library android:name="android.test.runner"/>
- <service android:name=".SyncAdapterSettingsAuthenticator">
+ <service android:name=".SyncAdapterSettingsAuthenticator"
+ android:exported="true">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
- <meta-data
- android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/authenticator"/>
+ <meta-data android:name="android.accounts.AccountAuthenticator"
+ android:resource="@xml/authenticator"/>
</service>
<service android:name=".SyncAdapterSettingsService"
- android:exported="false">
+ android:exported="false">
<intent-filter>
<action android:name="android.content.SyncAdapter"/>
</intent-filter>
<meta-data android:name="android.content.SyncAdapter"
- android:resource="@xml/syncadapter"/>
+ android:resource="@xml/syncadapter"/>
</service>
<provider android:name=".SyncAdapterSettingsProvider"
- android:authorities="android.cts.backup.syncadaptersettingsapp.provider"/>
+ android:authorities="android.cts.backup.syncadaptersettingsapp.provider"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.cts.backup.syncadaptersettingsapp"/>
+ android:targetPackage="android.cts.backup.syncadaptersettingsapp"/>
</manifest>
diff --git a/hostsidetests/blobstore/OWNERS b/hostsidetests/blobstore/OWNERS
index 16b25bb..bf870975 100644
--- a/hostsidetests/blobstore/OWNERS
+++ b/hostsidetests/blobstore/OWNERS
@@ -1,2 +1,2 @@
# Bug component: 95221
-include platform/frameworks/base:apex/blobstore/OWNERS
+include platform/frameworks/base:/apex/blobstore/OWNERS
diff --git a/hostsidetests/classloaders/splits/apps/AndroidManifest.xml b/hostsidetests/classloaders/splits/apps/AndroidManifest.xml
index d2499fb..d693c21 100644
--- a/hostsidetests/classloaders/splits/apps/AndroidManifest.xml
+++ b/hostsidetests/classloaders/splits/apps/AndroidManifest.xml
@@ -15,29 +15,31 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.classloadersplitapp"
- android:isolatedSplits="true"
- android:targetSandboxVersion="2">
+ package="com.android.cts.classloadersplitapp"
+ android:isolatedSplits="true"
+ android:targetSandboxVersion="2">
<application android:label="ClassloaderSplitApp"
- android:classLoader="dalvik.system.PathClassLoader">
+ android:classLoader="dalvik.system.PathClassLoader">
- <activity android:name=".BaseActivity">
+ <activity android:name=".BaseActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <receiver android:name=".BaseReceiver">
+ <receiver android:name=".BaseReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.classloadersplitapp.ACTION" />
+ <action android:name="com.android.cts.classloadersplitapp.ACTION"/>
</intent-filter>
</receiver>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.classloadersplitapp" />
+ android:targetPackage="com.android.cts.classloadersplitapp"/>
</manifest>
diff --git a/hostsidetests/classloaders/splits/apps/feature_a/AndroidManifest.xml b/hostsidetests/classloaders/splits/apps/feature_a/AndroidManifest.xml
index 96807d6..6d801e9 100644
--- a/hostsidetests/classloaders/splits/apps/feature_a/AndroidManifest.xml
+++ b/hostsidetests/classloaders/splits/apps/feature_a/AndroidManifest.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.classloadersplitapp"
- featureSplit="feature_a"
- android:targetSandboxVersion="2">
+ package="com.android.cts.classloadersplitapp"
+ featureSplit="feature_a"
+ android:targetSandboxVersion="2">
<application android:classLoader="dalvik.system.DelegateLastClassLoader">
- <activity android:name=".feature_a.FeatureAActivity">
+ <activity android:name=".feature_a.FeatureAActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <receiver android:name=".feature_a.FeatureAReceiver">
+ <receiver android:name=".feature_a.FeatureAReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.classloadersplitapp.ACTION" />
+ <action android:name="com.android.cts.classloadersplitapp.ACTION"/>
</intent-filter>
</receiver>
</application>
diff --git a/hostsidetests/classloaders/splits/apps/feature_b/AndroidManifest.xml b/hostsidetests/classloaders/splits/apps/feature_b/AndroidManifest.xml
index fa975ad..3cde8aee 100644
--- a/hostsidetests/classloaders/splits/apps/feature_b/AndroidManifest.xml
+++ b/hostsidetests/classloaders/splits/apps/feature_b/AndroidManifest.xml
@@ -15,22 +15,24 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.classloadersplitapp"
- featureSplit="feature_b"
- android:targetSandboxVersion="2">
+ package="com.android.cts.classloadersplitapp"
+ featureSplit="feature_b"
+ android:targetSandboxVersion="2">
- <uses-split android:name="feature_a" />
+ <uses-split android:name="feature_a"/>
<application>
- <activity android:name=".feature_b.FeatureBActivity">
+ <activity android:name=".feature_b.FeatureBActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <receiver android:name=".feature_b.FeatureBReceiver">
+ <receiver android:name=".feature_b.FeatureBReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.classloadersplitapp.ACTION" />
+ <action android:name="com.android.cts.classloadersplitapp.ACTION"/>
</intent-filter>
</receiver>
</application>
diff --git a/hostsidetests/compilation/app/AndroidManifest.xml b/hostsidetests/compilation/app/AndroidManifest.xml
index cca9341..a27edfc 100755
--- a/hostsidetests/compilation/app/AndroidManifest.xml
+++ b/hostsidetests/compilation/app/AndroidManifest.xml
@@ -16,16 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.compilation.cts">
- <uses-sdk android:minSdkVersion="23" />
+ package="android.compilation.cts">
+ <uses-sdk android:minSdkVersion="23"/>
<application>
- <activity android:name=".CompilationTargetActivity" >
+ <activity android:name=".CompilationTargetActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml
index ed2d8dc..952829f 100644
--- a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml
@@ -15,30 +15,27 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.content.sync.cts">
+ package="android.content.sync.cts">
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<application>
- <uses-library android:name="android.test.runner" />
- <service
- android:name=".StubAuthenticator">
+ <uses-library android:name="android.test.runner"/>
+ <service android:name=".StubAuthenticator"
+ android:exported="true">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
- <meta-data
- android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/authenticator" />
+ <meta-data android:name="android.accounts.AccountAuthenticator"
+ android:resource="@xml/authenticator"/>
</service>
- <provider
- android:name=".StubProvider"
- android:authorities="android.content.sync.cts.authority">
+ <provider android:name=".StubProvider"
+ android:authorities="android.content.sync.cts.authority">
</provider>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.content.sync.cts" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.content.sync.cts"/>
</manifest>
diff --git a/hostsidetests/cpptools/TEST_MAPPING b/hostsidetests/cpptools/TEST_MAPPING
new file mode 100644
index 0000000..3707f3b
--- /dev/null
+++ b/hostsidetests/cpptools/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsCppToolsTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/cpptools/test-apps/BasicApp/AndroidManifest.xml b/hostsidetests/cpptools/test-apps/BasicApp/AndroidManifest.xml
index 6d4681e..aae67b7 100755
--- a/hostsidetests/cpptools/test-apps/BasicApp/AndroidManifest.xml
+++ b/hostsidetests/cpptools/test-apps/BasicApp/AndroidManifest.xml
@@ -16,17 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.cpptools.app">
+ package="android.cpptools.app">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application android:debuggable="true">
- <activity android:name=".CppToolsDeviceActivity" >
+ <activity android:name=".CppToolsDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/cpptools/test-apps/DomainSocketApp/AndroidManifest.xml b/hostsidetests/cpptools/test-apps/DomainSocketApp/AndroidManifest.xml
index b37f769..be602e9 100644
--- a/hostsidetests/cpptools/test-apps/DomainSocketApp/AndroidManifest.xml
+++ b/hostsidetests/cpptools/test-apps/DomainSocketApp/AndroidManifest.xml
@@ -16,14 +16,15 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.domainsocketapp">
+ package="com.android.cts.domainsocketapp">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application android:debuggable="true">
- <activity android:name=".DomainSocketActivity" >
+ <activity android:name=".DomainSocketActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/devicepolicy/TEST_MAPPING b/hostsidetests/devicepolicy/TEST_MAPPING
index 3d86cf3..d68a863 100644
--- a/hostsidetests/devicepolicy/TEST_MAPPING
+++ b/hostsidetests/devicepolicy/TEST_MAPPING
@@ -1,13 +1,26 @@
{
- "presubmit-devicepolicy": [
+ "presubmit": [
{
"name": "CtsDevicePolicyManagerTestCases",
"options": [
{
- "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest"
},
{
- "exclude-annotation": "android.platform.test.annotations.LargeTest"
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+ }
+ ]
+ }
+ ],
+ "presubmit": [
+ {
+ "name": "CtsDevicePolicyManagerTestCases",
+ "options": [
+ {
+ "include-annotation": "com.android.cts.devicepolicy.annotations.LockSettingsTest"
+ },
+ {
+ "exclude-annotation": "android.platform.test.annotations.FlakyTest"
}
]
}
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/AndroidManifest.xml
index 6b130b5..4f8f41a 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/AndroidManifest.xml
@@ -16,22 +16,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.devicepolicy.accountcheck.nontestonly"
- android:sharedUserId="com.android.cts.devicepolicy.accountcheck.uid">
+ package="com.android.cts.devicepolicy.accountcheck.nontestonly"
+ android:sharedUserId="com.android.cts.devicepolicy.accountcheck.uid">
<application android:testOnly="false">
- <receiver
- android:name="com.android.cts.devicepolicy.accountcheck.owner.AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.devicepolicy.accountcheck.owner.AdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
<!--
- Don't need instrumentation. All the three device side apps have the same UID, so we're able
- to run all tests from the Auth package.
- -->
+ Don't need instrumentation. All the three device side apps have the same UID, so we're able
+ to run all tests from the Auth package.
+ -->
</manifest>
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/AndroidManifest.xml
index a9673e9..ba829b4 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/AndroidManifest.xml
@@ -16,22 +16,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.devicepolicy.accountcheck.testonly"
- android:sharedUserId="com.android.cts.devicepolicy.accountcheck.uid">
+ package="com.android.cts.devicepolicy.accountcheck.testonly"
+ android:sharedUserId="com.android.cts.devicepolicy.accountcheck.uid">
<application android:testOnly="true">
- <receiver
- android:name="com.android.cts.devicepolicy.accountcheck.owner.AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.devicepolicy.accountcheck.owner.AdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
<!--
- Don't need instrumentation. All the three device side apps have the same UID, so we're able
- to run all tests from the Auth package.
- -->
+ Don't need instrumentation. All the three device side apps have the same UID, so we're able
+ to run all tests from the Auth package.
+ -->
</manifest>
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/AndroidManifest.xml
index cd186e9..e874e35 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/AndroidManifest.xml
@@ -14,26 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<!-- This package is exactly same as TestOnlyOwner, except for testOnly=false -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.devicepolicy.accountcheck.testonly"
- android:sharedUserId="com.android.cts.devicepolicy.accountcheck.uid">
+ package="com.android.cts.devicepolicy.accountcheck.testonly"
+ android:sharedUserId="com.android.cts.devicepolicy.accountcheck.uid">
<application android:testOnly="false">
- <receiver
- android:name="com.android.cts.devicepolicy.accountcheck.owner.AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.devicepolicy.accountcheck.owner.AdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
<!--
- Don't need instrumentation. All the three device side apps have the same UID, so we're able
- to run all tests from the Auth package.
- -->
+ Don't need instrumentation. All the three device side apps have the same UID, so we're able
+ to run all tests from the Auth package.
+ -->
</manifest>
diff --git a/hostsidetests/devicepolicy/app/AutofillApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AutofillApp/AndroidManifest.xml
index 711f984..da14401 100644
--- a/hostsidetests/devicepolicy/app/AutofillApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/AutofillApp/AndroidManifest.xml
@@ -16,23 +16,24 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.devicepolicy.autofillapp" >
+ package="com.android.cts.devicepolicy.autofillapp">
<application>
- <activity android:name=".SimpleActivity" android:exported="true">
+ <activity android:name=".SimpleActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <service
- android:name=".SimpleAutofillService"
- android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
+ <service android:name=".SimpleAutofillService"
+ android:permission="android.permission.BIND_AUTOFILL_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.autofill.AutofillService" />
+ <action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/CertInstaller/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CertInstaller/AndroidManifest.xml
index df47d0b..89c72ed 100644
--- a/hostsidetests/devicepolicy/app/CertInstaller/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/CertInstaller/AndroidManifest.xml
@@ -15,44 +15,42 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.certinstaller">
+ package="com.android.cts.certinstaller">
<uses-sdk android:minSdkVersion="22"/>
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <receiver android:name=".CertInstallerReceiver">
+ <receiver android:name=".CertInstallerReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.certinstaller.install_cert" />
- <action android:name="com.android.cts.certinstaller.remove_cert" />
- <action android:name="com.android.cts.certinstaller.verify_cert" />
- <action android:name="com.android.cts.certinstaller.install_keypair" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.certinstaller.install_cert"/>
+ <action android:name="com.android.cts.certinstaller.remove_cert"/>
+ <action android:name="com.android.cts.certinstaller.verify_cert"/>
+ <action android:name="com.android.cts.certinstaller.install_keypair"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</receiver>
- <activity
- android:name="android.app.Activity"
- android:exported="true">
+ <activity android:name="android.app.Activity"
+ android:exported="true">
</activity>
- <receiver
- android:name=".CertSelectionDelegateTest$CertSelectionReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name=".CertSelectionDelegateTest$CertSelectionReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<intent-filter>
<action android:name="android.app.action.CHOOSE_PRIVATE_KEY_ALIAS"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="Delegated Cert Installer CTS test"
- android:targetPackage="com.android.cts.certinstaller">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="Delegated Cert Installer CTS test"
+ android:targetPackage="com.android.cts.certinstaller">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/ContentCaptureService/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ContentCaptureService/AndroidManifest.xml
index 0710df7..fa4be0a 100644
--- a/hostsidetests/devicepolicy/app/ContentCaptureService/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/ContentCaptureService/AndroidManifest.xml
@@ -16,16 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.devicepolicy.contentcaptureservice" >
+ package="com.android.cts.devicepolicy.contentcaptureservice">
<application>
- <service
- android:name=".SimpleContentCaptureService"
- android:permission="android.permission.BIND_CONTENT_CAPTURE_SERVICE">
+ <service android:name=".SimpleContentCaptureService"
+ android:permission="android.permission.BIND_CONTENT_CAPTURE_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.contentcapture.ContentCaptureService" />
+ <action android:name="android.service.contentcapture.ContentCaptureService"/>
</intent-filter>
</service>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/ContentSuggestionsApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ContentSuggestionsApp/AndroidManifest.xml
index c42469b..8b78d27 100644
--- a/hostsidetests/devicepolicy/app/ContentSuggestionsApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/ContentSuggestionsApp/AndroidManifest.xml
@@ -16,23 +16,24 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.devicepolicy.contentsuggestionsapp" >
+ package="com.android.cts.devicepolicy.contentsuggestionsapp">
<application>
- <activity android:name=".SimpleActivity" android:exported="true">
+ <activity android:name=".SimpleActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <service
- android:name=".SimpleContentSuggestionsService"
- android:permission="android.permission.BIND_CONTENT_SUGGESTIONS_SERVICE">
+ <service android:name=".SimpleContentSuggestionsService"
+ android:permission="android.permission.BIND_CONTENT_SUGGESTIONS_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.contentsuggestions.ContentSuggestionsService" />
+ <action android:name="android.service.contentsuggestions.ContentSuggestionsService"/>
</intent-filter>
</service>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml
index b24e8c8..522153c 100644
--- a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml
@@ -15,21 +15,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.comp" >
+ package="com.android.cts.comp">
<!-- package="com.android.cts.comp2"
- We have com.android.cts.comp2 that have the exact same source but with different package
- name, see Android.mk for details. -->
- <application
- android:testOnly="true">
+ We have com.android.cts.comp2 that have the exact same source but with different package
+ name, see Android.mk for details. -->
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.comp.AdminReceiver"
- android:exported="true"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
- <meta-data
- android:name="android.app.device_admin"
- android:resource="@xml/device_admin"/>
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.comp.AdminReceiver"
+ android:exported="true"
+ android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <meta-data android:name="android.app.device_admin"
+ android:resource="@xml/device_admin"/>
<intent-filter>
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
<action android:name="android.app.action.PROFILE_PROVISIONING_COMPLETE"/>
@@ -38,22 +35,23 @@
<activity android:name="com.android.compatibility.common.util.devicepolicy.provisioning.StartProvisioningActivity"/>
<service android:name=".ProtectedCrossUserService"
- android:exported="true"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:exported="true"
+ android:permission="android.permission.BIND_DEVICE_ADMIN">
</service>
<service android:name=".UnprotectedCrossUserService"
- android:exported="true">
+ android:exported="true">
</service>
- <receiver android:name=".WipeDataReceiver">
+ <receiver android:name=".WipeDataReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.comp.WIPE_DATA" />
+ <action android:name="com.android.cts.comp.WIPE_DATA"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.comp"
- android:label="Corp owned managed profile CTS tests"/>
+ android:targetPackage="com.android.cts.comp"
+ android:label="Corp owned managed profile CTS tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/AndroidManifest.xml
index ae3ff05..afe1d9d 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/AndroidManifest.xml
@@ -15,23 +15,25 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.crossprofileappstest">
+ package="com.android.cts.crossprofileappstest">
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25"/>
+ <uses-sdk android:minSdkVersion="21"
+ android:targetSdkVersion="25"/>
<application>
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.crossprofileappstest.AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.crossprofileappstest.AdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <activity android:name=".MainActivity" android:exported="true">
+ <activity android:name=".MainActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@@ -39,13 +41,15 @@
</intent-filter>
</activity>
- <activity android:name=".NonMainActivity" android:exported="true">
+ <activity android:name=".NonMainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="nonMainActivity" />
+ <action android:name="nonMainActivity"/>
</intent-filter>
</activity>
- <activity android:name=".NonExportedActivity" android:exported="false">
+ <activity android:name=".NonExportedActivity"
+ android:exported="false">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@@ -53,12 +57,13 @@
</intent-filter>
</activity>
- <activity android:name=".CrossProfileSameTaskLauncherActivity" android:exported="true"/>
+ <activity android:name=".CrossProfileSameTaskLauncherActivity"
+ android:exported="true"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.crossprofileappstest"
- android:label="Launcher Apps CTS Tests"/>
+ android:targetPackage="com.android.cts.crossprofileappstest"
+ android:label="Launcher Apps CTS Tests"/>
- <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES" />
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/AndroidManifest.xml
index f3fde4c..2729fda 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/AndroidManifest.xml
@@ -16,24 +16,25 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.crossprofileenabledapp">
+ package="com.android.cts.crossprofileenabledapp">
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
- <application
- android:crossProfile="true">
- <receiver android:name=".CrossProfileEnabledAppReceiver">
+ <application android:crossProfile="true">
+ <receiver android:name=".CrossProfileEnabledAppReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
- <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE" />
- <action android:name="android.intent.action.MANAGED_PROFILE_ADDED" />
- <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED" />
+ <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_ADDED"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.crossprofileenabledapp"
- android:label="Launcher Apps CTS Tests"/>
+ android:targetPackage="com.android.cts.crossprofileenabledapp"
+ android:label="Launcher Apps CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/AndroidManifest.xml
index 243fa23..f7baec4 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/AndroidManifest.xml
@@ -16,25 +16,26 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.crossprofileenablednopermsapp">
+ package="com.android.cts.crossprofileenablednopermsapp">
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
<!-- We need to request the permission, which is denied in the test. -->
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
- <application
- android:crossProfile="true">
- <receiver android:name=".CrossProfileEnabledNoPermsAppReceiver">
+ <application android:crossProfile="true">
+ <receiver android:name=".CrossProfileEnabledNoPermsAppReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
- <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE" />
- <action android:name="android.intent.action.MANAGED_PROFILE_ADDED" />
- <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED" />
+ <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_ADDED"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.crossprofileenablednopermsapp"
- android:label="Launcher Apps CTS Tests"/>
+ android:targetPackage="com.android.cts.crossprofileenablednopermsapp"
+ android:label="Launcher Apps CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/AndroidManifest.xml
index 6af733e..d616942 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/AndroidManifest.xml
@@ -16,26 +16,27 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.crossprofilenotenabledapp">
+ package="com.android.cts.crossprofilenotenabledapp">
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
- <application
- android:crossProfile="false">
- <receiver android:name=".CrossProfileNotEnabledAppReceiver">
+ <application android:crossProfile="false">
+ <receiver android:name=".CrossProfileNotEnabledAppReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
- <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE" />
- <action android:name="android.intent.action.MANAGED_PROFILE_ADDED" />
- <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED" />
+ <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_ADDED"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.crossprofilenotenabledapp"
- android:label="Launcher Apps CTS Tests"/>
+ android:targetPackage="com.android.cts.crossprofilenotenabledapp"
+ android:label="Launcher Apps CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/AndroidManifest.xml
index c10c617..d89a88a 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/AndroidManifest.xml
@@ -16,24 +16,25 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.crossprofileuserenabledapp">
+ package="com.android.cts.crossprofileuserenabledapp">
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
- <application
- android:crossProfile="true">
- <receiver android:name=".CrossProfileUserEnabledAppReceiver">
+ <application android:crossProfile="true">
+ <receiver android:name=".CrossProfileUserEnabledAppReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
- <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE" />
- <action android:name="android.intent.action.MANAGED_PROFILE_ADDED" />
- <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED" />
+ <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_ADDED"/>
+ <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.crossprofileuserenabledapp"
- android:label="Launcher Apps CTS Tests"/>
+ android:targetPackage="com.android.cts.crossprofileuserenabledapp"
+ android:label="Launcher Apps CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml
index 33da314..319daca 100644
--- a/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml
@@ -15,25 +15,24 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.delegate">
+ package="com.android.cts.delegate">
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.INTERNET"/>
<application android:usesCleartextTraffic="true">
- <uses-library android:name="android.test.runner" />
- <activity
- android:name="com.android.cts.delegate.DelegatedScopesReceiverActivity"
- android:exported="true">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="com.android.cts.delegate.DelegatedScopesReceiverActivity"
+ android:exported="true">
</activity>
- <receiver
- android:name=".NetworkLoggingDelegateTest$NetworkLogsReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name=".NetworkLoggingDelegateTest$NetworkLogsReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<intent-filter>
<action android:name="android.app.action.NETWORK_LOGS_AVAILABLE"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.delegate"
- android:label="Delegation CTS Tests"/>
+ android:targetPackage="com.android.cts.delegate"
+ android:label="Delegation CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/AndroidManifest.xml
index 8e2fdc2..ecb9b7a 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/AndroidManifest.xml
@@ -15,38 +15,36 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceadmin23" >
+ package="com.android.cts.deviceadmin23">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
+ <uses-sdk android:minSdkVersion="23"
+ android:targetSdkVersion="23"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.deviceadmin.BaseDeviceAdminTest$AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- >
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.deviceadmin.BaseDeviceAdminTest$AdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name="com.android.cts.deviceadmin.DeviceAdminReceiverWithNoProtection"
- >
+ <receiver android:name="com.android.cts.deviceadmin.DeviceAdminReceiverWithNoProtection"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceadmin23"
- android:label="Device Admin CTS tests"/>
+ android:targetPackage="com.android.cts.deviceadmin23"
+ android:label="Device Admin CTS tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/AndroidManifest.xml
index 30bd6dc..d368801 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/AndroidManifest.xml
@@ -15,38 +15,36 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceadmin24" >
+ package="com.android.cts.deviceadmin24">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="24"/>
+ <uses-sdk android:minSdkVersion="23"
+ android:targetSdkVersion="24"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.deviceadmin.BaseDeviceAdminTest$AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- >
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.deviceadmin.BaseDeviceAdminTest$AdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name="com.android.cts.deviceadmin.DeviceAdminReceiverWithNoProtection"
- >
+ <receiver android:name="com.android.cts.deviceadmin.DeviceAdminReceiverWithNoProtection"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceadmin24"
- android:label="Device Admin CTS tests"/>
+ android:targetPackage="com.android.cts.deviceadmin24"
+ android:label="Device Admin CTS tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api29/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdmin/api29/AndroidManifest.xml
index 326e61f..5af6d62 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/api29/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api29/AndroidManifest.xml
@@ -15,38 +15,36 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceadmin29" >
+ package="com.android.cts.deviceadmin29">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29"/>
+ <uses-sdk android:minSdkVersion="23"
+ android:targetSdkVersion="29"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.deviceadmin.BaseDeviceAdminTest$AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- >
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.deviceadmin.BaseDeviceAdminTest$AdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name="com.android.cts.deviceadmin.DeviceAdminReceiverWithNoProtection"
- >
+ <receiver android:name="com.android.cts.deviceadmin.DeviceAdminReceiverWithNoProtection"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceadmin29"
- android:label="Device Admin CTS tests"/>
+ android:targetPackage="com.android.cts.deviceadmin29"
+ android:label="Device Admin CTS tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml
index d2b4b0c..1bd9261 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml
@@ -15,32 +15,30 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceadminservice" >
+ package="com.android.cts.deviceadminservice">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name=".MyOwner"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- >
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name=".MyOwner"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <service
- android:name=".MyService"
- android:exported="true"
- android:permission="android.permission.BIND_DEVICE_ADMIN" >
+ <service android:name=".MyService"
+ android:exported="true"
+ android:permission="android.permission.BIND_DEVICE_ADMIN">
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+ <action android:name="android.app.action.DEVICE_ADMIN_SERVICE"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceadminservice" />
+ android:targetPackage="com.android.cts.deviceadminservice"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml
index c57eb8e..83afcee 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml
@@ -15,32 +15,30 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceadminservice" >
+ package="com.android.cts.deviceadminservice">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name=".MyOwner"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- >
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name=".MyOwner"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <service
- android:name=".MyService"
- android:exported="false"
- android:permission="android.permission.BIND_DEVICE_ADMIN" >
+ <service android:name=".MyService"
+ android:exported="false"
+ android:permission="android.permission.BIND_DEVICE_ADMIN">
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+ <action android:name="android.app.action.DEVICE_ADMIN_SERVICE"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceadminservice" />
+ android:targetPackage="com.android.cts.deviceadminservice"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml
index 46a5fee..2801351 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml
@@ -15,31 +15,29 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceadminservice" >
+ package="com.android.cts.deviceadminservice">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name=".MyOwner"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- >
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name=".MyOwner"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <service
- android:name=".MyService"
- android:exported="false">
+ <service android:name=".MyService"
+ android:exported="false">
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+ <action android:name="android.app.action.DEVICE_ADMIN_SERVICE"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceadminservice" />
+ android:targetPackage="com.android.cts.deviceadminservice"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml
index 3a98de5..bea0cb7 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml
@@ -15,37 +15,36 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceadminservice" >
+ package="com.android.cts.deviceadminservice">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name=".MyOwner"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- >
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name=".MyOwner"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <service
- android:name=".MyService"
- android:permission="android.permission.BIND_DEVICE_ADMIN" >
+ <service android:name=".MyService"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+ <action android:name="android.app.action.DEVICE_ADMIN_SERVICE"/>
</intent-filter>
</service>
- <service
- android:name=".MyService2"
- android:permission="android.permission.BIND_DEVICE_ADMIN" >
+ <service android:name=".MyService2"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+ <action android:name="android.app.action.DEVICE_ADMIN_SERVICE"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceadminservice" />
+ android:targetPackage="com.android.cts.deviceadminservice"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml
index beb23a8..d21cea6 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml
@@ -15,30 +15,28 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceadminserviceb" >
+ package="com.android.cts.deviceadminserviceb">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.deviceadminservice.MyOwner"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- >
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.deviceadminservice.MyOwner"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <service
- android:name="com.android.cts.deviceadminservice.MyService"
- android:exported="true"
- android:permission="android.permission.BIND_DEVICE_ADMIN" >
+ <service android:name="com.android.cts.deviceadminservice.MyService"
+ android:exported="true"
+ android:permission="android.permission.BIND_DEVICE_ADMIN">
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+ <action android:name="android.app.action.DEVICE_ADMIN_SERVICE"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceadminservice" />
+ android:targetPackage="com.android.cts.deviceadminservice"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
index 307e985..52dbdd5 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
@@ -28,6 +28,7 @@
"cts-security-test-support-library",
"androidx.legacy_legacy-support-v4",
"cts-devicepolicy-suspensionchecker",
+ "devicepolicy-deviceside-common",
],
resource_dirs: ["res"],
asset_dirs: ["assets"],
@@ -56,6 +57,7 @@
"cts-security-test-support-library",
"androidx.legacy_legacy-support-v4",
"cts-devicepolicy-suspensionchecker",
+ "devicepolicy-deviceside-common",
],
resource_dirs: ["res"],
asset_dirs: ["assets"],
@@ -85,6 +87,7 @@
"cts-security-test-support-library",
"androidx.legacy_legacy-support-v4",
"cts-devicepolicy-suspensionchecker",
+ "devicepolicy-deviceside-common",
],
resource_dirs: ["res"],
asset_dirs: ["assets"],
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml
index 9580f16..b6ebb20 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml
@@ -15,37 +15,35 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceandprofileowner">
+ package="com.android.cts.deviceandprofileowner">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
+ <uses-sdk android:minSdkVersion="23"
+ android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
- <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.deviceandprofileowner.BaseDeviceAdminTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.deviceandprofileowner.BaseDeviceAdminTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="Profile and Device Owner CTS Tests API 23"
- android:targetPackage="com.android.cts.deviceandprofileowner">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="Profile and Device Owner CTS Tests API 23"
+ android:targetPackage="com.android.cts.deviceandprofileowner">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/AndroidManifest.xml
index 618284e..4010d31 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/AndroidManifest.xml
@@ -15,34 +15,33 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceandprofileowner">
+ package="com.android.cts.deviceandprofileowner">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="25"/>
- <uses-permission android:name="android.permission.CAMERA" />
+ <uses-sdk android:minSdkVersion="23"
+ android:targetSdkVersion="25"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
<!-- Add a network security config that trusts user added CAs for tests -->
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.deviceandprofileowner.BaseDeviceAdminTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- android:directBootAware="true">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.deviceandprofileowner.BaseDeviceAdminTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:directBootAware="true"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="Profile and Device Owner CTS Tests"
- android:targetPackage="com.android.cts.deviceandprofileowner">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="Profile and Device Owner CTS Tests"
+ android:targetPackage="com.android.cts.deviceandprofileowner">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
index 9f7660a..4be6cc9 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
@@ -15,63 +15,63 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceandprofileowner">
+ package="com.android.cts.deviceandprofileowner">
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.SET_WALLPAPER" />
- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
- <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
<!-- Needed to read the serial number during Device ID attestation tests -->
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<!-- Add a network security config that trusts user added CAs for tests -->
<application android:networkSecurityConfig="@xml/network_security_config"
- android:testOnly="true">
+ android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.deviceandprofileowner.BaseDeviceAdminTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN"
- android:directBootAware="true">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.deviceandprofileowner.BaseDeviceAdminTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:directBootAware="true"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <activity
- android:name="com.android.cts.deviceandprofileowner.ExampleIntentReceivingActivity1">
+ <activity android:name="com.android.cts.deviceandprofileowner.ExampleIntentReceivingActivity1"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.deviceandprofileowner.EXAMPLE_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.deviceandprofileowner.EXAMPLE_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity
- android:name="com.android.cts.deviceandprofileowner.ExampleIntentReceivingActivity2">
+ <activity android:name="com.android.cts.deviceandprofileowner.ExampleIntentReceivingActivity2"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.deviceandprofileowner.EXAMPLE_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.deviceandprofileowner.EXAMPLE_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity
- android:name=".SetPolicyActivity"
- android:launchMode="singleTop">
+ <activity android:name=".SetPolicyActivity"
+ android:launchMode="singleTop"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
@@ -84,52 +84,49 @@
<activity android:name=".PrintActivity"/>
- <activity
- android:name="com.android.cts.deviceandprofileowner.KeyManagementActivity"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+ <activity android:name="com.android.cts.deviceandprofileowner.KeyManagementActivity"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
- <activity
- android:name="com.android.cts.deviceandprofileowner.LockTaskUtilityActivity"/>
- <activity
- android:name="com.android.cts.deviceandprofileowner.LockTaskUtilityActivityIfWhitelisted"
- android:launchMode="singleInstance"
- android:lockTaskMode="if_whitelisted">
+ <activity android:name="com.android.cts.deviceandprofileowner.LockTaskUtilityActivity"/>
+ <activity android:name="com.android.cts.deviceandprofileowner.LockTaskUtilityActivityIfWhitelisted"
+ android:launchMode="singleInstance"
+ android:lockTaskMode="if_whitelisted"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.HOME"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity
- android:name="android.app.Activity">
+ <activity android:name="android.app.Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.action.CHECK_POLICY_COMPLIANCE" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.app.action.CHECK_POLICY_COMPLIANCE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <receiver android:name=".WipeDataReceiver">
+ <receiver android:name=".WipeDataReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.deviceandprofileowner.WIPE_DATA" />
+ <action android:name="com.android.cts.deviceandprofileowner.WIPE_DATA"/>
</intent-filter>
</receiver>
<service android:name=".NotificationListener"
- android:exported="true"
- android:label="Notification Listener"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+ android:exported="true"
+ android:label="Notification Listener"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
<intent-filter>
- <action android:name="android.service.notification.NotificationListenerService" />
+ <action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="Profile and Device Owner CTS Tests"
- android:targetPackage="com.android.cts.deviceandprofileowner">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="Profile and Device Owner CTS Tests"
+ android:targetPackage="com.android.cts.deviceandprofileowner">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CaCertManagementTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CaCertManagementTest.java
index 791f207..7097050 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CaCertManagementTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CaCertManagementTest.java
@@ -15,6 +15,10 @@
*/
package com.android.cts.deviceandprofileowner;
+import static com.android.compatibility.common.util.FakeKeys.FAKE_DSA_1;
+import static com.android.compatibility.common.util.FakeKeys.FAKE_RSA_1;
+
+import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.net.http.X509TrustManagerExtensions;
@@ -32,9 +36,6 @@
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
-import static com.android.compatibility.common.util.FakeKeys.FAKE_DSA_1;
-import static com.android.compatibility.common.util.FakeKeys.FAKE_RSA_1;
-
public class CaCertManagementTest extends BaseDeviceAdminTest {
private final ComponentName mAdmin = ADMIN_RECEIVER_COMPONENT;
@@ -48,19 +49,30 @@
assertNotNull(caCerts);
}
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ uninstallAllUserCaCerts();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ uninstallAllUserCaCerts();
+ super.tearDown();
+ }
+
/**
* Test: a valid cert should be installable and also removable.
*/
- public void testCanInstallAndUninstallACaCert()
- throws CertificateException, GeneralSecurityException {
+ public void testCanInstallAndUninstallACaCert() throws GeneralSecurityException {
assertUninstalled(FAKE_RSA_1.caCertificate);
assertUninstalled(FAKE_DSA_1.caCertificate);
- assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_RSA_1.caCertificate));
+ assertTrue(installCaCert(FAKE_RSA_1.caCertificate));
assertInstalled(FAKE_RSA_1.caCertificate);
assertUninstalled(FAKE_DSA_1.caCertificate);
- mDevicePolicyManager.uninstallCaCert(mAdmin, FAKE_RSA_1.caCertificate);
+ uninstallCaCert(FAKE_RSA_1.caCertificate);
assertUninstalled(FAKE_RSA_1.caCertificate);
assertUninstalled(FAKE_DSA_1.caCertificate);
}
@@ -68,42 +80,36 @@
/**
* Test: removing one certificate must not remove any others.
*/
- public void testUninstallationIsSelective()
- throws CertificateException, GeneralSecurityException {
- assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_RSA_1.caCertificate));
- assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_DSA_1.caCertificate));
+ public void testUninstallationIsSelective() throws GeneralSecurityException {
+ assertTrue(installCaCert(FAKE_RSA_1.caCertificate));
+ assertTrue(installCaCert(FAKE_DSA_1.caCertificate));
- mDevicePolicyManager.uninstallCaCert(mAdmin, FAKE_DSA_1.caCertificate);
+ uninstallCaCert(FAKE_DSA_1.caCertificate);
assertInstalled(FAKE_RSA_1.caCertificate);
assertUninstalled(FAKE_DSA_1.caCertificate);
- mDevicePolicyManager.uninstallCaCert(mAdmin, FAKE_RSA_1.caCertificate);
+ uninstallCaCert(FAKE_RSA_1.caCertificate);
}
/**
* Test: uninstallAllUserCaCerts should be equivalent to calling uninstallCaCert on every
* supplementary installed certificate.
*/
- public void testCanUninstallAllUserCaCerts()
- throws CertificateException, GeneralSecurityException {
- assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_RSA_1.caCertificate));
- assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_DSA_1.caCertificate));
+ public void testCanUninstallAllUserCaCerts() throws GeneralSecurityException {
+ assertTrue(installCaCert(FAKE_RSA_1.caCertificate));
+ assertTrue(installCaCert(FAKE_DSA_1.caCertificate));
- mDevicePolicyManager.uninstallAllUserCaCerts(mAdmin);
+ uninstallAllUserCaCerts();
assertUninstalled(FAKE_RSA_1.caCertificate);
assertUninstalled(FAKE_DSA_1.caCertificate);
}
- private void assertInstalled(byte[] caBytes)
- throws CertificateException, GeneralSecurityException {
- Certificate caCert = readCertificate(caBytes);
- assertTrue(isCaCertInstalledAndTrusted(caCert));
+ private void assertInstalled(byte[] caBytes) throws GeneralSecurityException {
+ assertTrue(isCaCertInstalledAndTrusted(caBytes));
}
- private void assertUninstalled(byte[] caBytes)
- throws CertificateException, GeneralSecurityException {
- Certificate caCert = readCertificate(caBytes);
- assertFalse(isCaCertInstalledAndTrusted(caCert));
+ private void assertUninstalled(byte[] caBytes) throws GeneralSecurityException {
+ assertFalse(isCaCertInstalledAndTrusted(caBytes));
}
private static X509TrustManager getFirstX509TrustManager(TrustManagerFactory tmf) {
@@ -131,8 +137,8 @@
* @return {@code true} if installed by all metrics, {@code false} if not installed by any
* metric. In any other case an {@link AssertionError} will be thrown.
*/
- private boolean isCaCertInstalledAndTrusted(Certificate caCert)
- throws GeneralSecurityException, CertificateException {
+ private boolean isCaCertInstalledAndTrusted(byte[] caBytes) throws GeneralSecurityException {
+ Certificate caCert = readCertificate(caBytes);
boolean installed = mDevicePolicyManager.hasCaCertInstalled(mAdmin, caCert.getEncoded());
boolean listed = false;
@@ -184,4 +190,16 @@
final CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
return certFactory.generateCertificate(new ByteArrayInputStream(certBuffer));
}
+
+ private boolean installCaCert(byte[] caCertificate) {
+ return mDevicePolicyManager.installCaCert(mAdmin, caCertificate);
+ }
+
+ private void uninstallCaCert(byte[] caCertificate) {
+ mDevicePolicyManager.uninstallCaCert(mAdmin, caCertificate);
+ }
+
+ private void uninstallAllUserCaCerts() {
+ mDevicePolicyManager.uninstallAllUserCaCerts(mAdmin);
+ }
}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/KeyManagementTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/KeyManagementTest.java
index f42db09..9af9bb1 100755
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/KeyManagementTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/KeyManagementTest.java
@@ -379,7 +379,7 @@
Attestation attestationRecord = new Attestation((X509Certificate) leaf);
AuthorizationList teeAttestation = attestationRecord.getTeeEnforced();
assertThat(teeAttestation).isNotNull();
- validateBrandAttestationRecord(teeAttestation);
+ assertThat(teeAttestation.getBrand()).isEqualTo(Build.BRAND);
assertThat(teeAttestation.getDevice()).isEqualTo(Build.DEVICE);
assertThat(teeAttestation.getProduct()).isEqualTo(Build.PRODUCT);
assertThat(teeAttestation.getManufacturer()).isEqualTo(Build.MANUFACTURER);
@@ -389,14 +389,6 @@
assertThat(teeAttestation.getMeid()).isEqualTo(expectedMeid);
}
- private void validateBrandAttestationRecord(AuthorizationList teeAttestation) {
- if (!Build.MODEL.equals("Pixel 2")) {
- assertThat(teeAttestation.getBrand()).isEqualTo(Build.BRAND);
- } else {
- assertThat(teeAttestation.getBrand()).isAnyOf(Build.BRAND, "htc");
- }
- }
-
private void validateAttestationRecord(List<Certificate> attestation, byte[] providedChallenge)
throws CertificateParsingException {
assertThat(attestation).isNotNull();
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java
index 82ce679..b3cd02c 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/UserRestrictionsParentTest.java
@@ -30,6 +30,8 @@
import android.test.InstrumentationTestCase;
import android.util.Log;
+import com.android.cts.devicepolicy.CameraUtils;
+
import com.google.common.collect.ImmutableSet;
import java.util.Set;
@@ -154,8 +156,7 @@
while (successToOpen != canOpen && retries > 0) {
retries--;
Thread.sleep(500);
- successToOpen = CameraUtils
- .blockUntilOpenCamera(mCameraManager, mBackgroundHandler);
+ successToOpen = CameraUtils.blockUntilOpenCamera(mCameraManager, mBackgroundHandler);
}
assertEquals(String.format("Timed out waiting the value to change to %b (actual=%b)",
canOpen, successToOpen), canOpen, successToOpen);
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
index 673e166..ba8e071 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
@@ -15,69 +15,68 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.deviceowner" >
+ package="com.android.cts.deviceowner">
<uses-sdk android:minSdkVersion="20"/>
- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.BLUETOOTH" />
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.BLUETOOTH"/>
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
- <application
- android:testOnly="true"
- android:usesCleartextTraffic="true">>
+ <application android:testOnly="true"
+ android:usesCleartextTraffic="true">>
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.deviceowner.BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.deviceowner.BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name="com.android.cts.deviceowner.CreateAndManageUserTest$TestProfileOwner"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.deviceowner.CreateAndManageUserTest$TestProfileOwner"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name="com.android.cts.deviceowner.CreateAndManageUserTest$SecondaryUserAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.deviceowner.CreateAndManageUserTest$SecondaryUserAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<service android:name="com.android.cts.deviceowner.CreateAndManageUserTest$PrimaryUserService"
- android:exported="true"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:exported="true"
+ android:permission="android.permission.BIND_DEVICE_ADMIN">
</service>
- <activity
- android:name=".SetPolicyActivity"
- android:launchMode="singleTop">
+ <activity android:name=".SetPolicyActivity"
+ android:launchMode="singleTop"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
@@ -85,19 +84,19 @@
<activity android:name="com.android.compatibility.common.util.devicepolicy.provisioning.StartProvisioningActivity"/>
<service android:name="com.android.cts.deviceowner.NotificationListener"
- android:label="Notification Listener"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+ android:label="Notification Listener"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.notification.NotificationListenerService" />
+ <action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.deviceowner"
- android:label="Device Owner CTS tests">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ android:targetPackage="com.android.cts.deviceowner"
+ android:label="Device Owner CTS tests">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/proxy/PacProxyTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/proxy/PacProxyTest.java
index ce5aa03..2e35bd4 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/proxy/PacProxyTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/proxy/PacProxyTest.java
@@ -78,6 +78,15 @@
"}";
/**
+ * PAC file that uses locale-specific string manipulations.
+ */
+ private static final String STRING_CASE_PAC = "function FindProxyForURL(url, host) {" +
+ " if (\"hElLo\".toUpperCase() != \"HELLO\") return \"PROXY failed:8080\";" +
+ " if (\"hElLo\".toLowerCase() != \"hello\") return \"PROXY failed:8080\";" +
+ " return \"PROXY passed:8080\";" +
+ "}";
+
+ /**
* Wait for the PacFileServer to tell us it has had a successful
* HTTP request and responded with the PAC file we set.
*/
@@ -260,4 +269,22 @@
assertEquals("Incorrect URL should return DIRECT",
newArrayList(Proxy.NO_PROXY), list);
}
+
+ /**
+ * Test a PAC file with toUpperCase/toLowerCase manipulations.
+ */
+ public void testStringCase() throws Exception {
+ mPacServer.setPacFile(STRING_CASE_PAC);
+ setPacURLAndWaitForDownload();
+
+ waitForSetProxySysProp();
+
+ URI uri = new URI("http://testhost/");
+
+ ProxySelector selector = ProxySelector.getDefault();
+ List<Proxy> list = selector.select(uri);
+ assertEquals("Correct URL returns proxy",
+ newArrayList(new Proxy(Type.HTTP, InetSocketAddress.createUnresolved("passed", 8080))),
+ list);
+ }
}
diff --git a/hostsidetests/devicepolicy/app/DummyApps/dummyapp1/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DummyApps/dummyapp1/AndroidManifest.xml
index 3bec42a..4e8701c 100644
--- a/hostsidetests/devicepolicy/app/DummyApps/dummyapp1/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DummyApps/dummyapp1/AndroidManifest.xml
@@ -14,25 +14,25 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<!--
~ A dummy app used for when you need to install test packages that have a functioning package name
~ and UID. For example, you could use it to set permissions or app-ops.
-->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dummyapps.dummyapp1">
+ package="com.android.cts.dummyapps.dummyapp1">
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
<application android:testOnly="true"
- android:crossProfile="true">
- <uses-library android:name="android.test.runner" />
- <receiver android:name=".CanInteractAcrossProfilesChangedReceiver">
+ android:crossProfile="true">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name=".CanInteractAcrossProfilesChangedReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED" />
+ <action android:name="android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED"/>
</intent-filter>
</receiver>
- <activity
- android:name="android.app.Activity"
- android:exported="true">
+ <activity android:name="android.app.Activity"
+ android:exported="true">
</activity>
</application>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DummyApps/dummyapp2/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DummyApps/dummyapp2/AndroidManifest.xml
index 1f1975f..fe1ee2b 100644
--- a/hostsidetests/devicepolicy/app/DummyApps/dummyapp2/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DummyApps/dummyapp2/AndroidManifest.xml
@@ -14,25 +14,25 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<!--
~ A dummy app used for when you need to install test packages that have a functioning package name
~ and UID. For example, you could use it to set permissions or app-ops.
-->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dummyapps.dummyapp2">
+ package="com.android.cts.dummyapps.dummyapp2">
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
<application android:testOnly="true"
- android:crossProfile="true">
- <uses-library android:name="android.test.runner" />
- <receiver android:name=".CanInteractAcrossProfilesChangedReceiver">
+ android:crossProfile="true">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name=".CanInteractAcrossProfilesChangedReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED" />
+ <action android:name="android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED"/>
</intent-filter>
</receiver>
- <activity
- android:name="android.app.Activity"
- android:exported="true">
+ <activity android:name="android.app.Activity"
+ android:exported="true">
</activity>
</application>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DummyApps/dummyapp3/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DummyApps/dummyapp3/AndroidManifest.xml
index 446c3a1..669a758 100644
--- a/hostsidetests/devicepolicy/app/DummyApps/dummyapp3/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DummyApps/dummyapp3/AndroidManifest.xml
@@ -14,25 +14,25 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<!--
~ A dummy app used for when you need to install test packages that have a functioning package name
~ and UID. For example, you could use it to set permissions or app-ops.
-->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dummyapps.dummyapp3">
+ package="com.android.cts.dummyapps.dummyapp3">
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
<application android:testOnly="true"
- android:crossProfile="true">
- <uses-library android:name="android.test.runner" />
- <receiver android:name=".CanInteractAcrossProfilesChangedReceiver">
+ android:crossProfile="true">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name=".CanInteractAcrossProfilesChangedReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED" />
+ <action android:name="android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED"/>
</intent-filter>
</receiver>
- <activity
- android:name="android.app.Activity"
- android:exported="true">
+ <activity android:name="android.app.Activity"
+ android:exported="true">
</activity>
</application>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DummyApps/dummyapp4/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DummyApps/dummyapp4/AndroidManifest.xml
index 8c0356c..78ad1b6 100644
--- a/hostsidetests/devicepolicy/app/DummyApps/dummyapp4/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DummyApps/dummyapp4/AndroidManifest.xml
@@ -14,25 +14,25 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<!--
~ A dummy app used for when you need to install test packages that have a functioning package name
~ and UID. For example, you could use it to set permissions or app-ops.
-->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dummyapps.dummyapp4">
+ package="com.android.cts.dummyapps.dummyapp4">
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
<application android:testOnly="true"
- android:crossProfile="true">
- <uses-library android:name="android.test.runner" />
- <receiver android:name=".CanInteractAcrossProfilesChangedReceiver">
+ android:crossProfile="true">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name=".CanInteractAcrossProfilesChangedReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED" />
+ <action android:name="android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED"/>
</intent-filter>
</receiver>
- <activity
- android:name="android.app.Activity"
- android:exported="true">
+ <activity android:name="android.app.Activity"
+ android:exported="true">
</activity>
</application>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DummyIme/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DummyIme/AndroidManifest.xml
index aae922a..7ac888f 100644
--- a/hostsidetests/devicepolicy/app/DummyIme/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DummyIme/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright 2020, The Android Open Source Project
@@ -17,27 +18,29 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dummyime">
+ package="com.android.cts.dummyime">
<application android:label="Dummy IME">
<service android:name="DummyIme"
- android:permission="android.permission.BIND_INPUT_METHOD">
+ android:permission="android.permission.BIND_INPUT_METHOD"
+ android:exported="true">
<intent-filter>
- <action android:name="android.view.InputMethod" />
+ <action android:name="android.view.InputMethod"/>
</intent-filter>
- <meta-data android:name="android.view.im" android:resource="@xml/method" />
+ <meta-data android:name="android.view.im"
+ android:resource="@xml/method"/>
</service>
- <activity android:name=".ImePreferences" android:label="Dummy IME Settings">
+ <activity android:name=".ImePreferences"
+ android:label="Dummy IME Settings"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.dummyime">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.dummyime">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/DummyLauncher/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DummyLauncher/AndroidManifest.xml
index a80e9b4..1195e28 100644
--- a/hostsidetests/devicepolicy/app/DummyLauncher/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DummyLauncher/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright 2020, The Android Open Source Project
@@ -17,9 +18,10 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dummylauncher">
+ package="com.android.cts.dummylauncher">
<application android:label="Dummy Launcher">
- <activity android:name="android.app.Activity">
+ <activity android:name="android.app.Activity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.HOME"/>
@@ -27,14 +29,12 @@
</intent-filter>
</activity>
<activity android:name=".QuietModeToggleActivity"
- android:exported="true"/>
+ android:exported="true"/>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.dummylauncher">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.dummylauncher">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/HasLauncherActivityApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/HasLauncherActivityApp/AndroidManifest.xml
index 760b31f..c1b179d 100755
--- a/hostsidetests/devicepolicy/app/HasLauncherActivityApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/HasLauncherActivityApp/AndroidManifest.xml
@@ -16,17 +16,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.haslauncheractivityapp">
- <uses-permission android:name="android.permission.INTERNET" />
+ package="com.android.cts.haslauncheractivityapp">
+ <uses-permission android:name="android.permission.INTERNET"/>
<application android:testOnly="true">
- <activity android:name="com.android.cts.haslauncheractivityapp.MainActivity">
+ <activity android:name="com.android.cts.haslauncheractivityapp.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <service android:name=".EmptyService" android:enabled="true"></service>
+ <service android:name=".EmptyService"
+ android:enabled="true"/>
</application>
</manifest>
-
diff --git a/hostsidetests/devicepolicy/app/HasLauncherActivityApp/no_launcher_activity_AndroidManifest.xml b/hostsidetests/devicepolicy/app/HasLauncherActivityApp/no_launcher_activity_AndroidManifest.xml
index ae2249a..614377c 100755
--- a/hostsidetests/devicepolicy/app/HasLauncherActivityApp/no_launcher_activity_AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/HasLauncherActivityApp/no_launcher_activity_AndroidManifest.xml
@@ -19,7 +19,8 @@
package="com.android.cts.nolauncheractivityapp">
<uses-permission android:name="android.permission.INTERNET" />
<application>
- <activity android:name="com.android.cts.haslauncheractivityapp.MainActivity">
+ <activity android:name="com.android.cts.haslauncheractivityapp.MainActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
</intent-filter>
diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/AndroidManifest.xml b/hostsidetests/devicepolicy/app/IntentReceiver/AndroidManifest.xml
index 22614fe..a5b4801 100644
--- a/hostsidetests/devicepolicy/app/IntentReceiver/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/IntentReceiver/AndroidManifest.xml
@@ -15,35 +15,37 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.intent.receiver">
+ package="com.android.cts.intent.receiver">
<uses-sdk android:minSdkVersion="19"/>
<uses-permission android:name="com.android.cts.managedprofile.permission.SAMPLE"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="com.android.cts.intent.receiver.IntentReceiverActivity">
+ <activity android:name="com.android.cts.intent.receiver.IntentReceiverActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.action.COPY_TO_CLIPBOARD" />
- <action android:name="com.android.cts.action.READ_FROM_URI" />
- <action android:name="com.android.cts.action.TAKE_PERSISTABLE_URI_PERMISSION" />
- <action android:name="com.android.cts.action.WRITE_TO_URI" />
+ <action android:name="com.android.cts.action.COPY_TO_CLIPBOARD"/>
+ <action android:name="com.android.cts.action.READ_FROM_URI"/>
+ <action android:name="com.android.cts.action.TAKE_PERSISTABLE_URI_PERMISSION"/>
+ <action android:name="com.android.cts.action.WRITE_TO_URI"/>
<action android:name="com.android.cts.action.NOTIFY_URI_CHANGE"/>
<action android:name="com.android.cts.action.OBSERVE_URI_CHANGE"/>
- <action android:name="com.android.cts.action.JUST_CREATE" />
- <action android:name="com.android.cts.action.CREATE_AND_WAIT" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.action.JUST_CREATE"/>
+ <action android:name="com.android.cts.action.CREATE_AND_WAIT"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity android:name=".SimpleIntentReceiverActivity" android:exported="true"/>
+ <activity android:name=".SimpleIntentReceiverActivity"
+ android:exported="true"/>
<activity-alias android:name=".BrowserActivity"
- android:targetActivity=".SimpleIntentReceiverActivity">
+ android:targetActivity=".SimpleIntentReceiverActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
@@ -53,16 +55,19 @@
</activity-alias>
<activity-alias android:name=".AppLinkActivity"
- android:targetActivity=".SimpleIntentReceiverActivity">
+ android:targetActivity=".SimpleIntentReceiverActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
- <data android:scheme="http" android:host="com.android.cts.intent.receiver"/>
+ <data android:scheme="http"
+ android:host="com.android.cts.intent.receiver"/>
</intent-filter>
</activity-alias>
- <receiver android:name=".BroadcastIntentReceiver">
+ <receiver android:name=".BroadcastIntentReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.app.action.DEVICE_OWNER_CHANGED"/>
</intent-filter>
@@ -70,9 +75,8 @@
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.intent.receiver"
- android:label="Intent Receiver CTS Tests" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.intent.receiver"
+ android:label="Intent Receiver CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/IntentSender/AndroidManifest.xml b/hostsidetests/devicepolicy/app/IntentSender/AndroidManifest.xml
index 730250b..4953096 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/IntentSender/AndroidManifest.xml
@@ -15,43 +15,39 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.intent.sender">
+ package="com.android.cts.intent.sender">
- <permission
- android:name="com.android.cts.intent.sender.permission.SAMPLE"
- android:label="Sample Permission" />
+ <permission android:name="com.android.cts.intent.sender.permission.SAMPLE"
+ android:label="Sample Permission"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name=".IntentSenderActivity">
+ <activity android:name=".IntentSenderActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <provider
- android:name="androidx.core.content.FileProvider"
- android:authorities="com.android.cts.intent.sender.fileprovider"
- android:grantUriPermissions="true"
- android:exported="false">
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/filepaths" />
+ <provider android:name="androidx.core.content.FileProvider"
+ android:authorities="com.android.cts.intent.sender.fileprovider"
+ android:grantUriPermissions="true"
+ android:exported="false">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/filepaths"/>
</provider>
- <provider
- android:name=".BasicContentProvider"
- android:authorities="com.android.cts.intent.sender.provider"
- android:grantUriPermissions="true"
- android:exported="true"
- android:permission="com.android.cts.intent.sender.permission.SAMPLE" />
+ <provider android:name=".BasicContentProvider"
+ android:authorities="com.android.cts.intent.sender.provider"
+ android:grantUriPermissions="true"
+ android:exported="true"
+ android:permission="com.android.cts.intent.sender.permission.SAMPLE"/>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.intent.sender"
- android:label="Intent Sender CTS Tests" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.intent.sender"
+ android:label="Intent Sender CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/LauncherTestsSupport/AndroidManifest.xml b/hostsidetests/devicepolicy/app/LauncherTestsSupport/AndroidManifest.xml
index 14abd1a..ae9b27e 100644
--- a/hostsidetests/devicepolicy/app/LauncherTestsSupport/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/LauncherTestsSupport/AndroidManifest.xml
@@ -15,19 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.launchertests.support">
+ package="com.android.cts.launchertests.support">
<!-- Target 25. Don't change to >= 26 since that'll break background services. -->
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25"/>
+ <uses-sdk android:minSdkVersion="21"
+ android:targetSdkVersion="25"/>
<application>
- <service android:name=".LauncherCallbackTestsService" >
+ <service android:name=".LauncherCallbackTestsService"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.launchertests.support.REGISTER_CALLBACK" />
+ <action android:name="com.android.cts.launchertests.support.REGISTER_CALLBACK"/>
</intent-filter>
</service>
- <activity android:name=".LauncherActivity">
+ <activity android:name=".LauncherActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.HOME"/>
@@ -35,7 +38,8 @@
</intent-filter>
</activity>
- <receiver android:name=".QuietModeCommandReceiver" android:exported="true">
+ <receiver android:name=".QuietModeCommandReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="toggle_quiet_mode"/>
</intent-filter>
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
index a99bd1b..97ab701 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
@@ -30,6 +30,7 @@
"truth-prebuilt",
"testng",
"androidx.legacy_legacy-support-v4",
+ "devicepolicy-deviceside-common",
],
min_sdk_version: "27",
// tag this module as a cts test artifact
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
index e5786f6..99d440d 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
@@ -15,148 +15,155 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.managedprofile">
+ package="com.android.cts.managedprofile">
<uses-sdk android:minSdkVersion="27"/>
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
- <uses-permission android:name="android.permission.BLUETOOTH" />
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.WRITE_CONTACTS" />
- <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.BLUETOOTH"/>
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.CALL_PHONE"/>
<uses-permission android:name="android.permission.READ_CALL_LOG"/>
<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
- <uses-permission android:name="android.permission.READ_CALENDAR" />
- <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+ <uses-permission android:name="android.permission.READ_CALENDAR"/>
+ <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
<uses-permission android:name="android.permission.REQUEST_PASSWORD_COMPLEXITY"/>
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.managedprofile.BaseManagedProfileTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.managedprofile.BaseManagedProfileTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name="com.android.cts.managedprofile.ProvisioningTest$ProvisioningAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.managedprofile.ProvisioningTest$ProvisioningAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name="com.android.cts.managedprofile.PrimaryUserDeviceAdmin"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.managedprofile.PrimaryUserDeviceAdmin"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/primary_device_admin" />
+ android:resource="@xml/primary_device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <activity android:name=".PrimaryUserFilterSetterActivity">
+ <activity android:name=".PrimaryUserFilterSetterActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".ComponentDisablingActivity" android:exported="true">
+ <activity android:name=".ComponentDisablingActivity"
+ android:exported="true">
</activity>
- <activity android:name=".ManagedProfileActivity">
+ <activity android:name=".ManagedProfileActivity"
+ android:exported="true">
<intent-filter>
<category android:name="android.intent.category.DEFAULT"/>
- <action android:name="com.android.cts.managedprofile.ACTION_TEST_MANAGED_ACTIVITY" />
+ <action android:name="com.android.cts.managedprofile.ACTION_TEST_MANAGED_ACTIVITY"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SEND_MULTIPLE" />
- <data android:mimeType="*/*" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SEND_MULTIPLE"/>
+ <data android:mimeType="*/*"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity android:name=".PrimaryUserActivity">
+ <activity android:name=".PrimaryUserActivity"
+ android:exported="true">
<intent-filter>
<category android:name="android.intent.category.DEFAULT"/>
- <action android:name="com.android.cts.managedprofile.ACTION_TEST_PRIMARY_ACTIVITY" />
+ <action android:name="com.android.cts.managedprofile.ACTION_TEST_PRIMARY_ACTIVITY"/>
</intent-filter>
<!-- Catch ACTION_PICK in case there is no other app handing it -->
<intent-filter>
- <action android:name="android.intent.action.PICK" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
- <activity android:name=".AllUsersActivity">
- <intent-filter>
- <category android:name="android.intent.category.DEFAULT"/>
- <action android:name="com.android.cts.managedprofile.ACTION_TEST_ALL_ACTIVITY" />
- </intent-filter>
- </activity>
- <activity
- android:name=".SetPolicyActivity"
- android:launchMode="singleTop">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.PICK"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity android:name=".TestActivity" />
+ <activity android:name=".AllUsersActivity"
+ android:exported="true">
+ <intent-filter>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <action android:name="com.android.cts.managedprofile.ACTION_TEST_ALL_ACTIVITY"/>
+ </intent-filter>
+ </activity>
+ <activity android:name=".SetPolicyActivity"
+ android:launchMode="singleTop"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ </activity>
+ <activity android:name=".TestActivity"/>
<service android:name=".DummyConnectionService"
- android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
+ android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.ConnectionService" />
+ <action android:name="android.telecom.ConnectionService"/>
</intent-filter>
</service>
- <activity android:name=".DummyDialerActivity">
+ <activity android:name=".DummyDialerActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:mimeType="vnd.android.cursor.item/phone" />
- <data android:mimeType="vnd.android.cursor.item/person" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:mimeType="vnd.android.cursor.item/phone"/>
+ <data android:mimeType="vnd.android.cursor.item/person"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="tel" />
+ <action android:name="android.intent.action.VIEW"/>
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="tel"/>
</intent-filter>
</activity>
- <service android:name=".AccountService" android:exported="true">
+ <service android:name=".AccountService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accounts.AccountAuthenticator" />
+ <action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
<meta-data android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/authenticator" />
+ android:resource="@xml/authenticator"/>
</service>
<activity android:name="com.android.compatibility.common.util.devicepolicy.provisioning.StartProvisioningActivity"/>
- <activity
- android:name=".ProvisioningSuccessActivity"
- android:theme="@android:style/Theme.NoDisplay">
+ <activity android:name=".ProvisioningSuccessActivity"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<intent-filter>
<action android:name="android.app.action.PROVISIONING_SUCCESSFUL"/>
<category android:name="android.intent.category.DEFAULT"/>
@@ -164,68 +171,72 @@
</activity>
<activity android:name=".WebViewActivity"
- android:process=":testProcess"/>
+ android:process=":testProcess"/>
- <activity android:name=".TimeoutActivity" android:exported="true"/>
+ <activity android:name=".TimeoutActivity"
+ android:exported="true"/>
- <activity
- android:name=".DummyCrossProfileViewEventActivity"
- android:exported="true">
+ <activity android:name=".DummyCrossProfileViewEventActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.provider.calendar.action.VIEW_MANAGED_PROFILE_CALENDAR_EVENT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <service
- android:name=".CrossProfileNotificationListenerService"
- android:label="CrossProfileNotificationListenerService"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+ <service android:name=".CrossProfileNotificationListenerService"
+ android:label="CrossProfileNotificationListenerService"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.notification.NotificationListenerService" />
+ <action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
</service>
- <receiver android:name=".MissedCallNotificationReceiver">
+ <receiver android:name=".MissedCallNotificationReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />
+ <action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION"/>
</intent-filter>
</receiver>
<!-- Dummy receiver that's decleared direct boot aware. This is needed to make the test app
- executable by instrumentation before device unlock -->
+ executable by instrumentation before device unlock -->
<receiver android:name=".ResetPasswordWithTokenTest$DummyReceiver"
- android:directBootAware="true" >
+ android:directBootAware="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
</intent-filter>
</receiver>
- <receiver android:name=".LockProfileReceiver">
+ <receiver android:name=".LockProfileReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.managedprofile.LOCK_PROFILE" />
+ <action android:name="com.android.cts.managedprofile.LOCK_PROFILE"/>
</intent-filter>
</receiver>
- <receiver android:name=".WipeDataReceiver">
+ <receiver android:name=".WipeDataReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.managedprofile.WIPE_DATA" />
- <action android:name="com.android.cts.managedprofile.WIPE_DATA_WITH_REASON" />
+ <action android:name="com.android.cts.managedprofile.WIPE_DATA"/>
+ <action android:name="com.android.cts.managedprofile.WIPE_DATA_WITH_REASON"/>
</intent-filter>
</receiver>
<service android:name=".NotificationListener"
- android:exported="true"
- android:label="Notification Listener"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+ android:exported="true"
+ android:label="Notification Listener"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
<intent-filter>
- <action android:name="android.service.notification.NotificationListenerService" />
+ <action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.managedprofile"
- android:label="Managed Profile CTS Tests"/>
+ android:targetPackage="com.android.cts.managedprofile"
+ android:label="Managed Profile CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CameraPolicyTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CameraPolicyTest.java
index 6a57e2e..e3523e3 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CameraPolicyTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CameraPolicyTest.java
@@ -24,6 +24,8 @@
import android.os.HandlerThread;
import android.test.AndroidTestCase;
+import com.android.cts.devicepolicy.CameraUtils;
+
public class CameraPolicyTest extends AndroidTestCase {
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CameraUtils.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CameraUtils.java
deleted file mode 100644
index 516e244..0000000
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CameraUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2015 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.cts.managedprofile;
-
-import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
-import android.os.Handler;
-import android.util.Log;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * A util class to help open camera in a blocking way.
- */
-class CameraUtils {
-
- private static final String TAG = "CameraUtils";
-
- /**
- * @return true if success to open camera, false otherwise.
- */
- public static boolean blockUntilOpenCamera(CameraManager cameraManager, Handler handler) {
- try {
- String[] cameraIdList = cameraManager.getCameraIdList();
- if (cameraIdList == null || cameraIdList.length == 0) {
- return false;
- }
- String cameraId = cameraIdList[0];
- CameraCallback callback = new CameraCallback();
- cameraManager.openCamera(cameraId, callback, handler);
- return callback.waitForResult();
- } catch (Exception ex) {
- // No matter what is going wrong, it means fail to open camera.
- ex.printStackTrace();
- return false;
- }
- }
-
- /**
- * {@link CameraDevice.StateCallback} is called when {@link CameraDevice} changes its state.
- */
- private static class CameraCallback extends CameraDevice.StateCallback {
-
- private static final int OPEN_TIMEOUT_SECONDS = 5;
-
- private final CountDownLatch mLatch = new CountDownLatch(1);
-
- private AtomicBoolean mResult = new AtomicBoolean(false);
-
- @Override
- public void onOpened(CameraDevice cameraDevice) {
- Log.d(TAG, "open camera successfully");
- mResult.set(true);
- if (cameraDevice != null) {
- cameraDevice.close();
- }
- mLatch.countDown();
- }
-
- @Override
- public void onDisconnected(CameraDevice cameraDevice) {
- Log.d(TAG, "disconnect camera");
- mLatch.countDown();
- }
-
- @Override
- public void onError(CameraDevice cameraDevice, int error) {
- Log.e(TAG, "Fail to open camera, error code = " + error);
- mLatch.countDown();
- }
-
- public boolean waitForResult() throws InterruptedException {
- mLatch.await(OPEN_TIMEOUT_SECONDS, TimeUnit.SECONDS);
- return mResult.get();
- }
- }
-}
diff --git a/hostsidetests/devicepolicy/app/MeteredDataTestApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/MeteredDataTestApp/AndroidManifest.xml
index d1228f8..5094f4e 100644
--- a/hostsidetests/devicepolicy/app/MeteredDataTestApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/MeteredDataTestApp/AndroidManifest.xml
@@ -16,17 +16,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.devicepolicy.metereddatatestapp">
+ package="com.android.cts.devicepolicy.metereddatatestapp">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<application>
- <activity android:name=".MainActivity" >
+ <activity android:name=".MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml b/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml
index d81cd43..32a4303 100644
--- a/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml
@@ -15,32 +15,30 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.packageinstaller">
+ package="com.android.cts.packageinstaller">
<uses-sdk android:minSdkVersion="21"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <receiver
- android:name=".ClearDeviceOwnerTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name=".ClearDeviceOwnerTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.packageinstaller"
- android:label="Package Installer CTS Tests" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.packageinstaller"
+ android:label="Package Installer CTS Tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml
index a494ed6..bab39b3 100644
--- a/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml
@@ -15,28 +15,27 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.profileowner" >
+ package="com.android.cts.profileowner">
<uses-sdk android:minSdkVersion="24"/>
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <receiver
- android:name="com.android.cts.profileowner.BaseProfileOwnerTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.profileowner.BaseProfileOwnerTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.profileowner"
- android:label="Profile Owner CTS tests"/>
+ android:targetPackage="com.android.cts.profileowner"
+ android:label="Profile Owner CTS tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/SharingApps/sharingapp1/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SharingApps/sharingapp1/AndroidManifest.xml
index e6c7f42..b5b17c8 100644
--- a/hostsidetests/devicepolicy/app/SharingApps/sharingapp1/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/SharingApps/sharingapp1/AndroidManifest.xml
@@ -14,25 +14,26 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<!--
~ A dummy app used for when you need to install test packages that have a functioning package name
~ and UID. For example, you could use it to set permissions or app-ops.
-->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.sharingapps.sharingapp1">
+ package="com.android.cts.sharingapps.sharingapp1">
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <activity android:name=".SimpleActivity" >
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".SimpleActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="*/*" />
+ <action android:name="android.intent.action.SEND"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="*/*"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/devicepolicy/app/SharingApps/sharingapp2/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SharingApps/sharingapp2/AndroidManifest.xml
index dbd3be3..b7ee819 100644
--- a/hostsidetests/devicepolicy/app/SharingApps/sharingapp2/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/SharingApps/sharingapp2/AndroidManifest.xml
@@ -14,25 +14,26 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<!--
~ A dummy app used for when you need to install test packages that have a functioning package name
~ and UID. For example, you could use it to set permissions or app-ops.
-->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.sharingapps.sharingapp2">
+ package="com.android.cts.sharingapps.sharingapp2">
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <activity android:name=".SimpleActivity" >
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".SimpleActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="*/*" />
+ <action android:name="android.intent.action.SEND"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="*/*"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SimpleApp/AndroidManifest.xml
index a25a1ee..34f2193 100644
--- a/hostsidetests/devicepolicy/app/SimpleApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/SimpleApp/AndroidManifest.xml
@@ -16,83 +16,98 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.launcherapps.simpleapp">
+ package="com.android.cts.launcherapps.simpleapp">
<uses-permission android:name="android.permission.READ_CALENDAR"/>
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
- <application>
- <activity android:name=".SimpleActivity" >
+ <application android:forceQueryable="true">
+ <activity android:name=".SimpleActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".NonExportedActivity">
- android:exported="false">
+ android:exported="false">
</activity>
<activity android:name=".NonLauncherActivity">
- android:exported="true">
+ android:exported="true">
</activity>
<activity android:name=".SimpleActivityStartService"
- android:turnScreenOn="true"
- android:excludeFromRecents="true"
- android:exported="true" />
- <activity android:name=".SimpleActivityStartFgService" android:exported="true" />
- <activity android:name=".SimpleActivityImmediateExit" >
+ android:turnScreenOn="true"
+ android:excludeFromRecents="true"
+ android:exported="true"/>
+ <activity android:name=".SimpleActivityStartFgService"
+ android:exported="true"/>
+ <activity android:name=".SimpleActivityImmediateExit"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".SimpleActivityChainExit" >
+ <activity android:name=".SimpleActivityChainExit"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <service android:name=".SimpleService" android:exported="true">
+ <service android:name=".SimpleService"
+ android:exported="true">
</service>
- <service android:name=".SimpleService2" android:exported="true" android:process=":other">
+ <service android:name=".SimpleService2"
+ android:exported="true"
+ android:process=":other">
</service>
- <service android:name=".SimpleService3" android:exported="true" />
+ <service android:name=".SimpleService3"
+ android:exported="true"/>
- <service android:name=".SimpleService4" android:exported="true">
+ <service android:name=".SimpleService4"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.launchertests.simpleapp.EXIT_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.launchertests.simpleapp.EXIT_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
- <service android:name=".SimpleService5" android:exported="true" android:process=":remote">
+ <service android:name=".SimpleService5"
+ android:exported="true"
+ android:process=":remote">
<intent-filter>
- <action android:name="com.android.cts.launchertests.simpleapp.EXIT_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.launchertests.simpleapp.EXIT_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
- <service android:name=".SimpleService6" android:exported="true"
- android:isolatedProcess="true">
+ <service android:name=".SimpleService6"
+ android:exported="true"
+ android:isolatedProcess="true">
<intent-filter>
- <action android:name="com.android.cts.launchertests.simpleapp.EXIT_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.launchertests.simpleapp.EXIT_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
- <receiver android:name=".SimpleReceiverStartService" android:exported="true">
+ <receiver android:name=".SimpleReceiverStartService"
+ android:exported="true">
</receiver>
- <receiver android:name=".SimpleReceiver" android:exported="true">
+ <receiver android:name=".SimpleReceiver"
+ android:exported="true">
</receiver>
- <receiver android:name=".SimpleRemoteReceiver" android:process=":receiver"
- android:exported="true">
+ <receiver android:name=".SimpleRemoteReceiver"
+ android:process=":receiver"
+ android:exported="true">
</receiver>
- <provider android:name=".SimpleProvider" android:process=":remote"
- android:authorities="com.android.cts.launcherapps.simpleapp.provider"
- android:exported="false" >
+ <provider android:name=".SimpleProvider"
+ android:process=":remote"
+ android:authorities="com.android.cts.launcherapps.simpleapp.provider"
+ android:exported="false">
</provider>
</application>
</manifest>
-
diff --git a/hostsidetests/devicepolicy/app/SimplePreMApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SimplePreMApp/AndroidManifest.xml
index 85962a1..e111a1d 100644
--- a/hostsidetests/devicepolicy/app/SimplePreMApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/SimplePreMApp/AndroidManifest.xml
@@ -16,20 +16,20 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.launcherapps.simplepremapp">
+ package="com.android.cts.launcherapps.simplepremapp">
<uses-sdk android:targetSdkVersion="21"/>
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<application>
- <activity android:name=".SimpleActivity" >
+ <activity android:name=".SimpleActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/devicepolicy/app/SimpleSmsApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SimpleSmsApp/AndroidManifest.xml
index 7c38b6d..782b25e 100644
--- a/hostsidetests/devicepolicy/app/SimpleSmsApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/SimpleSmsApp/AndroidManifest.xml
@@ -16,65 +16,65 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephony.cts.sms.simplesmsapp">
+ package="android.telephony.cts.sms.simplesmsapp">
<uses-permission android:name="android.permission.READ_SMS"/>
<application android:label="SimpleSmsApp">
<!-- BroadcastReceiver that listens for incoming SMS messages -->
<receiver android:name="android.telephony.cts.sms.SmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<!-- BroadcastReceiver that listens for incoming MMS messages -->
<receiver android:name="android.telephony.cts.sms.MmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<!-- Activity that allows the user to send new SMS/MMS messages -->
<activity android:name="android.app.Activity"
- android:exported="true">
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
- <!-- Service that delivers messages from the phone "quick response" -->
+ <!-- Service that delivers messages from the phone "quick response"
+ -->
<service android:name="android.telephony.cts.sms.HeadlessSmsSendService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
- android:exported="true" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.telephony.cts.sms.simplesmsapp">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.telephony.cts.sms.simplesmsapp">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/hostsidetests/devicepolicy/app/SingleAdminApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SingleAdminApp/AndroidManifest.xml
index daf7862..c35bef1 100644
--- a/hostsidetests/devicepolicy/app/SingleAdminApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/SingleAdminApp/AndroidManifest.xml
@@ -15,20 +15,19 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.devicepolicy.singleadmin">
+ package="com.android.cts.devicepolicy.singleadmin">
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <receiver
- android:name="com.android.cts.devicepolicy.singleadmin.ProvisioningSingleAdminTest$AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.devicepolicy.singleadmin.ProvisioningSingleAdminTest$AdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
@@ -37,6 +36,6 @@
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.devicepolicy.singleadmin"
- android:label="Managed Profile CTS Tests (Single admin receiver)"/>
+ android:targetPackage="com.android.cts.devicepolicy.singleadmin"
+ android:label="Managed Profile CTS Tests (Single admin receiver)"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/AndroidManifest.xml
index b3a8460..018f51b 100644
--- a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/AndroidManifest.xml
@@ -15,46 +15,44 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.transferownerincoming">
+ package="com.android.cts.transferownerincoming">
<uses-sdk android:minSdkVersion="24"/>
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
<uses-library android:name="android.test.runner"/>
- <receiver
- android:name="com.android.cts.transferowner.DeviceAndProfileOwnerTransferIncomingTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.transferowner.DeviceAndProfileOwnerTransferIncomingTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin"/>
+ android:resource="@xml/device_admin"/>
<intent-filter>
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name="com.android.cts.transferowner.DeviceAndProfileOwnerTransferIncomingTest$BasicAdminReceiverNoMetadata"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.transferowner.DeviceAndProfileOwnerTransferIncomingTest$BasicAdminReceiverNoMetadata"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin_no_support_transfer_policy"/>
+ android:resource="@xml/device_admin_no_support_transfer_policy"/>
<intent-filter>
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <service
- android:name="com.android.cts.transferowner.DeviceAndProfileOwnerTransferIncomingTest$BasicAdminService"
- android:exported="true"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <service android:name="com.android.cts.transferowner.DeviceAndProfileOwnerTransferIncomingTest$BasicAdminService"
+ android:exported="true"
+ android:permission="android.permission.BIND_DEVICE_ADMIN">
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+ <action android:name="android.app.action.DEVICE_ADMIN_SERVICE"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.transferownerincoming"
- android:label="Transfer Owner CTS tests"/>
+ android:targetPackage="com.android.cts.transferownerincoming"
+ android:label="Transfer Owner CTS tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/AndroidManifest.xml
index e1a6dbb..6a0544d 100644
--- a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/AndroidManifest.xml
@@ -15,21 +15,20 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.transferowneroutgoing">
+ package="com.android.cts.transferowneroutgoing">
<uses-sdk android:minSdkVersion="24"/>
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
- <application
- android:testOnly="true">
+ <application android:testOnly="true">
<uses-library android:name="android.test.runner"/>
- <receiver
- android:name="com.android.cts.transferowner.DeviceAndProfileOwnerTransferOutgoingTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.android.cts.transferowner.DeviceAndProfileOwnerTransferOutgoingTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin"/>
+ android:resource="@xml/device_admin"/>
<intent-filter>
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
@@ -37,6 +36,6 @@
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.transferowneroutgoing"
- android:label="Transfer Owner CTS tests"/>
+ android:targetPackage="com.android.cts.transferowneroutgoing"
+ android:label="Transfer Owner CTS tests"/>
</manifest>
diff --git a/hostsidetests/devicepolicy/app/WidgetProvider/AndroidManifest.xml b/hostsidetests/devicepolicy/app/WidgetProvider/AndroidManifest.xml
index 77246b5..9a8f682 100644
--- a/hostsidetests/devicepolicy/app/WidgetProvider/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/WidgetProvider/AndroidManifest.xml
@@ -16,24 +16,25 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.widgetprovider">
+ package="com.android.cts.widgetprovider">
<uses-permission android:name="android.permission.BIND_APPWIDGET"/>
<application>
- <receiver android:name="SimpleWidgetProvider" >
+ <receiver android:name="SimpleWidgetProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/simple_widget_provider_info" />
+ android:resource="@xml/simple_widget_provider_info"/>
</receiver>
- <service android:name=".SimpleAppWidgetHostService" >
+ <service android:name=".SimpleAppWidgetHostService"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.widgetprovider.REGISTER_CALLBACK" />
+ <action android:name="com.android.cts.widgetprovider.REGISTER_CALLBACK"/>
</intent-filter>
</service>
</application>
</manifest>
-
diff --git a/hostsidetests/devicepolicy/app/common/Android.bp b/hostsidetests/devicepolicy/app/common/Android.bp
new file mode 100644
index 0000000..46a1d6f
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/common/Android.bp
@@ -0,0 +1,20 @@
+// 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.
+
+// Build the common library for use device-side
+java_library {
+ name: "devicepolicy-deviceside-common",
+ srcs: ["src/**/*.java"],
+ sdk_version: "test_current",
+}
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CameraUtils.java b/hostsidetests/devicepolicy/app/common/src/com/android/cts/devicepolicy/CameraUtils.java
similarity index 97%
rename from hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CameraUtils.java
rename to hostsidetests/devicepolicy/app/common/src/com/android/cts/devicepolicy/CameraUtils.java
index d23d4b3..61d0105 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CameraUtils.java
+++ b/hostsidetests/devicepolicy/app/common/src/com/android/cts/devicepolicy/CameraUtils.java
@@ -14,13 +14,12 @@
* limitations under the License.
*/
-package com.android.cts.deviceandprofileowner;
+package com.android.cts.devicepolicy;
import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CameraManager;
import android.os.Handler;
import android.util.Log;
-
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -28,7 +27,7 @@
/**
* A util class to help open camera in a blocking way.
*/
-class CameraUtils {
+public class CameraUtils {
private static final String TAG = "CameraUtils";
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
index 1347342..7e3a5eb 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
@@ -297,7 +297,6 @@
}
@Override
- @FlakyTest
@PermissionsTest
@Test
public void testPermissionGrant() throws Exception {
@@ -305,7 +304,6 @@
}
@Override
- @FlakyTest
@PermissionsTest
@Test
public void testPermissionMixedPolicies() throws Exception {
@@ -321,7 +319,6 @@
@Override
@PermissionsTest
- @FlakyTest(bugId = 145350538)
@Test
public void testPermissionPolicy() throws Exception {
super.testPermissionPolicy();
@@ -336,7 +333,6 @@
@Override
@PermissionsTest
- @FlakyTest(bugId = 145350538)
@Test
public void testPermissionAppUpdate() throws Exception {
super.testPermissionAppUpdate();
@@ -344,7 +340,6 @@
@Override
@PermissionsTest
- @FlakyTest(bugId = 145350538)
@Test
public void testPermissionGrantPreMApp() throws Exception {
super.testPermissionGrantPreMApp();
@@ -352,7 +347,6 @@
@Override
@PermissionsTest
- @FlakyTest(bugId = 145350538)
@Test
public void testPermissionGrantOfDisallowedPermissionWhileOtherPermIsGranted()
throws Exception {
diff --git a/hostsidetests/dexmetadata/app/SplitApp/AndroidManifest.xml b/hostsidetests/dexmetadata/app/SplitApp/AndroidManifest.xml
index 23ba9bc..cb79717 100644
--- a/hostsidetests/dexmetadata/app/SplitApp/AndroidManifest.xml
+++ b/hostsidetests/dexmetadata/app/SplitApp/AndroidManifest.xml
@@ -15,14 +15,15 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dexmetadata.splitapp"
- android:isolatedSplits="true">
+ package="com.android.cts.dexmetadata.splitapp"
+ android:isolatedSplits="true">
<application android:debuggable="true">
- <activity android:name=".BaseActivity">
+ <activity android:name=".BaseActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/dexmetadata/app/SplitApp/SplitAppFeatureA/AndroidManifest.xml b/hostsidetests/dexmetadata/app/SplitApp/SplitAppFeatureA/AndroidManifest.xml
index 40b4c99..dedf124 100644
--- a/hostsidetests/dexmetadata/app/SplitApp/SplitAppFeatureA/AndroidManifest.xml
+++ b/hostsidetests/dexmetadata/app/SplitApp/SplitAppFeatureA/AndroidManifest.xml
@@ -15,15 +15,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.dexmetadata.splitapp"
- android:isFeatureSplit="true"
- split="feature_a">
+ package="com.android.cts.dexmetadata.splitapp"
+ android:isFeatureSplit="true"
+ split="feature_a">
<application android:debuggable="true">
- <activity android:name=".feature_a.FeatureAActivity">
+ <activity android:name=".feature_a.FeatureAActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/dumpsys/apps/FramestatsTestApp/AndroidManifest.xml b/hostsidetests/dumpsys/apps/FramestatsTestApp/AndroidManifest.xml
index 3a9f902..f5883d4 100644
--- a/hostsidetests/dumpsys/apps/FramestatsTestApp/AndroidManifest.xml
+++ b/hostsidetests/dumpsys/apps/FramestatsTestApp/AndroidManifest.xml
@@ -13,18 +13,20 @@
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.cts.framestatstestapp">
+ package="com.android.cts.framestatstestapp">
<!--
- A simple app that draws at least one frame. Used by framestats
- test.
- -->
+ A simple app that draws at least one frame. Used by framestats
+ test.
+ -->
<application>
- <activity android:name=".FramestatsTestAppActivity">
+ <activity android:name=".FramestatsTestAppActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/gputools/apps/AndroidManifest.xml b/hostsidetests/gputools/apps/AndroidManifest.xml
index a4fd8dc..89ecaf8 100755
--- a/hostsidetests/gputools/apps/AndroidManifest.xml
+++ b/hostsidetests/gputools/apps/AndroidManifest.xml
@@ -16,17 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.rootlessgpudebug.app">
+ package="android.rootlessgpudebug.app">
- <application android:extractNativeLibs="true" >
- <activity android:name=".RootlessGpuDebugDeviceActivity" >
+ <application android:extractNativeLibs="true">
+ <activity android:name=".RootlessGpuDebugDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
-
diff --git a/hostsidetests/gputools/apps/inject/AndroidManifest.xml b/hostsidetests/gputools/apps/inject/AndroidManifest.xml
index e16aedb..63bd9c1 100644
--- a/hostsidetests/gputools/apps/inject/AndroidManifest.xml
+++ b/hostsidetests/gputools/apps/inject/AndroidManifest.xml
@@ -16,18 +16,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.rootlessgpudebug.app">
+ package="android.rootlessgpudebug.app">
- <application android:extractNativeLibs="true" >
- <meta-data android:name="com.android.graphics.injectLayers.enable" android:value="true"/>
- <activity android:name=".RootlessGpuDebugDeviceActivity" >
+ <application android:extractNativeLibs="true">
+ <meta-data android:name="com.android.graphics.injectLayers.enable"
+ android:value="true"/>
+ <activity android:name=".RootlessGpuDebugDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
-
diff --git a/hostsidetests/graphics/gpuprofiling/TEST_MAPPING b/hostsidetests/graphics/gpuprofiling/TEST_MAPPING
new file mode 100644
index 0000000..ca81f4a
--- /dev/null
+++ b/hostsidetests/graphics/gpuprofiling/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsGpuProfilingDataTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/harmfulappwarning/TEST_MAPPING b/hostsidetests/harmfulappwarning/TEST_MAPPING
new file mode 100644
index 0000000..80c945b
--- /dev/null
+++ b/hostsidetests/harmfulappwarning/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsHarmfulAppWarningHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/harmfulappwarning/sampleapp/AndroidManifest.xml b/hostsidetests/harmfulappwarning/sampleapp/AndroidManifest.xml
index 5bfbd24..08a3c12 100755
--- a/hostsidetests/harmfulappwarning/sampleapp/AndroidManifest.xml
+++ b/hostsidetests/harmfulappwarning/sampleapp/AndroidManifest.xml
@@ -16,16 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.harmfulappwarning.sampleapp">
+ package="android.harmfulappwarning.sampleapp">
<application>
- <activity android:name=".SampleDeviceActivity" >
+ <activity android:name=".SampleDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/hdmicec/app/AndroidManifest.xml b/hostsidetests/hdmicec/app/AndroidManifest.xml
index 9be9136..603445e 100644
--- a/hostsidetests/hdmicec/app/AndroidManifest.xml
+++ b/hostsidetests/hdmicec/app/AndroidManifest.xml
@@ -16,24 +16,26 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.hdmicec.app">
+ package="android.hdmicec.app">
<uses-feature android:name="android.software.leanback"
- android:required="false" />
- <application >
- <activity android:name=".HdmiCecKeyEventCapture" >
+ android:required="false"/>
+ <application>
+ <activity android:name=".HdmiCecKeyEventCapture"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".HdmiCecAudioManager" >
+ <activity android:name=".HdmiCecAudioManager"
+ android:exported="true">
<intent-filter>
- <action android:name="android.hdmicec.app.MUTE" />
- <action android:name="android.hdmicec.app.UNMUTE" />
- <action android:name="android.hdmicec.app.REPORT_VOLUME" />
- <action android:name="android.hdmicec.app.SET_VOLUME" />
- <action android:name="android.hdmicec.app.GET_SUPPORTED_SAD_FORMATS" />
- <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+ <action android:name="android.hdmicec.app.MUTE"/>
+ <action android:name="android.hdmicec.app.UNMUTE"/>
+ <action android:name="android.hdmicec.app.REPORT_VOLUME"/>
+ <action android:name="android.hdmicec.app.SET_VOLUME"/>
+ <action android:name="android.hdmicec.app.GET_SUPPORTED_SAD_FORMATS"/>
+ <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml b/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml
index 9825d5c..e2b1268 100644
--- a/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml
+++ b/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml
@@ -16,34 +16,36 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.appwidget.cts">
+ package="android.appwidget.cts">
<application>
<uses-library android:name="android.test.runner"/>
- <receiver android:name="android.appwidget.cts.provider.FirstAppWidgetProvider" >
+ <receiver android:name="android.appwidget.cts.provider.FirstAppWidgetProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/appwidget_info" />
+ android:resource="@xml/appwidget_info"/>
</receiver>
- <receiver android:name="android.appwidget.cts.provider.SecondAppWidgetProvider" >
+ <receiver android:name="android.appwidget.cts.provider.SecondAppWidgetProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/appwidget_info" />
+ android:resource="@xml/appwidget_info"/>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.appwidget.cts"
- android:label="CTS Tests for the dumpsys protobuf protocol">
+ android:targetPackage="android.appwidget.cts"
+ android:label="CTS Tests for the dumpsys protobuf protocol">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/hostsidetests/incident/src/com/android/server/cts/AlarmManagerIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/AlarmManagerIncidentTest.java
index 8093dc3..8cab752 100644
--- a/hostsidetests/incident/src/com/android/server/cts/AlarmManagerIncidentTest.java
+++ b/hostsidetests/incident/src/com/android/server/cts/AlarmManagerIncidentTest.java
@@ -16,18 +16,18 @@
package com.android.server.cts;
-import com.android.server.AlarmClockMetadataProto;
-import com.android.server.AlarmManagerServiceDumpProto;
-import com.android.server.AlarmProto;
-import com.android.server.BatchProto;
-import com.android.server.BroadcastStatsProto;
-import com.android.server.ConstantsProto;
-import com.android.server.FilterStatsProto;
+import com.android.server.alarm.AlarmClockMetadataProto;
+import com.android.server.alarm.AlarmManagerServiceDumpProto;
+import com.android.server.alarm.AlarmProto;
+import com.android.server.alarm.BatchProto;
+import com.android.server.alarm.BroadcastStatsProto;
+import com.android.server.alarm.ConstantsProto;
+import com.android.server.alarm.FilterStatsProto;
import com.android.server.AppStateTrackerProto;
import com.android.server.AppStateTrackerProto.RunAnyInBackgroundRestrictedPackages;
-import com.android.server.IdleDispatchEntryProto;
-import com.android.server.InFlightProto;
-import com.android.server.WakeupEventProto;
+import com.android.server.alarm.IdleDispatchEntryProto;
+import com.android.server.alarm.InFlightProto;
+import com.android.server.alarm.WakeupEventProto;
import java.util.List;
/**
diff --git a/hostsidetests/incrementalinstall/app/AndroidManifestV1.xml b/hostsidetests/incrementalinstall/app/AndroidManifestV1.xml
index 68d6d3d..881fbea 100644
--- a/hostsidetests/incrementalinstall/app/AndroidManifestV1.xml
+++ b/hostsidetests/incrementalinstall/app/AndroidManifestV1.xml
@@ -16,12 +16,13 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.incrementalinstall.incrementaltestapp"
- android:versionCode="1"
- android:versionName="1.0">
+ package="android.incrementalinstall.incrementaltestapp"
+ android:versionCode="1"
+ android:versionName="1.0">
<application android:label="IncrementalTestApp">
- <activity android:name=".MainActivity">
+ <activity android:name=".MainActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/hostsidetests/incrementalinstall/app/AndroidManifestV2.xml b/hostsidetests/incrementalinstall/app/AndroidManifestV2.xml
index 27cfbb9..e027fdd 100644
--- a/hostsidetests/incrementalinstall/app/AndroidManifestV2.xml
+++ b/hostsidetests/incrementalinstall/app/AndroidManifestV2.xml
@@ -16,12 +16,13 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.incrementalinstall.incrementaltestapp"
- android:versionCode="2"
- android:versionName="2.0">
+ package="android.incrementalinstall.incrementaltestapp"
+ android:versionCode="2"
+ android:versionName="2.0">
<application android:label="IncrementalTestApp">
- <activity android:name=".MainActivity">
+ <activity android:name=".MainActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml
index 5314c9c..19c1440 100755
--- a/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml
@@ -16,34 +16,34 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.inputmethodservice.cts.devicetest" android:targetSandboxVersion="2">
+ package="android.inputmethodservice.cts.devicetest"
+ android:targetSandboxVersion="2">
<!--
- TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
- latest OS behaviors.
- -->
- <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
+ TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
+ latest OS behaviors.
+ -->
+ <uses-sdk android:minSdkVersion="28"
+ android:targetSdkVersion="28"/>
- <application
- android:label="CtsInputMethodServiceDeviceTests"
- android:icon="@mipmap/ic_launcher"
- android:allowBackup="false">
+ <application android:label="CtsInputMethodServiceDeviceTests"
+ android:icon="@mipmap/ic_launcher"
+ android:allowBackup="false">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name=".TestActivity"
- android:label="TestActivity">
+ <activity android:name=".TestActivity"
+ android:label="TestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.inputmethodservice.cts.devicetest" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.inputmethodservice.cts.devicetest"/>
</manifest>
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml
index 70de83f..b0eaaa7 100755
--- a/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml
@@ -16,29 +16,27 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.inputmethodservice.cts.ime1">
+ package="android.inputmethodservice.cts.ime1">
<!--
- TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
- latest OS behaviors.
- -->
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25" />
+ TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
+ latest OS behaviors.
+ -->
+ <uses-sdk android:minSdkVersion="19"
+ android:targetSdkVersion="25"/>
- <application
- android:label="@string/ime_name"
- android:allowBackup="false"
- android:theme="@android:style/Theme.InputMethod"
- >
- <service
- android:name=".CtsInputMethod1"
- android:label="@string/ime_name"
- android:permission="android.permission.BIND_INPUT_METHOD">
+ <application android:label="@string/ime_name"
+ android:allowBackup="false"
+ android:theme="@android:style/Theme.InputMethod">
+ <service android:name=".CtsInputMethod1"
+ android:label="@string/ime_name"
+ android:permission="android.permission.BIND_INPUT_METHOD"
+ android:exported="true">
<intent-filter>
- <action android:name="android.view.InputMethod" />
+ <action android:name="android.view.InputMethod"/>
</intent-filter>
- <meta-data
- android:name="android.view.im"
- android:resource="@xml/ime1" />
+ <meta-data android:name="android.view.im"
+ android:resource="@xml/ime1"/>
</service>
</application>
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml
index a166ba3..0168b8d 100755
--- a/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml
@@ -16,29 +16,27 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.inputmethodservice.cts.ime2">
+ package="android.inputmethodservice.cts.ime2">
<!--
- TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
- latest OS behaviors.
- -->
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25" />
+ TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
+ latest OS behaviors.
+ -->
+ <uses-sdk android:minSdkVersion="19"
+ android:targetSdkVersion="25"/>
- <application
- android:label="@string/ime_name"
- android:allowBackup="false"
- android:theme="@android:style/Theme.InputMethod"
- >
- <service
- android:name=".CtsInputMethod2"
- android:label="@string/ime_name"
- android:permission="android.permission.BIND_INPUT_METHOD">
+ <application android:label="@string/ime_name"
+ android:allowBackup="false"
+ android:theme="@android:style/Theme.InputMethod">
+ <service android:name=".CtsInputMethod2"
+ android:label="@string/ime_name"
+ android:permission="android.permission.BIND_INPUT_METHOD"
+ android:exported="true">
<intent-filter>
- <action android:name="android.view.InputMethod" />
+ <action android:name="android.view.InputMethod"/>
</intent-filter>
- <meta-data
- android:name="android.view.im"
- android:resource="@xml/ime2" />
+ <meta-data android:name="android.view.im"
+ android:resource="@xml/ime2"/>
</service>
</application>
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml
index 841b7c1..a8b17e3 100755
--- a/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml
@@ -16,18 +16,19 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.inputmethodservice.cts.provider">
+ package="android.inputmethodservice.cts.provider">
- <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
+ <uses-sdk android:minSdkVersion="26"
+ android:targetSdkVersion="26"/>
<application android:label="CtsInputMethodServiceEventProvider">
- <provider
- android:authorities="android.inputmethodservice.cts.provider"
- android:name="android.inputmethodservice.cts.provider.EventProvider"
- android:exported="true" />
- <receiver android:name="android.inputmethodservice.cts.receiver.EventReceiver">
+ <provider android:authorities="android.inputmethodservice.cts.provider"
+ android:name="android.inputmethodservice.cts.provider.EventProvider"
+ android:exported="true"/>
+ <receiver android:name="android.inputmethodservice.cts.receiver.EventReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.inputmethodservice.cts.action.IME_EVENT" />
+ <action android:name="android.inputmethodservice.cts.action.IME_EVENT"/>
</intent-filter>
</receiver>
</application>
diff --git a/hostsidetests/install/Android.bp b/hostsidetests/install/Android.bp
new file mode 100644
index 0000000..0f1d005
--- /dev/null
+++ b/hostsidetests/install/Android.bp
@@ -0,0 +1,54 @@
+// 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.
+
+java_test_host {
+ name: "CtsInstallHostTestCases",
+ defaults: ["cts_defaults"],
+ srcs: ["src/**/*.java"],
+ libs: [
+ "cts-tradefed",
+ "cts-shim-host-lib",
+ "tradefed",
+ "truth-prebuilt",
+ "hamcrest",
+ "hamcrest-library",
+ ],
+ data: [
+ ":InstallTest",
+ ],
+ test_suites: [
+ "cts",
+ "general-tests",
+ ],
+}
+
+android_test_helper_app {
+ name: "InstallTest",
+ srcs: ["app/src/**/*.java", "src/android/cts/install/*.java"],
+ manifest : "app/AndroidManifest.xml",
+ static_libs: [
+ "androidx.test.runner",
+ "androidx.test.core",
+ "truth-prebuilt",
+ "cts-install-lib",
+ "cts-rollback-lib",
+ ],
+ java_resources: [
+ ":StagedInstallTestApexV1",
+ ":StagedInstallTestApexV2",
+ ":StagedInstallTestApexV3",
+ ],
+ sdk_version: "test_current",
+ test_suites: ["device-tests"],
+}
diff --git a/hostsidetests/install/AndroidTest.xml b/hostsidetests/install/AndroidTest.xml
new file mode 100644
index 0000000..35073c7
--- /dev/null
+++ b/hostsidetests/install/AndroidTest.xml
@@ -0,0 +1,40 @@
+<?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.
+-->
+<configuration description="Runs the install API tests">
+ <option name="test-suite-tag" value="cts" />
+ <option name="config-descriptor:metadata" key="component" value="framework" />
+ <!-- Instant apps can't have INSTALL_PACKAGES permission. -->
+ <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+ <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+ <!-- TODO(b/137885984): Revisit secondary user eligibility once the issue is resolved. -->
+ <option name="config-descriptor:metadata" key="parameter" value="not_secondary_user" />
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="InstallTest.apk" />
+ </target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+ <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />
+ <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.B" />
+ <option name="teardown-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />
+ <option name="teardown-command" value="pm uninstall com.android.cts.install.lib.testapp.B" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.HostTest" >
+ <option name="class" value="android.cts.install.host.InstallTest" />
+ <option name="class" value="android.cts.install.host.DowngradeTest" />
+ <option name="class" value="android.cts.install.host.SamegradeTest" />
+ <option name="class" value="android.cts.install.host.UpgradeTest" />
+ </test>
+</configuration>
diff --git a/hostsidetests/install/OWNERS b/hostsidetests/install/OWNERS
new file mode 100644
index 0000000..71cfd5a
--- /dev/null
+++ b/hostsidetests/install/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 36137
+include ../Stagedinstall/OWNERS
+chenghsiuchang@google.com
\ No newline at end of file
diff --git a/hostsidetests/install/TEST_MAPPING b/hostsidetests/install/TEST_MAPPING
new file mode 100644
index 0000000..8ba921a
--- /dev/null
+++ b/hostsidetests/install/TEST_MAPPING
@@ -0,0 +1,17 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsInstallHostTestCases",
+ "options": [
+ {
+ "exclude-annotation": "android.platform.test.annotations.LargeTest"
+ }
+ ]
+ }
+ ],
+ "postsubmit": [
+ {
+ "name": "CtsInstallHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/install/app/AndroidManifest.xml b/hostsidetests/install/app/AndroidManifest.xml
new file mode 100644
index 0000000..01130f2
--- /dev/null
+++ b/hostsidetests/install/app/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?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.cts.install">
+ <application>
+ <uses-library android:name="android.test.runner"/>
+ <receiver android:name="com.android.cts.install.lib.LocalIntentSender"
+ android:exported="true"/>
+ <!-- This activity is necessary to register the test app as the default home activity (i.e.
+ to receive SESSION_COMMITTED broadcasts.) -->
+ <activity android:name=".LauncherActivity"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.HOME"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ </activity>
+ </application>
+
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.cts.install"
+ android:label="Install Test"/>
+</manifest>
diff --git a/hostsidetests/install/app/src/android/cts/install/DowngradeTest.java b/hostsidetests/install/app/src/android/cts/install/DowngradeTest.java
new file mode 100644
index 0000000..13e6f94
--- /dev/null
+++ b/hostsidetests/install/app/src/android/cts/install/DowngradeTest.java
@@ -0,0 +1,161 @@
+/*
+ * 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.cts.install;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.cts.install.lib.Install;
+import com.android.cts.install.lib.InstallUtils;
+import com.android.cts.install.lib.TestApp;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@RunWith(Parameterized.class)
+public final class DowngradeTest {
+ @Parameter(0)
+ public INSTALL_TYPE mInstallType;
+
+ @Parameter(1)
+ public boolean mStaged;
+
+ @Parameter(2)
+ public boolean mEnableRollback;
+
+ @Parameters(name = "{0}_Staged{1}_Rollback{2}")
+ public static Collection<Object[]> combinations() {
+ boolean[] booleanValues = new boolean[]{true, false};
+ List<Object[]> temp = new ArrayList<>();
+ for (INSTALL_TYPE installType : INSTALL_TYPE.values()) {
+ for (boolean staged : booleanValues) {
+ for (boolean enableRollback : booleanValues) {
+ temp.add(new Object[]{installType, staged, enableRollback});
+ }
+ }
+ }
+ return temp;
+ }
+
+ @Rule
+ public InstallRule mInstallRule = new InstallRule();
+
+ @Rule
+ public SessionRule mSessionRule = new SessionRule();
+
+ private static final int VERSION_CODE_CURRENT = 3;
+ private static final int VERSION_CODE_DOWNGRADE = 2;
+
+ /**
+ * Cleans up test environment.
+ *
+ * This is marked as @Test to take advantage of @Before/@After methods of hostside test cases.
+ * Actual purpose of this method to be called before and after each test case of
+ * {@link android.cts.install.host.DowngradeTest} to reduce tests flakiness.
+ */
+ @Test
+ public void cleanUp_phase() throws Exception {
+ mInstallRule.cleanUp();
+ mSessionRule.cleanUp();
+ }
+
+ /** Install the version {@link #VERSION_CODE_CURRENT} of the apps to be downgraded. */
+ @Test
+ public void arrange_phase() throws Exception {
+ getParameterizedInstall(VERSION_CODE_CURRENT).commit();
+ }
+
+ /** Verify the version of the arranged apps. */
+ @Test
+ public void assert_postArrange_phase() {
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_CURRENT);
+ }
+
+ /** Commits the downgrade. */
+ @Test
+ public void action_phase() throws Exception {
+ Install install = getParameterizedInstall(VERSION_CODE_DOWNGRADE);
+ int sessionId = install.setRequestDowngrade().commit();
+ mSessionRule.recordSessionId(sessionId);
+ }
+
+ /** Confirms target version of the apps installed. */
+ @Test
+ public void assert_downgradeSuccess_phase() {
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_DOWNGRADE);
+ }
+
+ /** Confirms versions before staged downgrades applied. */
+ @Test
+ public void assert_preReboot_phase() throws Exception {
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionReady()).isTrue();
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_CURRENT);
+ }
+
+ /** Confirms versions after staged downgrades applied. */
+ @Test
+ public void assert_postReboot_phase() throws Exception {
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionApplied()).isTrue();
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_DOWNGRADE);
+ }
+
+ /** Confirms the downgrade commit not allowed. */
+ @Test
+ public void assert_downgradeNotAllowed_phase() {
+ Install install = getParameterizedInstall(VERSION_CODE_DOWNGRADE).setRequestDowngrade();
+ InstallUtils.commitExpectingFailure(AssertionError.class,
+ "INSTALL_FAILED_VERSION_DOWNGRADE" + "|"
+ + "Downgrade of APEX package com\\.android\\.apex\\.cts\\.shim is not "
+ + "allowed",
+ install);
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_CURRENT);
+ }
+
+ /** Confirms the downgrade commit not allowed without requesting downgrade. */
+ @Test
+ public void assert_downgradeNotRequested_phase() {
+ Install install = getParameterizedInstall(VERSION_CODE_DOWNGRADE);
+ InstallUtils.commitExpectingFailure(AssertionError.class,
+ "INSTALL_FAILED_VERSION_DOWNGRADE" + "|"
+ + "Downgrade of APEX package com\\.android\\.apex\\.cts\\.shim is not "
+ + "allowed",
+ install);
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_CURRENT);
+ }
+
+ /** Gets parameterized {@link Install} of test packages with specific version. */
+ private Install getParameterizedInstall(int versionCode) {
+ List<TestApp> testApps = mInstallRule.getTestApps(mInstallType, versionCode);
+ Install install = testApps.size() == 1
+ ? Install.single(testApps.get(0))
+ : Install.multi(testApps.toArray(new TestApp[testApps.size()]));
+ if (mStaged) {
+ install.setStaged();
+ }
+ if (mEnableRollback) {
+ install.setEnableRollback();
+ }
+ return install;
+ }
+}
diff --git a/hostsidetests/install/app/src/android/cts/install/InstallRule.java b/hostsidetests/install/app/src/android/cts/install/InstallRule.java
new file mode 100644
index 0000000..a7d701b
--- /dev/null
+++ b/hostsidetests/install/app/src/android/cts/install/InstallRule.java
@@ -0,0 +1,163 @@
+/*
+ * 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.cts.install;
+
+import static com.android.cts.install.lib.InstallUtils.getPackageInstaller;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.Manifest;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageInstaller;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.cts.install.lib.InstallUtils;
+import com.android.cts.install.lib.TestApp;
+import com.android.cts.install.lib.Uninstall;
+
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Table;
+
+import org.junit.rules.ExternalResource;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Adopts needed permissions for testing install flow and provides test packages mappings
+ * corresponding to {@link INSTALL_TYPE}.
+ */
+final class InstallRule extends ExternalResource {
+ private static final String TAG = InstallRule.class.getSimpleName();
+
+ static final int VERSION_CODE_INVALID = -1;
+ static final int VERSION_CODE_DEFAULT = 1;
+
+ /** Indexes test apps with package name and versionCode */
+ private static final Table<String, Integer, TestApp> sTestAppMap = getTestAppTable();
+
+ @Override
+ protected void before() {
+ InstrumentationRegistry
+ .getInstrumentation()
+ .getUiAutomation()
+ .adoptShellPermissionIdentity(
+ Manifest.permission.INSTALL_PACKAGES,
+ Manifest.permission.DELETE_PACKAGES);
+ }
+
+ @Override
+ protected void after() {
+ InstrumentationRegistry
+ .getInstrumentation()
+ .getUiAutomation()
+ .dropShellPermissionIdentity();
+ }
+
+ /**
+ * Performs cleanup phase for test installations. Actual purpose of this method is to be called
+ * before and after each host-side test to reduce tests flakiness.
+ */
+ void cleanUp() throws Exception {
+ PackageInstaller packageInstaller = getPackageInstaller();
+ packageInstaller.getStagedSessions().stream()
+ .filter(sessionInfo -> !sessionInfo.hasParentSessionId())
+ .forEach(sessionInfo -> {
+ try {
+ Log.i(TAG, "abandoning session " + sessionInfo.getSessionId());
+ packageInstaller.abandonSession(sessionInfo.getSessionId());
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to abandon session " + sessionInfo.getSessionId(), e);
+ }
+ });
+ Uninstall.packages(TestApp.A, TestApp.B);
+ }
+
+ /** Resolves corresponding test apps with specific install type and version. */
+ List<TestApp> getTestApps(INSTALL_TYPE installType, int versionCode) {
+ return getTestPackageNames(installType).stream()
+ .map(packageName -> getTestApp(packageName, versionCode))
+ .collect(Collectors.toList());
+ }
+
+ /** Asserts {@code packageNames} has been installed with expected version. */
+ void assertPackageVersion(INSTALL_TYPE installType, int version) {
+ getTestPackageNames(installType).stream().forEach(packageName -> {
+ long installedVersion = VERSION_CODE_INVALID;
+ long expectedVersion = version;
+
+ PackageInfo info = InstallUtils.getPackageInfo(packageName);
+ if (info != null) {
+ installedVersion = info.getLongVersionCode();
+ if (version == VERSION_CODE_INVALID && info.isApex) {
+ // Apex cannot be fully uninstalled, verify default version instead.
+ expectedVersion = VERSION_CODE_DEFAULT;
+ }
+ }
+
+ assertWithMessage(
+ String.format("%s's versionCode expected to be %d, but was %d",
+ packageName, expectedVersion, installedVersion))
+ .that(installedVersion).isEqualTo(expectedVersion);
+ });
+ }
+
+ /**
+ * Resolves corresponding test packages.
+ *
+ * @note This method should be aligned with {@link INSTALL_TYPE}
+ */
+ private static List<String> getTestPackageNames(INSTALL_TYPE installType) {
+ switch (installType) {
+ case SINGLE_APK:
+ return Arrays.asList(TestApp.A);
+ case SINGLE_APEX:
+ return Arrays.asList(SHIM_APEX_PACKAGE_NAME);
+ case MULTIPLE_APKS:
+ return Arrays.asList(TestApp.A, TestApp.B);
+ case MULTIPLE_MIX:
+ return Arrays.asList(TestApp.A, SHIM_APEX_PACKAGE_NAME);
+ default:
+ throw new AssertionError("Unknown install type");
+ }
+ }
+
+ private static TestApp getTestApp(String packageName, int version) {
+ if (!sTestAppMap.contains(packageName, version)) {
+ throw new AssertionError("Unknown test app");
+ }
+ return sTestAppMap.get(packageName, version);
+ }
+
+ private static Table<String, Integer, TestApp> getTestAppTable() {
+ Table<String, Integer, TestApp> testAppMap = HashBasedTable.create();
+ testAppMap.put(TestApp.A, 1, TestApp.A1);
+ testAppMap.put(TestApp.A, 2, TestApp.A2);
+ testAppMap.put(TestApp.A, 3, TestApp.A3);
+ testAppMap.put(TestApp.B, 1, TestApp.B1);
+ testAppMap.put(TestApp.B, 2, TestApp.B2);
+ testAppMap.put(TestApp.B, 3, TestApp.B3);
+ testAppMap.put(SHIM_APEX_PACKAGE_NAME, 1, TestApp.Apex1);
+ testAppMap.put(SHIM_APEX_PACKAGE_NAME, 2, TestApp.Apex2);
+ testAppMap.put(SHIM_APEX_PACKAGE_NAME, 3, TestApp.Apex3);
+ return testAppMap;
+ }
+}
diff --git a/hostsidetests/install/app/src/android/cts/install/InstallTest.java b/hostsidetests/install/app/src/android/cts/install/InstallTest.java
new file mode 100644
index 0000000..5a5dd54
--- /dev/null
+++ b/hostsidetests/install/app/src/android/cts/install/InstallTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.cts.install;
+
+import static android.cts.install.InstallRule.VERSION_CODE_INVALID;
+
+import static com.android.cts.install.lib.InstallUtils.getPackageInstaller;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageInstaller;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.cts.install.lib.Install;
+import com.android.cts.install.lib.InstallUtils;
+import com.android.cts.install.lib.TestApp;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(Parameterized.class)
+public final class InstallTest {
+ @Parameter(0)
+ public INSTALL_TYPE mInstallType;
+
+ @Parameter(1)
+ public boolean mStaged;
+
+ @Parameter(2)
+ public boolean mEnableRollback;
+
+ @Parameters(name = "{0}_Staged{1}_Rollback{2}")
+ public static Collection<Object[]> combinations() {
+ boolean[] booleanValues = new boolean[]{true, false};
+ List<Object[]> temp = new ArrayList<>();
+ for (INSTALL_TYPE installType : INSTALL_TYPE.values()) {
+ for (boolean staged : booleanValues) {
+ for (boolean enableRollback : booleanValues) {
+ temp.add(new Object[]{installType, staged, enableRollback});
+ }
+ }
+ }
+ return temp;
+ }
+
+ @Rule
+ public InstallRule mInstallRule = new InstallRule();
+
+ @Rule
+ public SessionRule mSessionRule = new SessionRule();
+
+ private static final int VERSION_CODE_TARGET = 2;
+
+ /**
+ * Cleans up test environment.
+ *
+ * This is marked as @Test to take advantage of @Before/@After methods of hostside test cases.
+ * Actual purpose of this method to be called before and after each test case of
+ * {@link android.cts.install.host.InstallTest} to reduce tests flakiness.
+ */
+ @Test
+ public void cleanUp_phase() throws Exception {
+ mInstallRule.cleanUp();
+ mSessionRule.cleanUp();
+ }
+
+ @Test
+ public void action_phase() throws Exception {
+ Install install = getParameterizedInstall(VERSION_CODE_TARGET);
+ int sessionId = install.commit();
+ mSessionRule.recordSessionId(sessionId);
+ }
+
+ @Test
+ public void assert_commitFailure_phase() {
+ Install install = getParameterizedInstall(VERSION_CODE_TARGET);
+ InstallUtils.commitExpectingFailure(IllegalArgumentException.class,
+ "APEX files can only be installed as part of a staged session.", install);
+ }
+
+ @Test
+ public void assert_phase() {
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_TARGET);
+ }
+
+ @Test
+ public void assert_preReboot_phase() throws Exception {
+ assertNoSessionCommitBroadcastSent();
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionReady()).isTrue();
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_INVALID);
+ }
+
+ @Test
+ public void assert_postReboot_phase() throws Exception {
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionApplied()).isTrue();
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_TARGET);
+ assertNoSessionCommitBroadcastSent();
+ }
+
+ @Test
+ public void action_abandonSession_phase() throws Exception {
+ getPackageInstaller().abandonSession(mSessionRule.retrieveSessionId());
+ }
+
+ @Test
+ public void assert_abandonSession_phase() {
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_INVALID);
+ }
+
+ /** Gets parameterized {@link Install} of test packages with specific version. */
+ private Install getParameterizedInstall(int versionCode) {
+ List<TestApp> testApps = mInstallRule.getTestApps(mInstallType, versionCode);
+ Install install = testApps.size() == 1
+ ? Install.single(testApps.get(0))
+ : Install.multi(testApps.toArray(new TestApp[testApps.size()]));
+ if (mStaged) {
+ install.setStaged();
+ }
+ if (mEnableRollback) {
+ install.setEnableRollback();
+ }
+ return install;
+ }
+
+ private static void assertNoSessionCommitBroadcastSent() throws InterruptedException {
+ BlockingQueue<PackageInstaller.SessionInfo> committedSessions = new LinkedBlockingQueue<>();
+ BroadcastReceiver sessionCommittedReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ try {
+ PackageInstaller.SessionInfo info =
+ intent.getParcelableExtra(PackageInstaller.EXTRA_SESSION);
+ committedSessions.put(info);
+ } catch (InterruptedException e) {
+ throw new AssertionError(e);
+ }
+ }
+ };
+
+ Context context = InstrumentationRegistry.getInstrumentation().getContext();
+ context.registerReceiver(sessionCommittedReceiver,
+ new IntentFilter(PackageInstaller.ACTION_SESSION_COMMITTED));
+
+ PackageInstaller.SessionInfo info = committedSessions.poll(10, TimeUnit.SECONDS);
+ context.unregisterReceiver(sessionCommittedReceiver);
+
+ assertThat(info).isNull();
+ }
+}
diff --git a/hostsidetests/install/app/src/android/cts/install/LauncherActivity.java b/hostsidetests/install/app/src/android/cts/install/LauncherActivity.java
new file mode 100644
index 0000000..d91b0ae
--- /dev/null
+++ b/hostsidetests/install/app/src/android/cts/install/LauncherActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.cts.install;
+
+import android.app.Activity;
+
+public class LauncherActivity extends Activity {
+}
\ No newline at end of file
diff --git a/hostsidetests/install/app/src/android/cts/install/SamegradeTest.java b/hostsidetests/install/app/src/android/cts/install/SamegradeTest.java
new file mode 100644
index 0000000..2b82fef
--- /dev/null
+++ b/hostsidetests/install/app/src/android/cts/install/SamegradeTest.java
@@ -0,0 +1,175 @@
+/*
+ * 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.cts.install;
+
+import static com.android.cts.install.lib.InstallUtils.getPackageInfo;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+
+import com.android.cts.install.lib.Install;
+import com.android.cts.install.lib.TestApp;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@RunWith(Parameterized.class)
+public final class SamegradeTest {
+ @Parameter(0)
+ public INSTALL_TYPE mInstallType;
+
+ @Parameter(1)
+ public boolean mStaged;
+
+ @Parameter(2)
+ public boolean mEnableRollback;
+
+ @Parameters(name = "{0}_Staged{1}_Rollback{2}")
+ public static Collection<Object[]> combinations() {
+ boolean[] booleanValues = new boolean[]{true, false};
+ List<Object[]> temp = new ArrayList<>();
+ for (INSTALL_TYPE installType : INSTALL_TYPE.values()) {
+ for (boolean staged : booleanValues) {
+ for (boolean enableRollback : booleanValues) {
+ temp.add(new Object[]{installType, staged, enableRollback});
+ }
+ }
+ }
+ return temp;
+ }
+
+ @Rule
+ public InstallRule mInstallRule = new InstallRule();
+
+ @Rule
+ public SessionRule mSessionRule = new SessionRule();
+
+ private static final int VERSION_CODE_SAMEGRADE = 2;
+ private static final int VERSION_CODE_SAMEGRADE_SYSTEM = 1;
+
+ /**
+ * Cleans up test environment.
+ *
+ * This is marked as @Test to take advantage of @Before/@After methods of hostside test cases.
+ * Actual purpose of this method to be called before and after each test case to reduce tests
+ * flakiness.
+ */
+ @Test
+ public void cleanUp_phase() throws Exception {
+ mInstallRule.cleanUp();
+ mSessionRule.cleanUp();
+ }
+
+ /** Install the version {@link #VERSION_CODE_SAMEGRADE} of the apps to be samegraded. */
+ @Test
+ public void arrange_phase() throws Exception {
+ getParameterizedInstall(VERSION_CODE_SAMEGRADE).commit();
+ }
+
+ @Test
+ public void assert_postArrange_phase() {
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_SAMEGRADE);
+ }
+
+ @Test
+ public void action_phase() throws Exception {
+ Install install = getParameterizedInstall(VERSION_CODE_SAMEGRADE);
+ int sessionId = install.commit();
+ mSessionRule.recordSessionId(sessionId);
+ }
+
+ @Test
+ public void assert_phase() {
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_SAMEGRADE);
+ }
+
+ /** Confirms versions before staged samegrades applied. */
+ @Test
+ public void assert_preReboot_phase() throws Exception {
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionReady()).isTrue();
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_SAMEGRADE);
+ }
+
+ /** Confirms versions after staged samegrades applied. */
+ @Test
+ public void assert_postReboot_phase() throws Exception {
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionApplied()).isTrue();
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_SAMEGRADE);
+ }
+
+ @Test
+ public void action_systemApex_phase() throws Exception {
+ final PackageInfo shim = getPackageInfo(SHIM_APEX_PACKAGE_NAME);
+ assertThat(shim).isNotNull();
+ assertThat(shim.getLongVersionCode())
+ .isEqualTo(VERSION_CODE_SAMEGRADE_SYSTEM);
+ assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM)
+ .isEqualTo(ApplicationInfo.FLAG_SYSTEM);
+ assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)
+ .isEqualTo(ApplicationInfo.FLAG_INSTALLED);
+
+ int sessionId = getParameterizedInstall(VERSION_CODE_SAMEGRADE_SYSTEM).commit();
+ mSessionRule.recordSessionId(sessionId);
+ }
+
+ @Test
+ public void assert_systemApex_postReboot_phase() throws Exception {
+ final int INSTALLED_ON_DATA_PART = 0;
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionApplied()).isTrue();
+
+ final PackageInfo shim = getPackageInfo(SHIM_APEX_PACKAGE_NAME);
+ assertThat(shim).isNotNull();
+ assertThat(shim.getLongVersionCode())
+ .isEqualTo(VERSION_CODE_SAMEGRADE_SYSTEM);
+
+ // Check that APEX on /data wins.
+ assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM)
+ .isEqualTo(INSTALLED_ON_DATA_PART);
+ assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)
+ .isEqualTo(ApplicationInfo.FLAG_INSTALLED);
+ assertThat(shim.applicationInfo.sourceDir)
+ .isEqualTo("/data/apex/active/com.android.apex.cts.shim@1.apex");
+ assertThat(shim.applicationInfo.publicSourceDir)
+ .isEqualTo(shim.applicationInfo.sourceDir);
+ }
+
+ /** Gets parameterized {@link Install} of test packages with specific version. */
+ private Install getParameterizedInstall(int versionCode) {
+ List<TestApp> testApps = mInstallRule.getTestApps(mInstallType, versionCode);
+ Install install = testApps.size() == 1
+ ? Install.single(testApps.get(0))
+ : Install.multi(testApps.toArray(new TestApp[testApps.size()]));
+ if (mStaged) {
+ install.setStaged();
+ }
+ if (mEnableRollback) {
+ install.setEnableRollback();
+ }
+ return install;
+ }
+}
diff --git a/hostsidetests/install/app/src/android/cts/install/SessionRule.java b/hostsidetests/install/app/src/android/cts/install/SessionRule.java
new file mode 100644
index 0000000..5c95c4f
--- /dev/null
+++ b/hostsidetests/install/app/src/android/cts/install/SessionRule.java
@@ -0,0 +1,83 @@
+/*
+ * 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.cts.install;
+
+import static com.android.cts.install.lib.InstallUtils.getPackageInstaller;
+
+import android.content.Context;
+import android.content.pm.PackageInstaller;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.rules.ExternalResource;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Optional;
+
+/** Utils for recording session state and retrieving recorded session info. */
+final class SessionRule extends ExternalResource {
+ private static final String STATE_FILENAME = "ctsstagedinstall_state";
+
+ private final Context mContext;
+ private final File mTestStateFile;
+
+ SessionRule() {
+ mContext = InstrumentationRegistry.getInstrumentation().getContext();
+ mTestStateFile = new File(mContext.getFilesDir(), STATE_FILENAME);
+ }
+
+ @Override
+ protected void before() throws Throwable {
+ mTestStateFile.createNewFile();
+ }
+
+ /**
+ * Performs cleanup phase for this rule. Actual purpose of this method is to be called before
+ * and after each host-side test to reduce tests flakiness.
+ */
+ void cleanUp() throws IOException {
+ Files.deleteIfExists(mTestStateFile.toPath());
+ }
+
+ void recordSessionId(int sessionId) throws IOException {
+ try (BufferedWriter writer = new BufferedWriter(new FileWriter(mTestStateFile))) {
+ writer.write(String.valueOf(sessionId));
+ }
+ }
+
+ int retrieveSessionId() throws IOException {
+ try (BufferedReader reader = new BufferedReader(new FileReader(mTestStateFile))) {
+ return Integer.parseInt(reader.readLine());
+ }
+ }
+
+ /**
+ * Returns {@link android.content.pm.PackageInstaller.SessionInfo} with session id recorded
+ * in {@link #mTestStateFile}. Assert error if no session found.
+ */
+ PackageInstaller.SessionInfo retrieveSessionInfo() throws IOException {
+ return Optional.of(getPackageInstaller().getSessionInfo(retrieveSessionId()))
+ .orElseThrow(() -> new AssertionError(
+ "Expecting to find session with getSessionInfo()"));
+ }
+}
\ No newline at end of file
diff --git a/hostsidetests/install/app/src/android/cts/install/UpgradeTest.java b/hostsidetests/install/app/src/android/cts/install/UpgradeTest.java
new file mode 100644
index 0000000..81559e9
--- /dev/null
+++ b/hostsidetests/install/app/src/android/cts/install/UpgradeTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.cts.install;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.cts.install.lib.Install;
+import com.android.cts.install.lib.TestApp;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@RunWith(Parameterized.class)
+public final class UpgradeTest {
+ @Parameter(0)
+ public INSTALL_TYPE mInstallType;
+
+ @Parameter(1)
+ public boolean mStaged;
+
+ @Parameter(2)
+ public boolean mEnableRollback;
+
+ @Parameters(name = "{0}_Staged{1}_Rollback{2}")
+ public static Collection<Object[]> combinations() {
+ boolean[] booleanValues = new boolean[]{true, false};
+ List<Object[]> temp = new ArrayList<>();
+ for (INSTALL_TYPE installType : INSTALL_TYPE.values()) {
+ for (boolean staged : booleanValues) {
+ for (boolean enableRollback : booleanValues) {
+ temp.add(new Object[]{installType, staged, enableRollback});
+ }
+ }
+ }
+ return temp;
+ }
+
+ @Rule
+ public InstallRule mInstallRule = new InstallRule();
+
+ @Rule
+ public SessionRule mSessionRule = new SessionRule();
+
+ private static final int VERSION_CODE_CURRENT = 2;
+ private static final int VERSION_CODE_UPGRADE = 3;
+
+ @Test
+ public void cleanUp_phase() throws Exception {
+ mInstallRule.cleanUp();
+ mSessionRule.cleanUp();
+ }
+
+ /** Install the version {@link #VERSION_CODE_CURRENT} of the apps to be upgraded. */
+ @Test
+ public void arrange_phase() throws Exception {
+ getParameterizedInstall(VERSION_CODE_CURRENT).commit();
+ }
+
+ @Test
+ public void assert_postArrange_phase() {
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_CURRENT);
+ }
+
+ @Test
+ public void action_phase() throws Exception {
+ Install install = getParameterizedInstall(VERSION_CODE_UPGRADE);
+ int sessionId = install.commit();
+ mSessionRule.recordSessionId(sessionId);
+ }
+
+ @Test
+ public void assert_phase() {
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_UPGRADE);
+ }
+
+ /** Confirms versions before staged samegrades applied. */
+ @Test
+ public void assert_preReboot_phase() throws Exception {
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionReady()).isTrue();
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_CURRENT);
+ }
+
+ /** Confirms versions after staged samegrades applied. */
+ @Test
+ public void assert_postReboot_phase() throws Exception {
+ assertThat(mSessionRule.retrieveSessionInfo().isStagedSessionApplied()).isTrue();
+ mInstallRule.assertPackageVersion(mInstallType, VERSION_CODE_UPGRADE);
+ }
+
+ /** Gets parameterized {@link Install} of test packages with specific version. */
+ private Install getParameterizedInstall(int versionCode) {
+ List<TestApp> testApps = mInstallRule.getTestApps(mInstallType, versionCode);
+ Install install = testApps.size() == 1
+ ? Install.single(testApps.get(0))
+ : Install.multi(testApps.toArray(new TestApp[testApps.size()]));
+ if (mStaged) {
+ install.setStaged();
+ }
+ if (mEnableRollback) {
+ install.setEnableRollback();
+ }
+ return install;
+ }
+}
diff --git a/hostsidetests/install/src/android/cts/install/INSTALL_TYPE.java b/hostsidetests/install/src/android/cts/install/INSTALL_TYPE.java
new file mode 100644
index 0000000..ef98e07
--- /dev/null
+++ b/hostsidetests/install/src/android/cts/install/INSTALL_TYPE.java
@@ -0,0 +1,42 @@
+/*
+ * 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.cts.install;
+
+/**
+ * Indicates target test packages of the installation test.
+ *
+ * @note Once the enum changed, remember to update
+ * {@link InstallRule#getTestPackageNames(INSTALL_TYPE)} correspondingly as well.
+ */
+// TODO(b/136152558): Supports MULTIPLE_APEXS type
+public enum INSTALL_TYPE {
+ SINGLE_APK,
+ SINGLE_APEX,
+ MULTIPLE_APKS,
+ MULTIPLE_MIX;
+
+ /** Returns true if the install type are testing apex package. */
+ public boolean containsApex() {
+ switch (this) {
+ case SINGLE_APEX:
+ case MULTIPLE_MIX:
+ return true;
+ default:
+ return false;
+ }
+ }
+}
diff --git a/hostsidetests/install/src/android/cts/install/host/DeviceParameterized.java b/hostsidetests/install/src/android/cts/install/host/DeviceParameterized.java
new file mode 100644
index 0000000..9e7743a
--- /dev/null
+++ b/hostsidetests/install/src/android/cts/install/host/DeviceParameterized.java
@@ -0,0 +1,109 @@
+/*
+ * 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.cts.install.host;
+
+import com.android.tradefed.invoker.TestInformation;
+import com.android.tradefed.testtype.ITestInformationReceiver;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.runner.Description;
+import org.junit.runner.Runner;
+import org.junit.runners.Parameterized;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters;
+import org.junit.runners.parameterized.ParametersRunnerFactory;
+import org.junit.runners.parameterized.TestWithParameters;
+
+import java.util.List;
+
+/**
+ * Custom JUnit4 parameterized test runner that also accommodate {@link ITestInformationReceiver}
+ * to support {@link BaseHostJUnit4Test#getDevice()} properly.
+ */
+public final class DeviceParameterized extends Parameterized implements ITestInformationReceiver {
+ private TestInformation mTestInformation;
+ private List<Runner> mRunners;
+
+ public DeviceParameterized(Class<?> klass) throws Throwable {
+ super(klass);
+ mRunners = super.getChildren();
+ }
+
+ @Override
+ public void setTestInformation(TestInformation testInformation) {
+ mTestInformation = testInformation;
+ for (Runner runner: mRunners) {
+ if (runner instanceof ITestInformationReceiver) {
+ ((ITestInformationReceiver)runner).setTestInformation(mTestInformation);
+ }
+ }
+ }
+
+ @Override
+ public TestInformation getTestInformation() {
+ return mTestInformation;
+ }
+
+ public static class RunnerFactory implements ParametersRunnerFactory {
+ @Override
+ public Runner createRunnerForTestWithParameters(TestWithParameters test)
+ throws InitializationError {
+ return new DeviceParameterizedRunner(test);
+ }
+ }
+
+ public static class DeviceParameterizedRunner
+ extends BlockJUnit4ClassRunnerWithParameters implements ITestInformationReceiver {
+ private TestInformation mTestInformation;
+
+ public DeviceParameterizedRunner(TestWithParameters test) throws InitializationError {
+ super(test);
+ }
+
+ /** Overrides createTest in order to set the device. */
+ @Override
+ public Object createTest() throws Exception {
+ Object testObj = super.createTest();
+ if (testObj instanceof ITestInformationReceiver) {
+ if (mTestInformation == null) {
+ throw new IllegalArgumentException("Missing test info");
+ }
+ ((ITestInformationReceiver) testObj).setTestInformation(mTestInformation);
+ }
+ return testObj;
+ }
+
+ @Override
+ public void setTestInformation(TestInformation testInformation) {
+ mTestInformation = testInformation;
+ }
+
+ @Override
+ public TestInformation getTestInformation() {
+ return mTestInformation;
+ }
+
+ @Override
+ public Description getDescription() {
+ // Make sure it includes test class name when generating parameterized test suites.
+ Description desc = Description.createSuiteDescription(getTestClass().getJavaClass());
+ // Invoke super getDescription to apply filtered children
+ super.getDescription().getChildren().forEach(child -> desc.addChild(child));
+ return desc;
+ }
+ }
+}
diff --git a/hostsidetests/install/src/android/cts/install/host/DowngradeTest.java b/hostsidetests/install/src/android/cts/install/host/DowngradeTest.java
new file mode 100644
index 0000000..034a68f
--- /dev/null
+++ b/hostsidetests/install/src/android/cts/install/host/DowngradeTest.java
@@ -0,0 +1,189 @@
+/*
+ * 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.cts.install.host;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.hamcrest.CoreMatchers.endsWith;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
+
+import android.cts.install.INSTALL_TYPE;
+import android.platform.test.annotations.LargeTest;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized.UseParametersRunnerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@RunWith(DeviceParameterized.class)
+@UseParametersRunnerFactory(DeviceParameterized.RunnerFactory.class)
+public final class DowngradeTest extends BaseHostJUnit4Test {
+ private static final String PACKAGE_NAME = "android.cts.install";
+ private static final String PHASE_FORMAT_SUFFIX = "[%s_Staged%b_Rollback%b]";
+
+ private static final String CLEAN_UP_PHASE = "cleanUp_phase";
+ private static final String ARRANGE_PHASE = "arrange_phase";
+ private static final String ASSERT_POST_ARRANGE_PHASE = "assert_postArrange_phase";
+ private static final String ACTION_PHASE = "action_phase";
+ private static final String ASSERT_DOWNGRADE_SUCCESS_PHASE = "assert_downgradeSuccess_phase";
+ private static final String ASSERT_POST_REBOOT_PHASE = "assert_postReboot_phase";
+ private static final String ASSERT_PRE_REBOOT_PHASE = "assert_preReboot_phase";
+ private static final String ASSERT_DOWNGRADE_NOT_ALLOWED_PHASE =
+ "assert_downgradeNotAllowed_phase";
+ private static final String ASSERT_DOWNGRADE_NOT_REQUESTED_PHASE =
+ "assert_downgradeNotRequested_phase";
+
+ @Rule
+ public ShimApexRule mShimApexRule = new ShimApexRule(this);
+
+ @Parameter(0)
+ public INSTALL_TYPE mInstallType;
+
+ @Parameter(1)
+ public boolean mEnableRollback;
+
+ @Parameters(name = "{0}_Rollback{1}")
+ public static Collection<Object[]> combinations() {
+ boolean[] booleanValues = new boolean[]{true, false};
+ List<Object[]> temp = new ArrayList<>();
+ for (INSTALL_TYPE installType : INSTALL_TYPE.values()) {
+ for (boolean enableRollback : booleanValues) {
+ temp.add(new Object[]{installType, enableRollback});
+ }
+ }
+ return temp;
+ }
+
+ @Before
+ @After
+ public void cleanUp() throws Exception {
+ runPhase(CLEAN_UP_PHASE);
+ }
+
+ @Before
+ public void assumeApexSupported() throws DeviceNotAvailableException {
+ if (mInstallType.containsApex()) {
+ assumeTrue("Device does not support updating APEX",
+ mShimApexRule.isUpdatingApexSupported());
+ }
+ }
+
+ @Test
+ public void testNonStagedDowngrade_downgradeNotRequested_fails() throws Exception {
+ // Apex should not be committed in non-staged install, such logic covered in InstallTest.
+ assumeFalse(mInstallType.containsApex());
+ runPhase(ARRANGE_PHASE);
+ runPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runPhase(ASSERT_DOWNGRADE_NOT_REQUESTED_PHASE);
+ }
+
+ @Test
+ public void testNonStagedDowngrade_debugBuild() throws Exception {
+ // Apex should not be committed in non-staged install, such logic covered in InstallTest.
+ assumeFalse(mInstallType.containsApex());
+ assumeThat(getDevice().getBuildFlavor(), not(endsWith("-user")));
+ runPhase(ARRANGE_PHASE);
+ runPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runPhase(ACTION_PHASE);
+
+ runPhase(ASSERT_DOWNGRADE_SUCCESS_PHASE);
+ }
+
+ @Test
+ public void testNonStagedDowngrade_userBuild_fail() throws Exception {
+ // Apex should not be committed in non-staged install, such logic covered in InstallTest.
+ assumeFalse(mInstallType.containsApex());
+ assumeThat(getDevice().getBuildFlavor(), endsWith("-user"));
+ runPhase(ARRANGE_PHASE);
+ runPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runPhase(ASSERT_DOWNGRADE_NOT_ALLOWED_PHASE);
+ }
+
+ @Test
+ @LargeTest
+ public void testStagedDowngrade_downgradeNotRequested_fails() throws Exception {
+ runStagedPhase(ARRANGE_PHASE);
+ getDevice().reboot();
+ runStagedPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runStagedPhase(ASSERT_DOWNGRADE_NOT_REQUESTED_PHASE);
+ }
+
+ @Test
+ @LargeTest
+ public void testStagedDowngrade_debugBuild() throws Exception {
+ assumeThat(getDevice().getBuildFlavor(), not(endsWith("-user")));
+ runStagedPhase(ARRANGE_PHASE);
+ getDevice().reboot();
+ runStagedPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runStagedPhase(ACTION_PHASE);
+
+ runStagedPhase(ASSERT_PRE_REBOOT_PHASE);
+ getDevice().reboot();
+ runStagedPhase(ASSERT_POST_REBOOT_PHASE);
+ }
+
+ @Test
+ @LargeTest
+ public void testStagedDowngrade_userBuild_fail() throws Exception {
+ assumeThat(getDevice().getBuildFlavor(), endsWith("-user"));
+ runStagedPhase(ARRANGE_PHASE);
+ getDevice().reboot();
+ runStagedPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runStagedPhase(ASSERT_DOWNGRADE_NOT_ALLOWED_PHASE);
+ }
+
+ private void runPhase(String phase) throws DeviceNotAvailableException {
+ runPhase(phase, false /* staged */);
+ }
+
+ private void runStagedPhase(String phase) throws DeviceNotAvailableException {
+ runPhase(phase, true /* staged */);
+ }
+
+ /**
+ * Runs the given phase of a test with parameters by calling into the device.
+ * Throws an exception if the test phase fails.
+ * <p>
+ * For example, <code>runPhase("action_phase", true);</code>
+ */
+ private void runPhase(String phase, boolean staged) throws DeviceNotAvailableException {
+ assertThat(runDeviceTests(PACKAGE_NAME,
+ String.format("%s.%s", PACKAGE_NAME, this.getClass().getSimpleName()),
+ String.format(phase + PHASE_FORMAT_SUFFIX, mInstallType, staged, mEnableRollback)))
+ .isTrue();
+ }
+}
diff --git a/hostsidetests/install/src/android/cts/install/host/InstallTest.java b/hostsidetests/install/src/android/cts/install/host/InstallTest.java
new file mode 100644
index 0000000..5580466
--- /dev/null
+++ b/hostsidetests/install/src/android/cts/install/host/InstallTest.java
@@ -0,0 +1,151 @@
+/*
+ * 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.cts.install.host;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.cts.install.INSTALL_TYPE;
+import android.platform.test.annotations.LargeTest;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized.UseParametersRunnerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@RunWith(DeviceParameterized.class)
+@UseParametersRunnerFactory(DeviceParameterized.RunnerFactory.class)
+public final class InstallTest extends BaseHostJUnit4Test {
+ private static final String PACKAGE_NAME = "android.cts.install";
+ private static final String CUSTOMIZED_LAUNCHER_COMPONENT =
+ PACKAGE_NAME + "/" + PACKAGE_NAME + ".LauncherActivity";
+ private static final String PHASE_FORMAT_SUFFIX = "[%s_Staged%b_Rollback%b]";
+
+ private static final String CLEAN_UP_PHASE = "cleanUp_phase";
+ private static final String ACTION_PHASE = "action_phase";
+ private static final String ACTION_ABANDON_SESSION_PHASE = "action_abandonSession_phase";
+ private static final String ASSERT_PHASE = "assert_phase";
+ private static final String ASSERT_COMMIT_FAILURE_PHASE = "assert_commitFailure_phase";
+ private static final String ASSERT_PRE_REBOOT_PHASE = "assert_preReboot_phase";
+ private static final String ASSERT_POST_REBOOT_PHASE = "assert_postReboot_phase";
+ private static final String ASSERT_ABANDON_SESSION = "assert_abandonSession_phase";
+
+ @Rule
+ public ShimApexRule mShimApexRule = new ShimApexRule(this);
+
+ @Rule
+ public LauncherRule mLauncherRule = new LauncherRule(this, CUSTOMIZED_LAUNCHER_COMPONENT);
+
+ @Parameter(0)
+ public INSTALL_TYPE mInstallType;
+
+ @Parameter(1)
+ public boolean mEnableRollback;
+
+ @Parameters(name = "{0}_Rollback{1}")
+ public static Collection<Object[]> combinations() {
+ boolean[] booleanValues = new boolean[]{true, false};
+ List<Object[]> temp = new ArrayList<>();
+ for (INSTALL_TYPE installType: INSTALL_TYPE.values()) {
+ for (boolean enableRollback: booleanValues) {
+ temp.add(new Object[]{installType, enableRollback});
+ }
+ }
+ return temp;
+ }
+
+ private boolean mStaged;
+
+ @Before
+ @After
+ public void cleanUp() throws Exception {
+ runPhase(CLEAN_UP_PHASE);
+ }
+
+ @Before
+ public void assumeApexSupported() throws DeviceNotAvailableException {
+ if (mInstallType.containsApex()) {
+ assumeTrue("Device does not support updating APEX",
+ mShimApexRule.isUpdatingApexSupported());
+ }
+ }
+
+ @Test
+ public void testInstall() throws Exception {
+ mStaged = false;
+ if (mInstallType.containsApex()) {
+ runPhase(ASSERT_COMMIT_FAILURE_PHASE);
+ return;
+ }
+ runPhase(ACTION_PHASE);
+ runPhase(ASSERT_PHASE);
+ }
+
+ @Test
+ @LargeTest
+ public void testStagedInstall() throws Exception {
+ mStaged = true;
+ runPhase(ACTION_PHASE);
+ runPhase(ASSERT_PRE_REBOOT_PHASE);
+ getDevice().reboot();
+ runPhase(ASSERT_POST_REBOOT_PHASE);
+ }
+
+ @Test
+ public void testAbandonStagedSessionBeforeReboot() throws Exception {
+ mStaged = true;
+ runPhase(ACTION_PHASE);
+ runPhase(ASSERT_PRE_REBOOT_PHASE);
+ runPhase(ACTION_ABANDON_SESSION_PHASE);
+ runPhase(ASSERT_ABANDON_SESSION);
+ }
+
+ @Test
+ @LargeTest
+ public void testAbandonStagedSessionAfterReboot() throws Exception {
+ mStaged = true;
+ runPhase(ACTION_PHASE);
+ getDevice().reboot();
+ runPhase(ACTION_ABANDON_SESSION_PHASE);
+ runPhase(ASSERT_POST_REBOOT_PHASE);
+ }
+
+ /**
+ * Runs the given phase of a test with parameters by calling into the device.
+ * Throws an exception if the test phase fails.
+ * <p>
+ * For example, <code>runPhase("action_phase");</code>
+ */
+ private void runPhase(String phase) throws DeviceNotAvailableException {
+ assertThat(runDeviceTests(PACKAGE_NAME,
+ String.format("%s.%s", PACKAGE_NAME, this.getClass().getSimpleName()),
+ String.format(phase + PHASE_FORMAT_SUFFIX, mInstallType, mStaged, mEnableRollback)))
+ .isTrue();
+ }
+}
diff --git a/hostsidetests/install/src/android/cts/install/host/LauncherRule.java b/hostsidetests/install/src/android/cts/install/host/LauncherRule.java
new file mode 100644
index 0000000..fefe71e
--- /dev/null
+++ b/hostsidetests/install/src/android/cts/install/host/LauncherRule.java
@@ -0,0 +1,88 @@
+/*
+ * 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.cts.install.host;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.rules.ExternalResource;
+
+/**
+ * Changes default launcher with {@link #mTestLauncher} while testing. Restores to default
+ * launcher after test finished.
+ */
+final class LauncherRule extends ExternalResource {
+ private final BaseHostJUnit4Test mHostTest;
+ private final String mTestLauncher;
+
+ /**
+ * This value will be used to reset the default launcher to its correct component upon test
+ * completion.
+ */
+ private String mDefaultLauncher = null;
+
+ /**
+ * Constructs {@link LauncherRule} instance.
+ *
+ * @param hostTest Test to apply this rule.
+ * @param testLauncher Component name of customized launcher to set as default while testing.
+ */
+ LauncherRule(BaseHostJUnit4Test hostTest, String testLauncher) {
+ mHostTest = hostTest;
+ mTestLauncher = testLauncher;
+ }
+
+
+ protected void before() throws Throwable {
+ mDefaultLauncher = fetchDefaultLauncher();
+ setDefaultLauncher(mTestLauncher);
+ }
+
+ protected void after() {
+ try {
+ setDefaultLauncher(mDefaultLauncher);
+ } catch (DeviceNotAvailableException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /** Fetches the component name of the default launcher. Assert error if no launcher found. */
+ private String fetchDefaultLauncher() throws DeviceNotAvailableException {
+ final String PREFIX = "Launcher: ComponentInfo{";
+ final String POSTFIX = "}";
+ for (String s : mHostTest.getDevice().executeShellCommand(
+ "cmd shortcut get-default-launcher").split("\n")) {
+ if (s.startsWith(PREFIX) && s.endsWith(POSTFIX)) {
+ return s.substring(PREFIX.length(), s.length() - POSTFIX.length());
+ }
+ }
+ throw new AssertionError("No default launcher found");
+ }
+
+ /**
+ * Set the default launcher to a given component.
+ * If set to the broadcast receiver component of this test app, this will allow the test app to
+ * receive SESSION_COMMITTED broadcasts.
+ */
+ private void setDefaultLauncher(String launcherComponent) throws DeviceNotAvailableException {
+ assertThat(launcherComponent).isNotEmpty();
+ mHostTest.getDevice().executeShellCommand(
+ "cmd package set-home-activity " + launcherComponent);
+ }
+}
diff --git a/hostsidetests/install/src/android/cts/install/host/SamegradeTest.java b/hostsidetests/install/src/android/cts/install/host/SamegradeTest.java
new file mode 100644
index 0000000..3c67a10
--- /dev/null
+++ b/hostsidetests/install/src/android/cts/install/host/SamegradeTest.java
@@ -0,0 +1,156 @@
+/*
+ * 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.cts.install.host;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+import android.cts.install.INSTALL_TYPE;
+import android.platform.test.annotations.LargeTest;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized.UseParametersRunnerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@RunWith(DeviceParameterized.class)
+@UseParametersRunnerFactory(DeviceParameterized.RunnerFactory.class)
+public final class SamegradeTest extends BaseHostJUnit4Test {
+ private static final String PACKAGE_NAME = "android.cts.install";
+ private static final String PHASE_FORMAT_SUFFIX = "[%s_Staged%b_Rollback%b]";
+ private static final String ARRANGE_PHASE = "arrange_phase";
+ private static final String ASSERT_POST_ARRANGE_PHASE = "assert_postArrange_phase";
+ private static final String ACTION_PHASE = "action_phase";
+ private static final String ACTION_SYSTEMAPEX_PHASE = "action_systemApex_phase";
+ private static final String ASSERT_PRE_REBOOT_PHASE = "assert_preReboot_phase";
+ private static final String ASSERT_POST_REBOOT_PHASE = "assert_postReboot_phase";
+ private static final String ASSERT_SYSTEMAPEX_REBOOT_PHASE =
+ "assert_systemApex_postReboot_phase";
+ private static final String ASSERT_PHASE = "assert_phase";
+ private static final String CLEAN_UP_PHASE = "cleanUp_phase";
+
+ @Rule
+ public ShimApexRule mShimApexRule = new ShimApexRule(this);
+
+ @Parameter(0)
+ public INSTALL_TYPE mInstallType;
+
+ @Parameter(1)
+ public boolean mEnableRollback;
+
+ @Parameters(name = "{0}_Rollback{1}")
+ public static Collection<Object[]> combinations() {
+ boolean[] booleanValues = new boolean[]{true, false};
+ List<Object[]> temp = new ArrayList<>();
+ for (INSTALL_TYPE installType : INSTALL_TYPE.values()) {
+ for (boolean enableRollback : booleanValues) {
+ temp.add(new Object[]{installType, enableRollback});
+ }
+ }
+ return temp;
+ }
+
+ @Before
+ @After
+ public void cleanUp() throws Exception {
+ runPhase(CLEAN_UP_PHASE);
+ }
+
+ @Before
+ public void assumeApexSupported() throws DeviceNotAvailableException {
+ if (mInstallType.containsApex()) {
+ assumeTrue("Device does not support updating APEX",
+ mShimApexRule.isUpdatingApexSupported());
+ }
+ }
+
+ /**
+ * Samegrading on a non-APEX install type should be success.
+ */
+ @Test
+ public void testNonStagedSamegrade() throws Exception {
+ // Apex should not be committed in non-staged install, such logic covered in InstallTest.
+ assumeFalse(mInstallType.containsApex());
+
+ runPhase(ARRANGE_PHASE);
+ runPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runPhase(ACTION_PHASE);
+
+ runPhase(ASSERT_PHASE);
+ }
+
+ @Test
+ @LargeTest
+ public void testStagedSameGrade() throws Exception {
+ assumeTrue(mInstallType.containsApex());
+ runStagedPhase(ARRANGE_PHASE);
+ getDevice().reboot();
+ runStagedPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runStagedPhase(ACTION_PHASE);
+
+ runStagedPhase(ASSERT_PRE_REBOOT_PHASE);
+ getDevice().reboot();
+ runStagedPhase(ASSERT_POST_REBOOT_PHASE);
+ }
+
+ @Test
+ @LargeTest
+ public void testStagedSamegradeSystemApex() throws Exception {
+ assumeTrue(mInstallType.containsApex());
+
+ runStagedPhase(ACTION_SYSTEMAPEX_PHASE);
+ getDevice().reboot();
+
+ runStagedPhase(ASSERT_SYSTEMAPEX_REBOOT_PHASE);
+ }
+
+ private void runPhase(String phase) throws DeviceNotAvailableException {
+ runPhase(phase, false /* staged */);
+ }
+
+ private void runStagedPhase(String phase) throws DeviceNotAvailableException {
+ runPhase(phase, true /* staged */);
+ }
+
+ /**
+ * Runs the given phase of a test with parameters by calling into the device.
+ * Throws an exception if the test phase fails.
+ * <p>
+ * For example, <code>runPhase("action_phase", true);</code>
+ */
+ private void runPhase(String phase, boolean staged) throws DeviceNotAvailableException {
+ assertThat(runDeviceTests(PACKAGE_NAME,
+ String.format("%s.%s", PACKAGE_NAME, this.getClass().getSimpleName()),
+ String.format(phase + PHASE_FORMAT_SUFFIX, mInstallType, staged, mEnableRollback)))
+ .isTrue();
+ }
+}
diff --git a/hostsidetests/install/src/android/cts/install/host/ShimApexRule.java b/hostsidetests/install/src/android/cts/install/host/ShimApexRule.java
new file mode 100644
index 0000000..4641aaa
--- /dev/null
+++ b/hostsidetests/install/src/android/cts/install/host/ShimApexRule.java
@@ -0,0 +1,98 @@
+/*
+ * 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.cts.install.host;
+
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.ddmlib.Log;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.rules.ExternalResource;
+
+/**
+ * Clears shim Apex if needed before and after each test to prevent flaky and reduce
+ * reboot time.
+ */
+final class ShimApexRule extends ExternalResource {
+ private static final String TAG = ShimApexRule.class.getSimpleName();
+ private final BaseHostJUnit4Test mHostTest;
+
+ ShimApexRule(BaseHostJUnit4Test hostTest) {
+ mHostTest = hostTest;
+ }
+
+ @Override
+ protected void before() throws Throwable {
+ uninstallShimApexIfNecessary();
+ }
+
+ @Override
+ protected void after() {
+ try {
+ uninstallShimApexIfNecessary();
+ } catch (DeviceNotAvailableException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Uninstalls a shim apex only if it's latest version is installed on /data partition (i.e.
+ * it has a version higher than {@code 1}).
+ *
+ * <p>This is purely to optimize tests run time. Since uninstalling an apex requires a reboot,
+ * and only a small subset of tests successfully install an apex, this code avoids ~10
+ * unnecessary reboots.
+ */
+ private void uninstallShimApexIfNecessary() throws DeviceNotAvailableException {
+ if (!isUpdatingApexSupported()) {
+ // Device doesn't support updating apex. Nothing to uninstall.
+ return;
+ }
+ if (getShimApex().sourceDir.startsWith("/system")) {
+ // System version is active, nothing to uninstall.
+ return;
+ }
+ // Non system version is active, need to uninstall it and reboot the device.
+ Log.i(TAG, "Uninstalling shim apex");
+ final String errorMessage =
+ mHostTest.getDevice().uninstallPackage(SHIM_APEX_PACKAGE_NAME);
+ if (errorMessage != null) {
+ Log.e(TAG, "Failed to uninstall " + SHIM_APEX_PACKAGE_NAME + " : " + errorMessage);
+ return;
+ }
+
+ mHostTest.getDevice().reboot();
+ ITestDevice.ApexInfo shim = getShimApex();
+ assertThat(shim.versionCode).isEqualTo(1L);
+ assertThat(shim.sourceDir).startsWith("/system");
+ }
+
+ boolean isUpdatingApexSupported() throws DeviceNotAvailableException {
+ final String updatable = mHostTest.getDevice().getProperty("ro.apex.updatable");
+ return updatable != null && updatable.equals("true");
+ }
+
+ private ITestDevice.ApexInfo getShimApex() throws DeviceNotAvailableException {
+ return mHostTest.getDevice().getActiveApexes().stream().filter(
+ apex -> apex.name.equals(SHIM_APEX_PACKAGE_NAME)).findAny().orElseThrow(
+ () -> new AssertionError("Can't find " + SHIM_APEX_PACKAGE_NAME));
+ }
+}
diff --git a/hostsidetests/install/src/android/cts/install/host/UpgradeTest.java b/hostsidetests/install/src/android/cts/install/host/UpgradeTest.java
new file mode 100644
index 0000000..cf58863
--- /dev/null
+++ b/hostsidetests/install/src/android/cts/install/host/UpgradeTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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.cts.install.host;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+import android.cts.install.INSTALL_TYPE;
+import android.platform.test.annotations.LargeTest;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized.UseParametersRunnerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@RunWith(DeviceParameterized.class)
+@UseParametersRunnerFactory(DeviceParameterized.RunnerFactory.class)
+public final class UpgradeTest extends BaseHostJUnit4Test {
+ private static final String PACKAGE_NAME = "android.cts.install";
+ private static final String PHASE_FORMAT_SUFFIX = "[%s_Staged%b_Rollback%b]";
+ private static final String ARRANGE_PHASE = "arrange_phase";
+ private static final String ASSERT_POST_ARRANGE_PHASE = "assert_postArrange_phase";
+ private static final String ACTION_PHASE = "action_phase";
+ private static final String ASSERT_PHASE = "assert_phase";
+ private static final String ASSERT_PRE_REBOOT_PHASE = "assert_preReboot_phase";
+ private static final String ASSERT_POST_REBOOT_PHASE = "assert_postReboot_phase";
+ private static final String CLEAN_UP_PHASE = "cleanUp_phase";
+
+ @Rule
+ public ShimApexRule mShimApexRule = new ShimApexRule(this);
+
+ @Parameter(0)
+ public INSTALL_TYPE mInstallType;
+
+ @Parameter(1)
+ public boolean mEnableRollback;
+
+ @Parameters(name = "{0}_Rollback{1}")
+ public static Collection<Object[]> combinations() {
+ boolean[] booleanValues = new boolean[]{true, false};
+ List<Object[]> temp = new ArrayList<>();
+ for (INSTALL_TYPE installType : INSTALL_TYPE.values()) {
+ for (boolean enableRollback : booleanValues) {
+ temp.add(new Object[]{installType, enableRollback});
+ }
+ }
+ return temp;
+ }
+
+ @Before
+ @After
+ public void cleanUp() throws Exception {
+ runPhase(CLEAN_UP_PHASE);
+ }
+
+ @Before
+ public void assumeApexSupported() throws DeviceNotAvailableException {
+ if (mInstallType.containsApex()) {
+ assumeTrue("Device does not support updating APEX",
+ mShimApexRule.isUpdatingApexSupported());
+ }
+ }
+
+ @Test
+ public void testNonStagedUpgrade() throws Exception {
+ // Apex should not be committed in non-staged install, such logic covered in InstallTest.
+ assumeFalse(mInstallType.containsApex());
+ runPhase(ARRANGE_PHASE);
+ runPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runPhase(ACTION_PHASE);
+
+ runPhase(ASSERT_PHASE);
+ }
+
+ @Test
+ @LargeTest
+ public void testStagedUpgrade() throws Exception {
+ assumeTrue(mInstallType.containsApex());
+ runStagedPhase(ARRANGE_PHASE);
+ getDevice().reboot();
+ runStagedPhase(ASSERT_POST_ARRANGE_PHASE);
+
+ runStagedPhase(ACTION_PHASE);
+
+ runStagedPhase(ASSERT_PRE_REBOOT_PHASE);
+ getDevice().reboot();
+ runStagedPhase(ASSERT_POST_REBOOT_PHASE);
+ }
+
+ private void runPhase(String phase) throws DeviceNotAvailableException {
+ runPhase(phase, false /* staged */);
+ }
+
+ private void runStagedPhase(String phase) throws DeviceNotAvailableException {
+ runPhase(phase, true /* staged */);
+ }
+
+ /**
+ * Runs the given phase of a test with parameters by calling into the device.
+ * Throws an exception if the test phase fails.
+ * <p>
+ * For example, <code>runPhase("action_phase", true);</code>
+ */
+ private void runPhase(String phase, boolean staged) throws DeviceNotAvailableException {
+ assertThat(runDeviceTests(PACKAGE_NAME,
+ String.format("%s.%s", PACKAGE_NAME, this.getClass().getSimpleName()),
+ String.format(phase + PHASE_FORMAT_SUFFIX, mInstallType, staged, mEnableRollback)))
+ .isTrue();
+ }
+}
diff --git a/hostsidetests/jdwptunnel/sampleapps/debuggableapp/AndroidManifest.xml b/hostsidetests/jdwptunnel/sampleapps/debuggableapp/AndroidManifest.xml
index 2e2d2dd..3d85039 100755
--- a/hostsidetests/jdwptunnel/sampleapps/debuggableapp/AndroidManifest.xml
+++ b/hostsidetests/jdwptunnel/sampleapps/debuggableapp/AndroidManifest.xml
@@ -16,16 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.jdwptunnel.sampleapp.debuggable">
+ package="android.jdwptunnel.sampleapp.debuggable">
<application android:debuggable="true">
- <activity android:name=".DebuggableSampleDeviceActivity" >
+ <activity android:name=".DebuggableSampleDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/jdwptunnel/sampleapps/profileableapp/AndroidManifest.xml b/hostsidetests/jdwptunnel/sampleapps/profileableapp/AndroidManifest.xml
index eb73f5d..678e60f 100755
--- a/hostsidetests/jdwptunnel/sampleapps/profileableapp/AndroidManifest.xml
+++ b/hostsidetests/jdwptunnel/sampleapps/profileableapp/AndroidManifest.xml
@@ -16,17 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.jdwptunnel.sampleapp.profileable">
+ package="android.jdwptunnel.sampleapp.profileable">
<application android:debuggable="false">
- <activity android:name=".ProfileableSampleDeviceActivity" >
+ <activity android:name=".ProfileableSampleDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <profileable android:shell="true" />
+ <profileable android:shell="true"/>
</application>
</manifest>
-
diff --git a/hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml b/hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml
index 009fea8..3e5854d 100644
--- a/hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml
+++ b/hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml
@@ -15,28 +15,26 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.media.session.cts"
- android:targetSandboxVersion="2">
+ package="android.media.session.cts"
+ android:targetSandboxVersion="2">
<uses-sdk android:minSdkVersion="26"/>
- <application
- android:testOnly="true">
- <uses-library android:name="android.test.runner" />
+ <application android:testOnly="true">
+ <uses-library android:name="android.test.runner"/>
- <service
- android:name=".MediaSessionManagerTest"
- android:label="MediaSessionManagerTest"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+ <service android:name=".MediaSessionManagerTest"
+ android:label="MediaSessionManagerTest"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.notification.NotificationListenerService" />
+ <action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.media.session.cts"
- android:label="MediaSession multi-user case CTS Tests" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.media.session.cts"
+ android:label="MediaSession multi-user case CTS Tests"/>
</manifest>
diff --git a/hostsidetests/media/app/MediaSessionTestHelper/AndroidManifest.xml b/hostsidetests/media/app/MediaSessionTestHelper/AndroidManifest.xml
index 70c48f9..a7270fc 100644
--- a/hostsidetests/media/app/MediaSessionTestHelper/AndroidManifest.xml
+++ b/hostsidetests/media/app/MediaSessionTestHelper/AndroidManifest.xml
@@ -16,16 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.media.app.media_session_test_helper"
- android:versionCode="1"
- android:versionName="1.0">
+ package="android.media.app.media_session_test_helper"
+ android:versionCode="1"
+ android:versionName="1.0">
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<application android:label="@string/label">
- <service android:name=".MediaSessionTestHelperService">
+ <service android:name=".MediaSessionTestHelperService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.app.media_session_test_helper.ACTION_CONTROL" />
+ <action android:name="android.media.app.media_session_test_helper.ACTION_CONTROL"/>
</intent-filter>
</service>
</application>
diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml b/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml
index efb1288..742a7c0 100644
--- a/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml
+++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml
@@ -13,26 +13,27 @@
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.cts.monkey">
+ package="com.android.cts.monkey">
<application android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
- <activity
- android:name=".MonkeyActivity"
- android:screenOrientation="locked">
+ <activity android:name=".MonkeyActivity"
+ android:screenOrientation="locked"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity
- android:name=".BaboonActivity"
- android:screenOrientation="locked">
+ <activity android:name=".BaboonActivity"
+ android:screenOrientation="locked"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.MONKEY" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.MONKEY"/>
</intent-filter>
</activity>
diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp2/AndroidManifest.xml b/hostsidetests/monkey/test-apps/CtsMonkeyApp2/AndroidManifest.xml
index d08e231..2ecb8f3 100644
--- a/hostsidetests/monkey/test-apps/CtsMonkeyApp2/AndroidManifest.xml
+++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp2/AndroidManifest.xml
@@ -13,15 +13,17 @@
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.cts.monkey2">
+ package="com.android.cts.monkey2">
<application android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
- <activity android:name=".ChimpActivity">
+ <activity android:name=".ChimpActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
diff --git a/hostsidetests/net/app/AndroidManifest.xml b/hostsidetests/net/app/AndroidManifest.xml
index 3940de4..e5bae5f 100644
--- a/hostsidetests/net/app/AndroidManifest.xml
+++ b/hostsidetests/net/app/AndroidManifest.xml
@@ -15,42 +15,42 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.net.hostside">
+ package="com.android.cts.net.hostside">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
- <application android:requestLegacyExternalStorage="true" >
- <uses-library android:name="android.test.runner" />
- <activity android:name=".MyActivity" />
+ <application android:requestLegacyExternalStorage="true">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".MyActivity"/>
<service android:name=".MyVpnService"
- android:permission="android.permission.BIND_VPN_SERVICE">
+ android:permission="android.permission.BIND_VPN_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.net.VpnService"/>
</intent-filter>
</service>
- <service
- android:name=".MyNotificationListenerService"
- android:label="MyNotificationListenerService"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+ <service android:name=".MyNotificationListenerService"
+ android:label="MyNotificationListenerService"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.notification.NotificationListenerService" />
+ <action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.net.hostside" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.net.hostside"/>
</manifest>
diff --git a/hostsidetests/net/app2/AndroidManifest.xml b/hostsidetests/net/app2/AndroidManifest.xml
index ad270b3..eb777f2 100644
--- a/hostsidetests/net/app2/AndroidManifest.xml
+++ b/hostsidetests/net/app2/AndroidManifest.xml
@@ -16,38 +16,43 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.net.hostside.app2" >
+ package="com.android.cts.net.hostside.app2">
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.INTERNET"/>
<!--
- This application is used to listen to RESTRICT_BACKGROUND_CHANGED intents and store
- them in a shared preferences which is then read by the test app. These broadcasts are
- handled by 2 listeners, one defined the manifest and another dynamically registered by
- a service.
+ This application is used to listen to RESTRICT_BACKGROUND_CHANGED intents and store
+ them in a shared preferences which is then read by the test app. These broadcasts are
+ handled by 2 listeners, one defined the manifest and another dynamically registered by
+ a service.
- The manifest-defined listener also handles ordered broadcasts used to share data with the
- test app.
+ The manifest-defined listener also handles ordered broadcasts used to share data with the
+ test app.
- This application also provides a service, RemoteSocketFactoryService, that the test app can
- use to open sockets to remote hosts as a different user ID.
- -->
+ This application also provides a service, RemoteSocketFactoryService, that the test app can
+ use to open sockets to remote hosts as a different user ID.
+ -->
<application android:usesCleartextTraffic="true">
- <activity android:name=".MyActivity" android:exported="true"/>
- <service android:name=".MyService" android:exported="true"/>
- <service android:name=".MyForegroundService" android:exported="true"/>
- <service android:name=".RemoteSocketFactoryService" android:exported="true"/>
+ <activity android:name=".MyActivity"
+ android:exported="true"/>
+ <service android:name=".MyService"
+ android:exported="true"/>
+ <service android:name=".MyForegroundService"
+ android:exported="true"/>
+ <service android:name=".RemoteSocketFactoryService"
+ android:exported="true"/>
- <receiver android:name=".MyBroadcastReceiver" >
+ <receiver android:name=".MyBroadcastReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.net.conn.RESTRICT_BACKGROUND_CHANGED" />
- <action android:name="com.android.cts.net.hostside.app2.action.GET_COUNTERS" />
- <action android:name="com.android.cts.net.hostside.app2.action.GET_RESTRICT_BACKGROUND_STATUS" />
- <action android:name="com.android.cts.net.hostside.app2.action.CHECK_NETWORK" />
- <action android:name="com.android.cts.net.hostside.app2.action.SEND_NOTIFICATION" />
- <action android:name="com.android.cts.net.hostside.app2.action.SHOW_TOAST" />
+ <action android:name="android.net.conn.RESTRICT_BACKGROUND_CHANGED"/>
+ <action android:name="com.android.cts.net.hostside.app2.action.GET_COUNTERS"/>
+ <action android:name="com.android.cts.net.hostside.app2.action.GET_RESTRICT_BACKGROUND_STATUS"/>
+ <action android:name="com.android.cts.net.hostside.app2.action.CHECK_NETWORK"/>
+ <action android:name="com.android.cts.net.hostside.app2.action.SEND_NOTIFICATION"/>
+ <action android:name="com.android.cts.net.hostside.app2.action.SHOW_TOAST"/>
</intent-filter>
</receiver>
</application>
diff --git a/hostsidetests/numberblocking/app/AndroidManifest.xml b/hostsidetests/numberblocking/app/AndroidManifest.xml
index 6ff2d9e..a327a34 100755
--- a/hostsidetests/numberblocking/app/AndroidManifest.xml
+++ b/hostsidetests/numberblocking/app/AndroidManifest.xml
@@ -15,27 +15,27 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.numberblocking.hostside">
+ package="com.android.cts.numberblocking.hostside">
<uses-permission android:name="android.permission.CALL_PHONE"/>
<uses-permission android:name="android.permission.READ_CALL_LOG"/>
<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name=".CallBlockingTest$DummyConnectionService"
- android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
+ android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.ConnectionService" />
+ <action android:name="android.telecom.ConnectionService"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.numberblocking.hostside"
- android:label="Number blocking CTS Tests"/>
+ android:targetPackage="com.android.cts.numberblocking.hostside"
+ android:label="Number blocking CTS Tests"/>
</manifest>
-
diff --git a/hostsidetests/os/src/android/os/cts/OsHostTests.java b/hostsidetests/os/src/android/os/cts/OsHostTests.java
index 8e3f5c5..4ce4d7b 100644
--- a/hostsidetests/os/src/android/os/cts/OsHostTests.java
+++ b/hostsidetests/os/src/android/os/cts/OsHostTests.java
@@ -154,14 +154,17 @@
// Clean slate in case of earlier aborted run
mDevice.uninstallPackage(HOST_VERIFICATION_PKG);
- String[] options = { AbiUtils.createAbiFlag(mAbi.getName()) };
+ final String[] options = { AbiUtils.createAbiFlag(mAbi.getName()) };
+ final int currentUser = mDevice.getCurrentUser();
mDevice.clearLogcat();
- String installResult = getDevice().installPackage(getTestAppFile(HOST_VERIFICATION_APK),
- false /* = reinstall? */, options);
+ final String errorString;
+ errorString = mDevice.installPackageForUser(getTestAppFile(HOST_VERIFICATION_APK),
+ false /* = reinstall? */, currentUser, options);
- assertNull("Couldn't install web intent filter sample apk", installResult);
+ assertNull("Couldn't install web intent filter sample apk in user " +
+ currentUser + " : " + errorString, errorString);
String logs = mDevice.executeAdbCommand("logcat", "-v", "brief", "-d");
boolean foundVerifierOutput = false;
diff --git a/hostsidetests/os/test-apps/HostLinkVerificationApp/AndroidManifest.xml b/hostsidetests/os/test-apps/HostLinkVerificationApp/AndroidManifest.xml
index 9480418..ace8c82 100644
--- a/hostsidetests/os/test-apps/HostLinkVerificationApp/AndroidManifest.xml
+++ b/hostsidetests/os/test-apps/HostLinkVerificationApp/AndroidManifest.xml
@@ -13,28 +13,41 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Declare the contents of this Android application. The namespace
attribute brings in the Android platform namespace, and the package
supplies a unique name for the application. When writing your
own application, the package name must be changed from "com.example.*"
to come from a domain that you own or have control over. -->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.openlinksskeleton"
- android:versionCode="1"
- android:versionName="1.0">
+ package="com.android.cts.openlinksskeleton"
+ android:versionCode="1"
+ android:versionName="1.0">
- <application android:label="Open Links Skeleton" android:hasCode="false" >
+ <application android:label="Open Links Skeleton"
+ android:hasCode="false">
- <activity android:name="DummyWebLinkActivity">
+ <activity android:name="DummyWebLinkActivity"
+ android:exported="true">
<intent-filter android:autoVerify="true">
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="http" />
- <data android:scheme="https" />
- <data android:host="explicit.example.com" />
- <data android:host="*.wildcard.tld" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="http"/>
+ <data android:scheme="https"/>
+ <data android:host="*.wildcard.tld"/>
+ </intent-filter>
+
+ <!-- Also make sure that verification picks up web navigation
+ handling even when the filter matches non-web schemes -->
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="http"/>
+ <data android:scheme="https"/>
+ <data android:scheme="nonweb"/>
+ <data android:host="explicit.example.com"/>
</intent-filter>
</activity>
diff --git a/hostsidetests/os/test-apps/InattentiveSleepTestApp/AndroidManifest.xml b/hostsidetests/os/test-apps/InattentiveSleepTestApp/AndroidManifest.xml
index 487b8cc..3588a14 100755
--- a/hostsidetests/os/test-apps/InattentiveSleepTestApp/AndroidManifest.xml
+++ b/hostsidetests/os/test-apps/InattentiveSleepTestApp/AndroidManifest.xml
@@ -16,10 +16,11 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.os.inattentivesleeptests"
- android:targetSandboxVersion="2">
+ package="android.os.inattentivesleeptests"
+ android:targetSandboxVersion="2">
<application>
- <activity android:name=".KeepScreenOnActivity">
+ <activity android:name=".KeepScreenOnActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/>
@@ -28,4 +29,3 @@
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/os/test-apps/PowerManagerTestApp/AndroidManifest.xml b/hostsidetests/os/test-apps/PowerManagerTestApp/AndroidManifest.xml
index 4fb0653..08e418f 100755
--- a/hostsidetests/os/test-apps/PowerManagerTestApp/AndroidManifest.xml
+++ b/hostsidetests/os/test-apps/PowerManagerTestApp/AndroidManifest.xml
@@ -16,11 +16,12 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.os.powermanagertests"
- android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.WAKE_LOCK" />
+ package="android.os.powermanagertests"
+ android:targetSandboxVersion="2">
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
<application>
- <activity android:name=".WakeLockTest">
+ <activity android:name=".WakeLockTest"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/>
@@ -29,4 +30,3 @@
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_helper.xml b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_helper.xml
index 1373430..9b1e295 100644
--- a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_helper.xml
+++ b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_helper.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
@@ -17,10 +16,11 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.dynamicmime.helper">
+ package="android.dynamicmime.helper">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.dynamicmime.common.activity.FirstActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.dynamicmime.common.activity.FirstActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.helper.FILTER_INFO_HOOK_group_first"/>
@@ -28,7 +28,8 @@
<data android:mimeGroup="group_first"/>
</intent-filter>
</activity>
- <activity android:name="android.dynamicmime.common.activity.SecondActivity">
+ <activity android:name="android.dynamicmime.common.activity.SecondActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.helper.FILTER_INFO_HOOK_group_second"/>
@@ -38,15 +39,14 @@
</activity>
<receiver android:name="android.dynamicmime.app.AppMimeGroupsReceiver"
- android:exported="true">
+ android:exported="true">
<intent-filter>
<action android:name="android.dynamicmime.UPDATE_MIME_GROUP_REQUEST"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.dynamicmime.helper" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.dynamicmime.helper">
</instrumentation>
</manifest>
diff --git a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_preferred.xml b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_preferred.xml
index 83cdf0e..4dfa7d1 100644
--- a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_preferred.xml
+++ b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_preferred.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
@@ -17,39 +16,60 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.dynamicmime.preferred">
+ package="android.dynamicmime.preferred">
<application android:testOnly="true"
- android:label="TestApp.Application">
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.dynamicmime.common.activity.FirstActivity">
+ android:label="TestApp.Application">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.dynamicmime.common.activity.FirstActivity"
+ android:exported="true">
<intent-filter android:label="TestApp.FirstActivity">
- <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.dynamicmime.preferred.TEST_ACTION"/>
<action android:name="android.dynamicmime.preferred.FILTER_INFO_HOOK_group_first"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:mimeGroup="group_first"/>
</intent-filter>
</activity>
- <activity android:name="android.dynamicmime.common.activity.TwoGroupsActivity">
+ <activity android:name="android.dynamicmime.common.activity.TwoGroupsActivity"
+ android:exported="true">
<intent-filter android:label="TestApp.TwoGroupsActivity">
- <action android:name="android.intent.action.SEND"/>
- <category android:name="android.intent.category.DEFAULT"/>
+ <action android:name="android.dynamicmime.preferred.TEST_ACTION"/>
<action android:name="android.dynamicmime.preferred.FILTER_INFO_HOOK_group_both"/>
+ <category android:name="android.intent.category.DEFAULT"/>
<data android:mimeGroup="group_third"/>
<data android:mimeGroup="group_second"/>
</intent-filter>
</activity>
+ <activity android:name="android.dynamicmime.common.activity.StaticActivity1"
+ android:exported="true">
+ <intent-filter android:label="StaticActivity1">
+ <action android:name="android.dynamicmime.preferred.TEST_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="text/plain"/>
+ <data android:mimeType="image/png"/>
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.dynamicmime.common.activity.StaticActivity2"
+ android:exported="true">
+ <intent-filter android:label="StaticActivity2">
+ <action android:name="android.dynamicmime.preferred.TEST_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="text/plain"/>
+ <data android:mimeType="image/png"/>
+ </intent-filter>
+ </activity>
+
<receiver android:name="android.dynamicmime.app.AppMimeGroupsReceiver"
- android:exported="true">
+ android:exported="true">
<intent-filter>
<action android:name="android.dynamicmime.UPDATE_MIME_GROUP_REQUEST"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.dynamicmime.preferred">
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.dynamicmime.preferred">
</instrumentation>
</manifest>
diff --git a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_bothGroups.xml b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_bothGroups.xml
index 802d13c..5241aa2 100644
--- a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_bothGroups.xml
+++ b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_bothGroups.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
@@ -17,10 +16,11 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.dynamicmime.update">
+ package="android.dynamicmime.update">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.dynamicmime.common.activity.FirstActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.dynamicmime.common.activity.FirstActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.update.FILTER_INFO_HOOK_group_first"/>
@@ -28,7 +28,8 @@
<data android:mimeGroup="group_first"/>
</intent-filter>
</activity>
- <activity android:name="android.dynamicmime.common.activity.SecondActivity">
+ <activity android:name="android.dynamicmime.common.activity.SecondActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.update.FILTER_INFO_HOOK_group_second"/>
@@ -38,15 +39,14 @@
</activity>
<receiver android:name="android.dynamicmime.app.AppMimeGroupsReceiver"
- android:exported="true">
+ android:exported="true">
<intent-filter>
<action android:name="android.dynamicmime.UPDATE_MIME_GROUP_REQUEST"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.dynamicmime.update" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.dynamicmime.update">
</instrumentation>
</manifest>
diff --git a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_firstGroup.xml b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_firstGroup.xml
index adc93cf..f9ddf44 100644
--- a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_firstGroup.xml
+++ b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_firstGroup.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
@@ -17,10 +16,11 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.dynamicmime.update">
+ package="android.dynamicmime.update">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.dynamicmime.common.activity.FirstActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.dynamicmime.common.activity.FirstActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.update.FILTER_INFO_HOOK_group_first"/>
@@ -28,7 +28,8 @@
<data android:mimeGroup="group_first"/>
</intent-filter>
</activity>
- <activity android:name="android.dynamicmime.common.activity.SecondActivity">
+ <activity android:name="android.dynamicmime.common.activity.SecondActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.update.FILTER_INFO_HOOK_group_second"/>
@@ -37,15 +38,14 @@
</activity>
<receiver android:name="android.dynamicmime.app.AppMimeGroupsReceiver"
- android:exported="true">
+ android:exported="true">
<intent-filter>
<action android:name="android.dynamicmime.UPDATE_MIME_GROUP_REQUEST"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.dynamicmime.update" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.dynamicmime.update">
</instrumentation>
</manifest>
diff --git a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_secondGroup.xml b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_secondGroup.xml
index e93a3d5..53e4273 100644
--- a/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_secondGroup.xml
+++ b/hostsidetests/packagemanager/dynamicmime/app/manifests/AndroidManifest_update_secondGroup.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
@@ -17,17 +16,19 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.dynamicmime.update">
+ package="android.dynamicmime.update">
<application android:testOnly="true">
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.dynamicmime.common.activity.FirstActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.dynamicmime.common.activity.FirstActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.update.FILTER_INFO_HOOK_group_first"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity android:name="android.dynamicmime.common.activity.SecondActivity">
+ <activity android:name="android.dynamicmime.common.activity.SecondActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.update.FILTER_INFO_HOOK_group_second"/>
@@ -37,15 +38,14 @@
</activity>
<receiver android:name="android.dynamicmime.app.AppMimeGroupsReceiver"
- android:exported="true">
+ android:exported="true">
<intent-filter>
<action android:name="android.dynamicmime.UPDATE_MIME_GROUP_REQUEST"/>
</intent-filter>
</receiver>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.dynamicmime.update" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.dynamicmime.update">
</instrumentation>
</manifest>
diff --git a/hostsidetests/packagemanager/dynamicmime/common/src/android/dynamicmime/common/activity/StaticActivity1.java b/hostsidetests/packagemanager/dynamicmime/common/src/android/dynamicmime/common/activity/StaticActivity1.java
new file mode 100644
index 0000000..a76f09e
--- /dev/null
+++ b/hostsidetests/packagemanager/dynamicmime/common/src/android/dynamicmime/common/activity/StaticActivity1.java
@@ -0,0 +1,27 @@
+/*
+ * 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.dynamicmime.common.activity;
+
+import android.app.Activity;
+
+/**
+ * Activity that has intent-filter to handle "text/plain" and "image/png" MIME types.
+ *
+ * Needed for {@link android.dynamicmime.testapp.preferred.PreferredActivitiesTest} to ensure that
+ * there is more than one activity, capable of handling certain MIME types.
+ */
+public class StaticActivity1 extends Activity {
+}
\ No newline at end of file
diff --git a/hostsidetests/packagemanager/dynamicmime/common/src/android/dynamicmime/common/activity/StaticActivity2.java b/hostsidetests/packagemanager/dynamicmime/common/src/android/dynamicmime/common/activity/StaticActivity2.java
new file mode 100644
index 0000000..ad536db
--- /dev/null
+++ b/hostsidetests/packagemanager/dynamicmime/common/src/android/dynamicmime/common/activity/StaticActivity2.java
@@ -0,0 +1,27 @@
+/*
+ * 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.dynamicmime.common.activity;
+
+import android.app.Activity;
+
+/**
+ * Activity that has intent-filter to handle "text/plain" and "image/png" MIME types.
+ *
+ * Needed for {@link android.dynamicmime.testapp.preferred.PreferredActivitiesTest} to ensure that
+ * there is more than one activity, capable of handling certain MIME types.
+ */
+public class StaticActivity2 extends Activity {
+}
\ No newline at end of file
diff --git a/hostsidetests/packagemanager/dynamicmime/test/AndroidManifest.xml b/hostsidetests/packagemanager/dynamicmime/test/AndroidManifest.xml
index d31dcf3..102a800 100644
--- a/hostsidetests/packagemanager/dynamicmime/test/AndroidManifest.xml
+++ b/hostsidetests/packagemanager/dynamicmime/test/AndroidManifest.xml
@@ -16,11 +16,12 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.dynamicmime.testapp">
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ package="android.dynamicmime.testapp">
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.dynamicmime.common.activity.FirstActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.dynamicmime.common.activity.FirstActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.testapp.FILTER_INFO_HOOK_group_first"/>
@@ -28,7 +29,8 @@
<data android:mimeGroup="group_first"/>
</intent-filter>
</activity>
- <activity android:name="android.dynamicmime.common.activity.SecondActivity">
+ <activity android:name="android.dynamicmime.common.activity.SecondActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<action android:name="android.dynamicmime.testapp.FILTER_INFO_HOOK_group_second"/>
@@ -37,7 +39,8 @@
</intent-filter>
</activity>
- <activity android:name="android.dynamicmime.common.activity.TwoGroupsActivity">
+ <activity android:name="android.dynamicmime.common.activity.TwoGroupsActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<category android:name="android.intent.category.DEFAULT"/>
@@ -47,7 +50,8 @@
</intent-filter>
</activity>
- <activity android:name="android.dynamicmime.common.activity.TwoGroupsAndTypeActivity">
+ <activity android:name="android.dynamicmime.common.activity.TwoGroupsAndTypeActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<category android:name="android.intent.category.DEFAULT"/>
@@ -59,8 +63,7 @@
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.dynamicmime.testapp">
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.dynamicmime.testapp">
</instrumentation>
</manifest>
diff --git a/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java b/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java
index c9e25b0..d37b0f5 100644
--- a/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java
+++ b/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java
@@ -54,11 +54,9 @@
@RunWith(AndroidJUnit4.class)
public class PreferredActivitiesTest extends BaseDynamicMimeTest {
- private static final String NAV_BAR_INTERACTION_MODE_RES_NAME = "config_navBarInteractionMode";
- private static final int NAV_BAR_INTERACTION_MODE_GESTURAL = 2;
+ private static final String ACTION = "android.dynamicmime.preferred.TEST_ACTION";
private static final BySelector BUTTON_ALWAYS = By.res("android:id/button_always");
- private static final BySelector RESOLVER_DIALOG = By.res("android:id/contentPanel");
private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(30L);
@@ -71,17 +69,6 @@
@Before
public void setUp() {
Utils.installApk(APK_PREFERRED_APP);
- assumeNavigationMode();
- }
-
- private void assumeNavigationMode() {
- Resources res = context().getResources();
- int navModeResId = res.getIdentifier(NAV_BAR_INTERACTION_MODE_RES_NAME, "integer",
- "android");
- int navMode = res.getInteger(navModeResId);
-
- assumeTrue("Non-gesture navigation mode required",
- navMode != NAV_BAR_INTERACTION_MODE_GESTURAL);
}
@After
@@ -288,10 +275,6 @@
}
private UiObject2 findActivityInDialog(String label) {
- getUiDevice()
- .wait(Until.findObject(RESOLVER_DIALOG), TIMEOUT)
- .swipe(Direction.UP, 1f);
-
return getUiDevice().findObject(By.text(label));
}
@@ -331,7 +314,7 @@
private static void sendIntent(String mimeType) {
Intent sendIntent = new Intent();
- sendIntent.setAction(Intent.ACTION_SEND);
+ sendIntent.setAction(ACTION);
sendIntent.setType(mimeType);
sendIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
targetContext().startActivity(sendIntent, null);
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp b/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
index 656938e..75d847f 100644
--- a/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
@@ -22,6 +22,7 @@
"-Wno-unused-parameter",
],
header_libs: ["jni_headers"],
+ shared_libs: ["liblog"],
sdk_version: "current",
}
@@ -46,7 +47,47 @@
}
android_test_helper_app {
- name: "CtsExtractNativeLibsAppTrue",
+ name: "CtsExtractNativeLibsAppTrue32",
+ defaults: ["cts_defaults"],
+ sdk_version: "current",
+ srcs: ["app_extract/src/**/*.java"],
+ manifest: "app_extract/AndroidManifest.xml",
+ test_suites: [
+ "cts",
+ "vts10",
+ "general-tests",
+ ],
+ jni_libs: [
+ "libtest_extract_native_libs",
+ ],
+ static_libs: ["androidx.test.rules"],
+ use_embedded_native_libs: false,
+ compile_multilib: "32",
+ v4_signature: true,
+}
+
+android_test_helper_app {
+ name: "CtsExtractNativeLibsAppTrue64",
+ defaults: ["cts_defaults"],
+ sdk_version: "current",
+ srcs: ["app_extract/src/**/*.java"],
+ manifest: "app_extract/AndroidManifest.xml",
+ test_suites: [
+ "cts",
+ "vts10",
+ "general-tests",
+ ],
+ jni_libs: [
+ "libtest_extract_native_libs",
+ ],
+ static_libs: ["androidx.test.rules"],
+ use_embedded_native_libs: false,
+ compile_multilib: "64",
+ v4_signature: true,
+}
+
+android_test_helper_app {
+ name: "CtsExtractNativeLibsAppTrueBoth",
defaults: ["cts_defaults"],
sdk_version: "current",
srcs: ["app_extract/src/**/*.java"],
@@ -64,4 +105,3 @@
compile_multilib: "both",
v4_signature: true,
}
-
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/AndroidManifest.xml b/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/AndroidManifest.xml
index 27214b8..a82412a 100644
--- a/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/AndroidManifest.xml
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/AndroidManifest.xml
@@ -15,13 +15,23 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.extractnativelibs.app.extract" >
- <application android:extractNativeLibs="true" >
- <uses-library android:name="android.test.runner" />
+ package="com.android.cts.extractnativelibs.app.extract">
+ <application android:extractNativeLibs="true">
+ <uses-library android:name="android.test.runner"/>
+ <!-- starting activity as a separate process, otherwise it'll always be 64-bit -->
+ <activity android:name=".MainActivity"
+ android:exported="true"
+ android:process=":NewProcess">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ </activity>
</application>
<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.extractnativelibs.app.extract" />
+ android:targetPackage="com.android.cts.extractnativelibs.app.extract"/>
</manifest>
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/src/com/android/cts/extractnativelibs/app/extract/ExtractNativeLibsTrueDeviceTest.java b/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/src/com/android/cts/extractnativelibs/app/extract/ExtractNativeLibsTrueDeviceTest.java
index 28367b2..65fe916 100644
--- a/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/src/com/android/cts/extractnativelibs/app/extract/ExtractNativeLibsTrueDeviceTest.java
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/src/com/android/cts/extractnativelibs/app/extract/ExtractNativeLibsTrueDeviceTest.java
@@ -16,6 +16,11 @@
package com.android.cts.extractnativelibs.app.extract;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
@@ -24,17 +29,51 @@
import org.junit.runner.RunWith;
import java.io.File;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
/** Device test for extractNativeLibs=true */
@RunWith(AndroidJUnit4.class)
public class ExtractNativeLibsTrueDeviceTest {
+ private final Context mContext = InstrumentationRegistry.getContext();
/** Test that the native lib dir exists and has an native lib file extracted in it. */
@Test
- public void testNativeLibsExtracted() throws Exception {
- File nativeLibDir = new File(
- InstrumentationRegistry.getContext().getApplicationInfo().nativeLibraryDir);
+ public void testNativeLibsExtracted() {
+ final String expectedSubDirArg = "expectedSubDir";
+ String expectedSubDir = InstrumentationRegistry.getArguments()
+ .getString(expectedSubDirArg);
+ Assert.assertNotNull(expectedSubDir);
+ File nativeLibDir = new File(mContext.getApplicationInfo().nativeLibraryDir);
+ Assert.assertTrue(nativeLibDir.exists());
Assert.assertTrue(nativeLibDir.isDirectory());
+ Assert.assertTrue(nativeLibDir.getAbsolutePath().endsWith(expectedSubDir));
Assert.assertEquals(1, nativeLibDir.list().length);
}
+
+ /** Test that the native lib is loaded when the activity is launched. */
+ @Test
+ public void testNativeLibsLoaded() throws Exception {
+ final CountDownLatch loaded = new CountDownLatch(1);
+ IntentFilter filter = new IntentFilter(mContext.getPackageName() + ".NativeLibLoaded");
+ BroadcastReceiver receiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ loaded.countDown();
+ }
+ };
+ mContext.registerReceiver(receiver, filter);
+ launchActivity();
+ Assert.assertTrue("Native lib not loaded", loaded.await(
+ 30, TimeUnit.SECONDS));
+ }
+
+ private void launchActivity() {
+ Intent launchIntent = mContext.getPackageManager().getLaunchIntentForPackage(
+ mContext.getPackageName());
+ Assert.assertNotNull(launchIntent);
+ if (launchIntent != null) {
+ mContext.startActivity(launchIntent);
+ }
+ }
}
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/src/com/android/cts/extractnativelibs/app/extract/MainActivity.java b/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/src/com/android/cts/extractnativelibs/app/extract/MainActivity.java
new file mode 100644
index 0000000..fbcc783
--- /dev/null
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/app_extract/src/com/android/cts/extractnativelibs/app/extract/MainActivity.java
@@ -0,0 +1,38 @@
+/*
+ * 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 com.android.cts.extractnativelibs.app.extract;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * Launch activity for test app
+ */
+public class MainActivity extends Activity {
+ static {
+ System.loadLibrary("test_extract_native_libs");
+ }
+
+ @Override
+ public void onCreate(Bundle savedOnstanceState) {
+ // The native lib should have been loaded already
+ Intent intent = new Intent(
+ getApplicationContext().getPackageName() + ".NativeLibLoaded");
+ sendBroadcast(intent);
+ }
+}
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/AndroidManifest.xml b/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/AndroidManifest.xml
index ee1f8f5..d5d1e04 100644
--- a/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/AndroidManifest.xml
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/AndroidManifest.xml
@@ -15,12 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.extractnativelibs.app.noextract" >
- <application android:extractNativeLibs="false" >
- <uses-library android:name="android.test.runner" />
+ package="com.android.cts.extractnativelibs.app.noextract">
+ <application android:extractNativeLibs="false">
+ <uses-library android:name="android.test.runner"/>
+ <!-- starting activity as a separate process, otherwise it'll always be 64-bit -->
+ <activity android:name=".MainActivity"
+ android:exported="true"
+ android:process=":NewProcess">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ </activity>
</application>
<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.extractnativelibs.app.noextract" />
+ android:targetPackage="com.android.cts.extractnativelibs.app.noextract"/>
</manifest>
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/src/com/android/cts/extractnativelibs/app/noextract/ExtractNativeLibsFalseDeviceTest.java b/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/src/com/android/cts/extractnativelibs/app/noextract/ExtractNativeLibsFalseDeviceTest.java
index a02c327..07be180 100644
--- a/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/src/com/android/cts/extractnativelibs/app/noextract/ExtractNativeLibsFalseDeviceTest.java
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/src/com/android/cts/extractnativelibs/app/noextract/ExtractNativeLibsFalseDeviceTest.java
@@ -16,6 +16,11 @@
package com.android.cts.extractnativelibs.app.noextract;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
@@ -24,17 +29,46 @@
import org.junit.runner.RunWith;
import java.io.File;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
/** Device test for extractNativeLibs=false */
@RunWith(AndroidJUnit4.class)
public class ExtractNativeLibsFalseDeviceTest {
+ private final Context mContext = InstrumentationRegistry.getContext();
/** Test that the native lib dir exists but has no native lib file in it. */
@Test
- public void testNativeLibsNotExtracted() throws Exception {
+ public void testNativeLibsNotExtracted() {
File nativeLibDir = new File(
InstrumentationRegistry.getContext().getApplicationInfo().nativeLibraryDir);
Assert.assertTrue(nativeLibDir.isDirectory());
Assert.assertEquals(0, nativeLibDir.list().length);
}
+
+ /** Test that the native lib is loaded when the activity is launched. */
+ @Test
+ public void testNativeLibsLoaded() throws Exception {
+ final CountDownLatch loaded = new CountDownLatch(1);
+ IntentFilter filter = new IntentFilter(mContext.getPackageName() + ".NativeLibLoaded");
+ BroadcastReceiver receiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ loaded.countDown();
+ }
+ };
+ mContext.registerReceiver(receiver, filter);
+ launchActivity();
+ Assert.assertTrue("Native lib not loaded", loaded.await(
+ 30, TimeUnit.SECONDS));
+ }
+
+ private void launchActivity() {
+ Intent launchIntent = mContext.getPackageManager().getLaunchIntentForPackage(
+ mContext.getPackageName());
+ Assert.assertNotNull(launchIntent);
+ if (launchIntent != null) {
+ mContext.startActivity(launchIntent);
+ }
+ }
}
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/src/com/android/cts/extractnativelibs/app/noextract/MainActivity.java b/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/src/com/android/cts/extractnativelibs/app/noextract/MainActivity.java
new file mode 100644
index 0000000..9200260
--- /dev/null
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/app_no_extract/src/com/android/cts/extractnativelibs/app/noextract/MainActivity.java
@@ -0,0 +1,38 @@
+/*
+ * 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 com.android.cts.extractnativelibs.app.noextract;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * Launch activity for test app
+ */
+public class MainActivity extends Activity {
+ static {
+ System.loadLibrary("test_extract_native_libs");
+ }
+
+ @Override
+ public void onCreate(Bundle savedOnstanceState) {
+ // The native lib should have been loaded already
+ Intent intent = new Intent(
+ getApplicationContext().getPackageName() + ".NativeLibLoaded");
+ sendBroadcast(intent);
+ }
+}
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/jni/native.cpp b/hostsidetests/packagemanager/extractnativelibs/apps/jni/native.cpp
index 52876f5..f925c5856 100644
--- a/hostsidetests/packagemanager/extractnativelibs/apps/jni/native.cpp
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/jni/native.cpp
@@ -16,10 +16,14 @@
#include <jni.h>
+#include <android/log.h>
+#define LOG(...) __android_log_write(ANDROID_LOG_INFO, "NativeLibOutput", __VA_ARGS__)
+
jint JNI_OnLoad(JavaVM *vm, void *reserved) {
JNIEnv* env = nullptr;
if (vm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK) {
return JNI_ERR;
}
+ LOG("libtest_extract_native_libs is loaded");
return JNI_VERSION_1_6;
}
diff --git a/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestBase.java b/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestBase.java
index 9d9aa3b1..8f80c1a 100644
--- a/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestBase.java
+++ b/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestBase.java
@@ -15,7 +15,12 @@
*/
package android.extractnativelibs.cts;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.targetprep.BuildError;
+import com.android.tradefed.targetprep.TargetSetupError;
+import com.android.tradefed.targetprep.suite.SuiteApkInstaller;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+import com.android.tradefed.util.AbiUtils;
import com.android.tradefed.util.FileUtil;
import org.junit.After;
@@ -26,6 +31,8 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
/**
* TODO(b/147496159): add more tests.
@@ -47,15 +54,20 @@
static final String TEST_EXTRACT_CLASS =
TEST_EXTRACT_PKG + ".ExtractNativeLibsTrueDeviceTest";
static final String TEST_EXTRACT_TEST = "testNativeLibsExtracted";
- static final String TEST_EXTRACT_APK = "CtsExtractNativeLibsAppTrue.apk";
+ static final String TEST_EXTRACT_APK32 = "CtsExtractNativeLibsAppTrue32.apk";
+ static final String TEST_EXTRACT_APK64 = "CtsExtractNativeLibsAppTrue64.apk";
+ static final String TEST_EXTRACT_APK_BOTH = "CtsExtractNativeLibsAppTrueBoth.apk";
static final String TEST_NO_EXTRACT_MISALIGNED_APK =
"CtsExtractNativeLibsAppFalseWithMisalignedLib.apk";
+ static final String TEST_NATIVE_LIB_LOADED_TEST = "testNativeLibsLoaded";
+
/** Setup test dir. */
@Before
public void setUp() throws Exception {
getDevice().executeShellCommand("mkdir " + TEST_REMOTE_DIR);
}
+
/** Uninstall apps after tests. */
@After
public void cleanUp() throws Exception {
@@ -64,8 +76,7 @@
getDevice().executeShellCommand("rm -r " + TEST_REMOTE_DIR);
}
- File getFileFromResource(String filenameInResources)
- throws Exception {
+ File getFileFromResource(String filenameInResources) throws Exception {
String fullResourceName = TEST_APK_RESOURCE_PREFIX + filenameInResources;
File tempDir = FileUtil.createTempDir(TEST_HOST_TMP_DIR_PREFIX);
File file = new File(tempDir, filenameInResources);
@@ -83,4 +94,33 @@
return file;
}
+ private boolean runDeviceTestsWithArgs(String pkgName, String testClassName,
+ String testMethodName, Map<String, String> testArgs) throws Exception {
+ final String testRunner = "androidx.test.runner.AndroidJUnitRunner";
+ final long defaultTestTimeoutMs = 60 * 1000L;
+ final long defaultMaxTimeoutToOutputMs = 60 * 1000L; // 1min
+ return runDeviceTests(getDevice(), testRunner, pkgName, testClassName, testMethodName,
+ null, defaultTestTimeoutMs, defaultMaxTimeoutToOutputMs,
+ 0L, true, false, testArgs);
+ }
+
+ final void installPackage(String apkFileName)
+ throws DeviceNotAvailableException, TargetSetupError {
+ SuiteApkInstaller installer = new SuiteApkInstaller();
+ installer.addTestFileName(apkFileName);
+ try {
+ installer.setUp(getTestInformation());
+ } catch (BuildError e) {
+ throw new TargetSetupError(e.getMessage(), e, getDevice().getDeviceDescriptor());
+ }
+ }
+
+ final boolean checkExtractedNativeLibDirForAbi(String abi) throws Exception {
+ final String expectedSubDirArg = "expectedSubDir";
+ final String expectedNativeLibSubDir = AbiUtils.getArchForAbi(abi);
+ final Map<String, String> testArgs = new HashMap<>();
+ testArgs.put(expectedSubDirArg, expectedNativeLibSubDir);
+ return runDeviceTestsWithArgs(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS, TEST_EXTRACT_TEST,
+ testArgs);
+ }
}
diff --git a/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestIncremental.java b/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestIncremental.java
index 1fcf345..e27076c 100644
--- a/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestIncremental.java
+++ b/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestIncremental.java
@@ -25,6 +25,7 @@
import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.util.AbiUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -48,28 +49,131 @@
private boolean isIncrementalInstallSupported() throws Exception {
return getDevice().hasFeature("android.software.incremental_delivery");
}
+
/** Test with a app that has extractNativeLibs=false using Incremental install. */
@Test
@AppModeFull
public void testNoExtractNativeLibsIncremental() throws Exception {
installPackageIncremental(TEST_NO_EXTRACT_APK);
assertTrue(isPackageInstalled(TEST_NO_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_NO_EXTRACT_PKG, TEST_NO_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
assertTrue(runDeviceTests(
TEST_NO_EXTRACT_PKG, TEST_NO_EXTRACT_CLASS, TEST_NO_EXTRACT_TEST));
}
- /** Test with a app that has extractNativeLibs=true using Incremental install. */
+ /** Test with a 32-bit app that has extractNativeLibs=true using Incremental install. */
@Test
@AppModeFull
- public void testExtractNativeLibsIncremental() throws Exception {
- installPackageIncremental(TEST_EXTRACT_APK);
+ public void testExtractNativeLibsIncremental32() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK32);
assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
- assertTrue(runDeviceTests(
- TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS, TEST_EXTRACT_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_V7A));
}
- /** Test with a app that has extractNativeLibs=false but with mis-aligned lib files,
- * using Incremental install. */
+ /** Test with a 64-bit app that has extractNativeLibs=true using Incremental install. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsIncremental64() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app that has extractNativeLibs=true for both 32-bit and 64-bit native libs. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsIncrementalBoth() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ // Lib will only be extracted to arm64 if 64-bit is supported
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app upgrade from 32-bit to 64-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsIncrementalFor32To64Upgrade() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK32);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackageIncremental(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app upgrade from 64-bit to 32-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsIncrementalFor64To32Upgrade() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackageIncremental(TEST_EXTRACT_APK32);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_V7A));
+ }
+
+ /** Test with a app upgrade from both 32 and 64-bit to only 64-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsIncrementalForBothTo64Upgrade() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackageIncremental(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app upgrade from both 32 and 64-bit to only 32-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsIncrementalForBothTo32Upgrade() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackageIncremental(TEST_EXTRACT_APK32);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_V7A));
+ }
+
+ /** Test with a app upgrade from 32-bit to both 32-bit and 64-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsIncrementalFor32ToBothUpgrade() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK32);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackageIncremental(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app upgrade from 64-bit to both 32-bit and 64-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsIncrementalFor64ToBothUpgrade() throws Exception {
+ installPackageIncremental(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackageIncremental(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /**
+ * Test with a app that has extractNativeLibs=false but with mis-aligned lib files,
+ * using Incremental install.
+ */
@Test
@AppModeFull
public void testExtractNativeLibsIncrementalFails() throws Exception {
diff --git a/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestLegacy.java b/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestLegacy.java
index ff58ee6..883716d 100644
--- a/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestLegacy.java
+++ b/hostsidetests/packagemanager/extractnativelibs/src/android/extractnativelibs/cts/CtsExtractNativeLibsHostTestLegacy.java
@@ -22,6 +22,7 @@
import android.platform.test.annotations.AppModeFull;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.util.AbiUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,18 +40,122 @@
public void testNoExtractNativeLibsLegacy() throws Exception {
installPackage(TEST_NO_EXTRACT_APK);
assertTrue(isPackageInstalled(TEST_NO_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_NO_EXTRACT_PKG, TEST_NO_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
assertTrue(runDeviceTests(
TEST_NO_EXTRACT_PKG, TEST_NO_EXTRACT_CLASS, TEST_NO_EXTRACT_TEST));
}
- /** Test with a app that has extractNativeLibs=true. */
+ /** Test with a app that has extractNativeLibs=true for 32-bit native libs. */
@Test
@AppModeFull
- public void testExtractNativeLibsLegacy() throws Exception {
- installPackage(TEST_EXTRACT_APK);
+ public void testExtractNativeLibsLegacy32() throws Exception {
+ installPackage(TEST_EXTRACT_APK32);
assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
- assertTrue(runDeviceTests(
- TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS, TEST_EXTRACT_TEST));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_V7A));
+ }
+
+ /** Test with a app that has extractNativeLibs=true for 64-bit native libs. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsLegacy64() throws Exception {
+ installPackage(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app that has extractNativeLibs=true for both 32-bit and 64-bit native libs. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsLegacyBoth() throws Exception {
+ installPackage(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ // Lib will only be extracted to arm64 if 64-bit is supported
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app upgrade from 32-bit to 64-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsLegacyFor32To64Upgrade() throws Exception {
+ installPackage(TEST_EXTRACT_APK32);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackage(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app upgrade from 64-bit to 32-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsLegacyFor64To32Upgrade() throws Exception {
+ installPackage(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackage(TEST_EXTRACT_APK32);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_V7A));
+ }
+
+ /** Test with a app upgrade from both 32 and 64-bit to only 64-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsLegacyForBothTo64Upgrade() throws Exception {
+ installPackage(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackage(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app upgrade from both 32 and 64-bit to only 32-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsLegacyForBothTo32Upgrade() throws Exception {
+ installPackage(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackage(TEST_EXTRACT_APK32);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_V7A));
+ }
+
+ /** Test with a app upgrade from 32-bit to both 32-bit and 64-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsLegacyFor32ToBothUpgrade() throws Exception {
+ installPackage(TEST_EXTRACT_APK32);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackage(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
+ }
+
+ /** Test with a app upgrade from 64-bit to both 32-bit and 64-bit. */
+ @Test
+ @AppModeFull
+ public void testExtractNativeLibsLegacyFor64ToBothUpgrade() throws Exception {
+ installPackage(TEST_EXTRACT_APK64);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ installPackage(TEST_EXTRACT_APK_BOTH);
+ assertTrue(isPackageInstalled(TEST_EXTRACT_PKG));
+ assertTrue(runDeviceTests(TEST_EXTRACT_PKG, TEST_EXTRACT_CLASS,
+ TEST_NATIVE_LIB_LOADED_TEST));
+ assertTrue(checkExtractedNativeLibDirForAbi(AbiUtils.ABI_ARM_64_V8A));
}
/** Test with a app that has extractNativeLibs=false but with mis-aligned lib files */
diff --git a/hostsidetests/packagemanager/multiuser/Android.bp b/hostsidetests/packagemanager/multiuser/Android.bp
new file mode 100644
index 0000000..a6ae68a
--- /dev/null
+++ b/hostsidetests/packagemanager/multiuser/Android.bp
@@ -0,0 +1,29 @@
+// 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.
+
+java_test_host {
+ name: "CtsPackageManagerMultiUserHostTestCases",
+ defaults: ["cts_defaults"],
+ srcs: ["src/**/*.java"],
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "general-tests",
+ ],
+ libs: [
+ "cts-tradefed",
+ "tradefed",
+ "compatibility-host-util",
+ ],
+}
diff --git a/hostsidetests/packagemanager/multiuser/AndroidTest.xml b/hostsidetests/packagemanager/multiuser/AndroidTest.xml
new file mode 100644
index 0000000..0135fc4
--- /dev/null
+++ b/hostsidetests/packagemanager/multiuser/AndroidTest.xml
@@ -0,0 +1,34 @@
+<?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.
+ -->
+<configuration description="Config for CTS package manager multi-user host test cases">
+ <option name="test-suite-tag" value="cts" />
+ <option name="config-descriptor:metadata" key="component" value="framework" />
+ <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+ <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+ <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="CtsEmptyTestApp.apk" />
+ <option name="test-file-name" value="CtsPackageManagerMultiUserTestApp.apk" />
+ </target_preparer>
+
+ <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+ <option name="jar" value="CtsPackageManagerMultiUserHostTestCases.jar" />
+ </test>
+</configuration>
+
diff --git a/hostsidetests/packagemanager/multiuser/app/Android.bp b/hostsidetests/packagemanager/multiuser/app/Android.bp
new file mode 100644
index 0000000..5e955e5
--- /dev/null
+++ b/hostsidetests/packagemanager/multiuser/app/Android.bp
@@ -0,0 +1,29 @@
+// 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_helper_app {
+ name: "CtsPackageManagerMultiUserTestApp",
+ defaults: ["cts_defaults"],
+ sdk_version: "current",
+ srcs: ["src/**/*.java",],
+ test_suites: [
+ "cts",
+ "vts",
+ "vts10",
+ "general-tests",
+ ],
+ static_libs: ["androidx.test.rules"],
+ compile_multilib: "both",
+}
diff --git a/hostsidetests/packagemanager/multiuser/app/AndroidManifest.xml b/hostsidetests/packagemanager/multiuser/app/AndroidManifest.xml
new file mode 100644
index 0000000..5fae893
--- /dev/null
+++ b/hostsidetests/packagemanager/multiuser/app/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?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="com.android.tests.packagemanager.multiuser.app" >
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <instrumentation
+ android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.tests.packagemanager.multiuser.app" />
+</manifest>
diff --git a/hostsidetests/packagemanager/multiuser/app/src/com/android/tests/packagemanager/multiuser/app/PackageManagerMultiUserTest.java b/hostsidetests/packagemanager/multiuser/app/src/com/android/tests/packagemanager/multiuser/app/PackageManagerMultiUserTest.java
new file mode 100644
index 0000000..80116e0
--- /dev/null
+++ b/hostsidetests/packagemanager/multiuser/app/src/com/android/tests/packagemanager/multiuser/app/PackageManagerMultiUserTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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 com.android.tests.packagemanager.multiuser.app;
+
+import static org.junit.Assert.assertTrue;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageInstaller;
+import android.content.pm.PackageManager;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class PackageManagerMultiUserTest {
+ private static final String ARG_PACKAGE_NAME = "pkgName";
+
+ @After
+ public void tearDown() throws Exception {
+ InstrumentationRegistry.getInstrumentation().getUiAutomation()
+ .dropShellPermissionIdentity();
+ }
+
+ @Test
+ public void testUninstallExistingPackage() throws Exception {
+ InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+ Manifest.permission.DELETE_PACKAGES);
+ String pkgName = InstrumentationRegistry.getArguments().getString(ARG_PACKAGE_NAME);
+ Context context = InstrumentationRegistry.getInstrumentation().getContext();
+ PackageManager packageManager = context.getPackageManager();
+ PackageInstaller packageInstaller = packageManager.getPackageInstaller();
+
+ packageInstaller.uninstallExistingPackage(pkgName, null);
+ }
+}
diff --git a/hostsidetests/packagemanager/multiuser/src/com/android/tests/packagemanager/multiuser/host/PackageManagerMultiUserTestBase.java b/hostsidetests/packagemanager/multiuser/src/com/android/tests/packagemanager/multiuser/host/PackageManagerMultiUserTestBase.java
new file mode 100644
index 0000000..af82685
--- /dev/null
+++ b/hostsidetests/packagemanager/multiuser/src/com/android/tests/packagemanager/multiuser/host/PackageManagerMultiUserTestBase.java
@@ -0,0 +1,129 @@
+/*
+ * 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 com.android.tests.packagemanager.multiuser.host;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.After;
+import org.junit.Before;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+public class PackageManagerMultiUserTestBase extends BaseHostJUnit4Test {
+ private static final String RUNNER = "androidx.test.runner.AndroidJUnitRunner";
+ private static final String TEST_PACKAGE = "com.android.tests.packagemanager.multiuser.app";
+ private static final String TEST_CLASS = ".PackageManagerMultiUserTest";
+ private static final long DEFAULT_TIMEOUT = 10 * 60 * 1000L;
+
+ private List<Integer> mCreatedUsers;
+ protected int mUserId;
+
+ @Before
+ public void setUp() throws Exception {
+ assumeTrue("Device does not support multiple users",
+ getDevice().getMaxNumberOfUsersSupported() > 1);
+ mUserId = getDevice().getPrimaryUserId();
+ mCreatedUsers = new ArrayList<>();
+ }
+
+ /** Remove created users after tests. */
+ @After
+ public void tearDown() throws Exception {
+ for (int userId : mCreatedUsers) {
+ removeUser(userId);
+ }
+ }
+
+ protected void runDeviceTestAsUser(
+ String pkgName, @Nullable String testClassName,
+ @Nullable String testMethodName, int userId,
+ Map<String, String> params) throws DeviceNotAvailableException {
+ if (testClassName != null && testClassName.startsWith(".")) {
+ testClassName = pkgName + testClassName;
+ }
+
+ runDeviceTests(
+ getDevice(),
+ RUNNER,
+ pkgName,
+ testClassName,
+ testMethodName,
+ userId,
+ DEFAULT_TIMEOUT,
+ DEFAULT_TIMEOUT,
+ 0L /* maxInstrumentationTimeoutMs */,
+ true /* checkResults */,
+ false /* isHiddenApiCheckDisabled */,
+ params == null ? Collections.emptyMap() : params);
+ }
+
+ protected void runDeviceTestAsUser(String testMethodName, int userId,
+ Map<String, String> params)
+ throws DeviceNotAvailableException {
+ runDeviceTestAsUser(TEST_PACKAGE, TEST_CLASS, testMethodName, userId, params);
+ }
+
+ protected int createUser() throws Exception {
+ String command = "pm create-user TestUser_" + System.currentTimeMillis();
+ LogUtil.CLog.d("Starting command " + command);
+ String commandOutput = getDevice().executeShellCommand(command);
+ LogUtil.CLog.d("Output for command " + command + ": " + commandOutput);
+
+ // Extract the id of the new user.
+ String[] tokens = commandOutput.split("\\s+");
+ assertTrue(tokens.length > 0);
+ assertEquals("Success:", tokens[0]);
+ int userId = Integer.parseInt(tokens[tokens.length - 1]);
+ mCreatedUsers.add(userId);
+
+ setupUser(userId);
+ return userId;
+ }
+
+ protected void setupUser(int userId) throws Exception {
+ installExistingPackageForUser(TEST_PACKAGE, userId);
+ }
+
+ protected void removeUser(int userId) throws Exception {
+ String command = "pm remove-user " + userId;
+ LogUtil.CLog.d("Starting command " + command);
+ String commandOutput = getDevice().executeShellCommand(command);
+ LogUtil.CLog.d("Output for command " + command + ": " + commandOutput);
+ }
+
+ protected void installExistingPackageForUser(String pkgName, int userId) throws Exception {
+ String command = "pm install-existing --user " + userId + " " + pkgName;
+ LogUtil.CLog.d("Starting command " + command);
+ String commandOutput = getDevice().executeShellCommand(command);
+ LogUtil.CLog.d("Output for command " + command + ": " + commandOutput);
+ }
+
+ protected boolean isPackageInstalledForUser(String pkgName, int userId) throws Exception {
+ return getDevice().isPackageInstalled(pkgName, String.valueOf(userId));
+ }
+}
diff --git a/hostsidetests/packagemanager/multiuser/src/com/android/tests/packagemanager/multiuser/host/UninstallExistingPackageTest.java b/hostsidetests/packagemanager/multiuser/src/com/android/tests/packagemanager/multiuser/host/UninstallExistingPackageTest.java
new file mode 100644
index 0000000..997b3ed
--- /dev/null
+++ b/hostsidetests/packagemanager/multiuser/src/com/android/tests/packagemanager/multiuser/host/UninstallExistingPackageTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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 com.android.tests.packagemanager.multiuser.host;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.platform.test.annotations.AppModeFull;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collections;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class UninstallExistingPackageTest extends PackageManagerMultiUserTestBase {
+ private static final String EMPTY_TEST_APP_APK = "CtsEmptyTestApp.apk";
+ private static final String EMPTY_TEST_APP_PKG = "android.packageinstaller.emptytestapp.cts";
+ private static final String ARG_PACKAGE_NAME = "pkgName";
+
+ @Before
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ installPackage(EMPTY_TEST_APP_APK);
+ assertTrue(isPackageInstalled(EMPTY_TEST_APP_PKG));
+ }
+
+ /** Uninstall app after tests. */
+ @After
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ uninstallPackage(getDevice(), EMPTY_TEST_APP_PKG);
+ }
+
+ @Test
+ @AppModeFull
+ public void testUninstallExistingPackage_succeedsIfInstalledInAnotherUser() throws Exception {
+ // create a user
+ int newUserId = createUser();
+
+ // install empty test app for both users
+ installExistingPackageForUser(EMPTY_TEST_APP_PKG, newUserId);
+ assertTrue("Package is not installed for user " + mUserId,
+ isPackageInstalledForUser(EMPTY_TEST_APP_PKG, mUserId));
+ assertTrue("Package is not installed for user " + newUserId,
+ isPackageInstalledForUser(EMPTY_TEST_APP_PKG, newUserId));
+
+ // run uninstallExistingPackage from mUserId, expect package is uninstalled
+ runDeviceTestAsUser("testUninstallExistingPackage", mUserId,
+ Collections.singletonMap(ARG_PACKAGE_NAME, EMPTY_TEST_APP_PKG));
+ assertFalse(isPackageInstalledForUser(EMPTY_TEST_APP_PKG, mUserId));
+ assertTrue(isPackageInstalledForUser(EMPTY_TEST_APP_PKG, newUserId));
+ }
+
+ @Test
+ @AppModeFull
+ public void testUninstallExistingPackage_failsIfInstalledInOnlyOneUser() throws Exception {
+ // create a user
+ int newUserId = createUser();
+
+ // assert package is only installed for mUserId
+ assertTrue(isPackageInstalledForUser(EMPTY_TEST_APP_PKG, mUserId));
+ assertFalse(isPackageInstalledForUser(EMPTY_TEST_APP_PKG, newUserId));
+
+ // run uninstallExistingPackage from mUserId, expect package is not uninstalled
+ runDeviceTestAsUser("testUninstallExistingPackage", mUserId,
+ Collections.singletonMap(ARG_PACKAGE_NAME, EMPTY_TEST_APP_PKG));
+ assertTrue(isPackageInstalledForUser(EMPTY_TEST_APP_PKG, mUserId));
+ }
+}
diff --git a/hostsidetests/rollback/Android.bp b/hostsidetests/rollback/Android.bp
index 7b02704..d88b3fa 100644
--- a/hostsidetests/rollback/Android.bp
+++ b/hostsidetests/rollback/Android.bp
@@ -16,7 +16,7 @@
name: "CtsRollbackManagerHostTestCases",
defaults: ["cts_defaults"],
srcs: ["src/**/*.java"],
- libs: ["cts-tradefed", "tradefed", "truth-prebuilt"],
+ libs: ["cts-tradefed", "cts-shim-host-lib", "tradefed", "truth-prebuilt"],
data: [":CtsRollbackManagerHostTestHelperApp", ":CtsRollbackManagerHostTestHelperApp2"],
test_suites: ["cts", "general-tests"],
}
diff --git a/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java b/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
index ac3f8d5..129ffb6 100644
--- a/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
+++ b/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
@@ -16,6 +16,9 @@
package com.android.cts.rollback.host.app;
+import static com.android.cts.shim.lib.ShimPackage.PRIVILEGED_SHIM_PACKAGE_NAME;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_PACKAGE_NAME;
import static com.android.cts.rollback.lib.RollbackInfoSubject.assertThat;
import static com.google.common.truth.Truth.assertThat;
@@ -56,10 +59,8 @@
private static final String TAG = "RollbackTest";
private static final TestApp Apex2SignedBobRotRollback = new TestApp(
- "Apex2SignedBobRotRollback", TestApp.Apex, 2, /*isApex*/true,
+ "Apex2SignedBobRotRollback", SHIM_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex");
- private static final String ApkInShimApexPackageName = "com.android.cts.ctsshim";
- private static final String PrivApkInShimApexPackageName = "com.android.cts.priv.ctsshim";
private static final String APK_VERSION_FILENAME = "ctsrollback_apkversion";
private static final String APK_VERSION_SEPARATOR = ",";
@@ -314,7 +315,7 @@
*/
@Test
public void testApexOnlyStagedRollback_Phase1() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
Install.single(TestApp.Apex2).setStaged().commit();
}
@@ -324,7 +325,7 @@
*/
@Test
public void testApexOnlyStagedRollback_Phase2() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
// keep the versions of the apks in shim apex for verifying in phase3
recordApkInApexVersion();
@@ -338,20 +339,20 @@
*/
@Test
public void testApexOnlyStagedRollback_Phase3() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
long[] versions = retrieveApkInApexVersion();
final long apkInShimApexVersion = versions[0];
final long privApkInShimApexVersion = versions[1];
- RollbackInfo available = RollbackUtils.getAvailableRollback(TestApp.Apex);
+ RollbackInfo available = RollbackUtils.getAvailableRollback(SHIM_APEX_PACKAGE_NAME);
assertThat(available).isStaged();
assertThat(available).packagesContainsExactly(
Rollback.from(TestApp.Apex3).to(TestApp.Apex2),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
RollbackUtils.rollback(available.getRollbackId(), TestApp.Apex3);
RollbackInfo committed = RollbackUtils.getCommittedRollbackById(available.getRollbackId());
@@ -359,17 +360,17 @@
assertThat(committed).isStaged();
assertThat(committed).packagesContainsExactly(
Rollback.from(TestApp.Apex3).to(TestApp.Apex2),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
assertThat(committed).causePackagesContainsExactly(TestApp.Apex3);
assertThat(committed.getCommittedSessionId()).isNotEqualTo(-1);
// Note: The app is not rolled back until after the rollback is staged
// and the device has been rebooted.
InstallUtils.waitForSessionReady(committed.getCommittedSessionId());
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
}
/**
@@ -378,7 +379,7 @@
*/
@Test
public void testApexOnlyStagedRollback_Phase4() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
// Rollback data for shim apex will remain in storage since the apex cannot be completely
// removed and thus the rollback data won't be expired. Unfortunately, we can't also delete
@@ -390,7 +391,7 @@
*/
@Test
public void testApexOnlySystemVersionStagedRollback_Phase1() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
// keep the versions of the apks in shim apex for verifying in phase2
recordApkInApexVersion();
@@ -400,20 +401,20 @@
@Test
public void testApexOnlySystemVersionStagedRollback_Phase2() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
long[] versions = retrieveApkInApexVersion();
final long apkInShimApexVersion = versions[0];
final long privApkInShimApexVersion = versions[1];
- RollbackInfo available = RollbackUtils.getAvailableRollback(TestApp.Apex);
+ RollbackInfo available = RollbackUtils.getAvailableRollback(SHIM_APEX_PACKAGE_NAME);
assertThat(available).isStaged();
assertThat(available).packagesContainsExactly(
Rollback.from(TestApp.Apex2).to(TestApp.Apex1),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
RollbackUtils.rollback(available.getRollbackId(), TestApp.Apex2);
RollbackInfo committed = RollbackUtils.getCommittedRollbackById(available.getRollbackId());
@@ -421,22 +422,22 @@
assertThat(committed).isStaged();
assertThat(committed).packagesContainsExactly(
Rollback.from(TestApp.Apex2).to(TestApp.Apex1),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
assertThat(committed).causePackagesContainsExactly(TestApp.Apex2);
assertThat(committed.getCommittedSessionId()).isNotEqualTo(-1);
// Note: The app is not rolled back until after the rollback is staged
// and the device has been rebooted.
InstallUtils.waitForSessionReady(committed.getCommittedSessionId());
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
}
@Test
public void testApexOnlySystemVersionStagedRollback_Phase3() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
}
/**
@@ -445,7 +446,7 @@
*/
@Test
public void testApexAndApkStagedRollback_Phase1() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(-1);
Install.multi(TestApp.Apex2, TestApp.A1).setStaged().commit();
@@ -457,7 +458,7 @@
*/
@Test
public void testApexAndApkStagedRollback_Phase2() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
// keep the versions of the apks in shim apex for verifying in phase3 and phase4
@@ -472,7 +473,7 @@
*/
@Test
public void testApexAndApkStagedRollback_Phase3() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
InstallUtils.processUserData(TestApp.A);
@@ -480,15 +481,15 @@
final long apkInShimApexVersion = versions[0];
final long privApkInShimApexVersion = versions[1];
- RollbackInfo available = RollbackUtils.getAvailableRollback(TestApp.Apex);
+ RollbackInfo available = RollbackUtils.getAvailableRollback(SHIM_APEX_PACKAGE_NAME);
assertThat(available).isStaged();
assertThat(available).packagesContainsExactly(
Rollback.from(TestApp.Apex3).to(TestApp.Apex2),
Rollback.from(TestApp.A2).to(TestApp.A1),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
RollbackUtils.rollback(available.getRollbackId(), TestApp.Apex3, TestApp.A2);
RollbackInfo committed = RollbackUtils.getCommittedRollback(TestApp.A);
@@ -497,17 +498,17 @@
assertThat(committed).packagesContainsExactly(
Rollback.from(TestApp.Apex3).to(TestApp.Apex2),
Rollback.from(TestApp.A2).to(TestApp.A1),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
assertThat(committed).causePackagesContainsExactly(TestApp.Apex3, TestApp.A2);
assertThat(committed.getCommittedSessionId()).isNotEqualTo(-1);
// Note: The app is not rolled back until after the rollback is staged
// and the device has been rebooted.
InstallUtils.waitForSessionReady(committed.getCommittedSessionId());
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
}
@@ -517,7 +518,7 @@
*/
@Test
public void testApexAndApkStagedRollback_Phase4() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
InstallUtils.processUserData(TestApp.A);
@@ -530,10 +531,10 @@
assertThat(committed).packagesContainsExactly(
Rollback.from(TestApp.Apex3).to(TestApp.Apex2),
Rollback.from(TestApp.A2).to(TestApp.A1),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
assertThat(committed).causePackagesContainsExactly(TestApp.Apex3, TestApp.A2);
assertThat(committed.getCommittedSessionId()).isNotEqualTo(-1);
@@ -548,7 +549,7 @@
*/
@Test
public void testApexRollbackExpiration_Phase1() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
Install.single(TestApp.Apex2).setStaged().setEnableRollback().commit();
}
@@ -559,8 +560,8 @@
*/
@Test
public void testApexRollbackExpiration_Phase2() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
- assertThat(RollbackUtils.getAvailableRollback(TestApp.Apex)).isNotNull();
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
+ assertThat(RollbackUtils.getAvailableRollback(SHIM_APEX_PACKAGE_NAME)).isNotNull();
Install.single(TestApp.Apex3).setStaged().commit();
}
@@ -570,8 +571,8 @@
*/
@Test
public void testApexRollbackExpiration_Phase3() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(3);
- assertThat(RollbackUtils.getAvailableRollback(TestApp.Apex)).isNull();
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
+ assertThat(RollbackUtils.getAvailableRollback(SHIM_APEX_PACKAGE_NAME)).isNull();
}
/**
@@ -579,7 +580,7 @@
*/
@Test
public void testApexKeyRotationStagedRollback_Phase1() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
// keep the versions of the apks in shim apex for verifying in phase2
recordApkInApexVersion();
@@ -589,8 +590,8 @@
@Test
public void testApexKeyRotationStagedRollback_Phase2() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
- RollbackInfo available = RollbackUtils.getAvailableRollback(TestApp.Apex);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
+ RollbackInfo available = RollbackUtils.getAvailableRollback(SHIM_APEX_PACKAGE_NAME);
long[] versions = retrieveApkInApexVersion();
final long apkInShimApexVersion = versions[0];
final long privApkInShimApexVersion = versions[1];
@@ -598,10 +599,10 @@
assertThat(available).isStaged();
assertThat(available).packagesContainsExactly(
Rollback.from(Apex2SignedBobRotRollback).to(TestApp.Apex1),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
RollbackUtils.rollback(available.getRollbackId(), Apex2SignedBobRotRollback);
RollbackInfo committed = RollbackUtils.getCommittedRollbackById(available.getRollbackId());
@@ -609,22 +610,22 @@
assertThat(committed).isStaged();
assertThat(committed).packagesContainsExactly(
Rollback.from(Apex2SignedBobRotRollback).to(TestApp.Apex1),
- Rollback.from(ApkInShimApexPackageName, 0)
- .to(ApkInShimApexPackageName, apkInShimApexVersion),
- Rollback.from(PrivApkInShimApexPackageName, 0)
- .to(PrivApkInShimApexPackageName, privApkInShimApexVersion));
+ Rollback.from(SHIM_PACKAGE_NAME, 0)
+ .to(SHIM_PACKAGE_NAME, apkInShimApexVersion),
+ Rollback.from(PRIVILEGED_SHIM_PACKAGE_NAME, 0)
+ .to(PRIVILEGED_SHIM_PACKAGE_NAME, privApkInShimApexVersion));
assertThat(committed).causePackagesContainsExactly(Apex2SignedBobRotRollback);
assertThat(committed.getCommittedSessionId()).isNotEqualTo(-1);
// Note: The app is not rolled back until after the rollback is staged
// and the device has been rebooted.
InstallUtils.waitForSessionReady(committed.getCommittedSessionId());
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
}
@Test
public void testApexKeyRotationStagedRollback_Phase3() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(InstallUtils.getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
}
@Test
@@ -660,8 +661,8 @@
* Record the versions of Apk in shim apex and PrivApk in shim apex
* in the order into {@link #APK_VERSION_FILENAME}.
*
- * @see #ApkInShimApexPackageName
- * @see #PrivApkInShimApexPackageName
+ * @see ShimPackage#SHIM_PACKAGE_NAME
+ * @see ShimPackage#PRIVILEGED_SHIM_PACKAGE_NAME
*/
private void recordApkInApexVersion() throws Exception {
final File versionFile = getApkInApexVersionFile();
@@ -670,9 +671,9 @@
versionFile.createNewFile();
}
- final long apkInApexVersion = InstallUtils.getInstalledVersion(ApkInShimApexPackageName);
+ final long apkInApexVersion = InstallUtils.getInstalledVersion(SHIM_PACKAGE_NAME);
final long privApkInApexVersion = InstallUtils.getInstalledVersion(
- PrivApkInShimApexPackageName);
+ PRIVILEGED_SHIM_PACKAGE_NAME);
try (BufferedWriter writer = new BufferedWriter(new FileWriter(versionFile))) {
writer.write(apkInApexVersion + APK_VERSION_SEPARATOR + privApkInApexVersion);
@@ -683,8 +684,8 @@
* Returns the array of the versions of Apk in shim apex and PrivApk in shim apex
* in the order from {@link #APK_VERSION_FILENAME}.
*
- * @see #ApkInShimApexPackageName
- * @see #PrivApkInShimApexPackageName
+ * @see ShimPackage#SHIM_PACKAGE_NAME
+ * @see ShimPackage#PRIVILEGED_SHIM_PACKAGE_NAME
*/
private long[] retrieveApkInApexVersion() throws Exception {
final File versionFile = getApkInApexVersionFile();
diff --git a/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java b/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
index 157b2ae..b8333ec 100644
--- a/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
+++ b/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
@@ -16,6 +16,8 @@
package com.android.cts.rollback.host;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+
import static com.google.common.truth.Truth.assertThat;
import static org.hamcrest.CoreMatchers.endsWith;
@@ -42,8 +44,6 @@
private static final String TAG = "RollbackManagerHostTest";
- private static final String SHIM_APEX_PACKAGE_NAME = "com.android.apex.cts.shim";
-
/**
* Runs the helper app test method on device.
* Throws an exception if the test method fails.
diff --git a/hostsidetests/sample/app/AndroidManifest.xml b/hostsidetests/sample/app/AndroidManifest.xml
index dfacf25..f1e8374 100755
--- a/hostsidetests/sample/app/AndroidManifest.xml
+++ b/hostsidetests/sample/app/AndroidManifest.xml
@@ -16,16 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.sample.app">
+ package="android.sample.app">
<application>
- <activity android:name=".SampleDeviceActivity" >
+ <activity android:name=".SampleDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA.xml
index 1747eb6..0ecc2a7 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA.xml
@@ -23,7 +23,7 @@
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<application android:label="TestAppA">
- <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper">
+ <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper" android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT"/>
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppB.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppB.xml
index cf9a327..076d299 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppB.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppB.xml
@@ -23,7 +23,7 @@
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<application android:label="TestAppB">
- <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper">
+ <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper" android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT"/>
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC.xml
index e6ee00a..32b7a0e 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC.xml
@@ -25,7 +25,7 @@
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<application android:label="TestAppC">
- <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper">
+ <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper" android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT"/>
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppCLegacy.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppCLegacy.xml
index be1bd75..de1c54a 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppCLegacy.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppCLegacy.xml
@@ -23,7 +23,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application android:label="TestAppCLegacy">
- <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper">
+ <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper" android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT"/>
diff --git a/hostsidetests/seccomp/TEST_MAPPING b/hostsidetests/seccomp/TEST_MAPPING
new file mode 100644
index 0000000..16b0945
--- /dev/null
+++ b/hostsidetests/seccomp/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsSeccompHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/seccomp/app/assets/syscalls_allowed.json b/hostsidetests/seccomp/app/assets/syscalls_allowed.json
index 03ce72b..f3aa1b7 100644
--- a/hostsidetests/seccomp/app/assets/syscalls_allowed.json
+++ b/hostsidetests/seccomp/app/assets/syscalls_allowed.json
@@ -1,4 +1,4 @@
-# DO NOT MODIFY. CHANGE gen_blacklist.py INSTEAD.
+# DO NOT MODIFY. CHANGE gen_blocklist.py INSTEAD.
{
"arm": {
"inotify_init": 316,
diff --git a/hostsidetests/seccomp/app/assets/syscalls_blocked.json b/hostsidetests/seccomp/app/assets/syscalls_blocked.json
index a53319b..9683cff 100644
--- a/hostsidetests/seccomp/app/assets/syscalls_blocked.json
+++ b/hostsidetests/seccomp/app/assets/syscalls_blocked.json
@@ -1,4 +1,4 @@
-# DO NOT MODIFY. CHANGE gen_blacklist.py INSTEAD.
+# DO NOT MODIFY. CHANGE gen_blocklist.py INSTEAD.
{
"arm": {
"acct": 51,
diff --git a/hostsidetests/seccomp/app/gen_blacklist.py b/hostsidetests/seccomp/app/gen_blocklist.py
similarity index 97%
rename from hostsidetests/seccomp/app/gen_blacklist.py
rename to hostsidetests/seccomp/app/gen_blocklist.py
index e39fd9f..588ebbb 100755
--- a/hostsidetests/seccomp/app/gen_blacklist.py
+++ b/hostsidetests/seccomp/app/gen_blocklist.py
@@ -3,7 +3,7 @@
# This script generates syscall name to number mapping for supported
# architectures. To update the output, runs:
#
-# $ app/gen_blacklist.py --allowed app/assets/syscalls_allowed.json \
+# $ app/gen_blocklist.py --allowed app/assets/syscalls_allowed.json \
# --blocked app/assets/syscalls_blocked.json
#
# Note that these are just syscalls that explicitly allowed and blocked in CTS
@@ -176,7 +176,7 @@
arch,
collect_syscall_names_for_arch(_SYSCALLS_ALLOWED_IN_CTS, arch))
- msg_do_not_modify = '# DO NOT MODIFY. CHANGE gen_blacklist.py INSTEAD.'
+ msg_do_not_modify = '# DO NOT MODIFY. CHANGE gen_blocklist.py INSTEAD.'
with open(args.allowed, 'w') as f:
print(msg_do_not_modify, file=f)
json.dump(allowed, f, sort_keys=True, indent=2)
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-3913/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2016-3913/poc.cpp
index 5d45862..7243c16 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-3913/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-3913/poc.cpp
@@ -44,6 +44,8 @@
status_t setDataSource(const sp<IDataSource> &source) { return OK; }
+ status_t setDataSource(const String8& rtpParams) { return OK; }
+
status_t setVideoSurfaceTexture(
const sp<IGraphicBufferProducer> &bufferProducer) {
return OK;
@@ -164,4 +166,4 @@
player->setNextPlayer(localPlayer);
return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/hostsidetests/securitybulletin/test-apps/launchanywhere/AndroidManifest.xml b/hostsidetests/securitybulletin/test-apps/launchanywhere/AndroidManifest.xml
index 1553c92..cc95d29 100644
--- a/hostsidetests/securitybulletin/test-apps/launchanywhere/AndroidManifest.xml
+++ b/hostsidetests/securitybulletin/test-apps/launchanywhere/AndroidManifest.xml
@@ -15,30 +15,30 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.security.cts.launchanywhere"
- android:versionCode="1"
- android:versionName="1.0">
+ package="com.android.security.cts.launchanywhere"
+ android:versionCode="1"
+ android:versionName="1.0">
<application android:label="LaunchAnyWhere Exploitation App">
- <activity android:name=".StartExploit">
+ <activity android:name=".StartExploit"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<service android:name=".AuthenticatorService"
- android:enabled="true"
- android:exported="true">
+ android:enabled="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accounts.AccountAuthenticator" />
+ <action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
- <meta-data
- android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/launchanywhere_authenticator" />
+ <meta-data android:name="android.accounts.AccountAuthenticator"
+ android:resource="@xml/launchanywhere_authenticator"/>
</service>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/hostsidetests/settings/app/DeviceOwnerApp/AndroidManifest.xml b/hostsidetests/settings/app/DeviceOwnerApp/AndroidManifest.xml
index b70c972..be53c0c 100644
--- a/hostsidetests/settings/app/DeviceOwnerApp/AndroidManifest.xml
+++ b/hostsidetests/settings/app/DeviceOwnerApp/AndroidManifest.xml
@@ -15,36 +15,34 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.google.android.cts.deviceowner" >
+ package="com.google.android.cts.deviceowner">
- <application
- android:label="Privacy Settings for Device Owner CTS host side app"
- android:testOnly="true">
+ <application android:label="Privacy Settings for Device Owner CTS host side app"
+ android:testOnly="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name="com.google.android.cts.deviceowner.WorkPolicyInfoActivity"
- android:exported="true"
- android:launchMode="singleTask">
+ <activity android:name="com.google.android.cts.deviceowner.WorkPolicyInfoActivity"
+ android:exported="true"
+ android:launchMode="singleTask">
<intent-filter>
<category android:name="android.intent.category.DEFAULT"/>
<action android:name="android.settings.SHOW_WORK_POLICY_INFO"/>
</intent-filter>
</activity>
- <receiver
- android:name="com.google.android.cts.deviceowner.DeviceOwnerTest$BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name="com.google.android.cts.deviceowner.DeviceOwnerTest$BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.google.android.cts.deviceowner"
- android:label="Privacy Settings for Device Owner CTS tests"/>
+ android:targetPackage="com.google.android.cts.deviceowner"
+ android:label="Privacy Settings for Device Owner CTS tests"/>
</manifest>
diff --git a/hostsidetests/signedconfig/app/version1_instant_AndroidManifest.xml b/hostsidetests/signedconfig/app/version1_instant_AndroidManifest.xml
index c5adf51..9ebeb87 100755
--- a/hostsidetests/signedconfig/app/version1_instant_AndroidManifest.xml
+++ b/hostsidetests/signedconfig/app/version1_instant_AndroidManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?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");
@@ -13,25 +13,26 @@
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.cts.signedconfig.app"
- android:versionCode="1"
- android:versionName="1">
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.cts.signedconfig.app"
+ android:versionCode="1"
+ android:versionName="1">
<application>
<meta-data android:name="android.settings.global"
- android:value="@string/signed_config_v1"/>
+ android:value="@string/signed_config_v1"/>
<meta-data android:name="android.settings.global.signature"
- android:value="@string/signed_config_signature_v1"/>
+ android:value="@string/signed_config_signature_v1"/>
- <activity android:name=".Empty">
+ <activity android:name=".Empty"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="cts.android.com" />
- <data android:path="/signedconfig" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="cts.android.com"/>
+ <data android:path="/signedconfig"/>
</intent-filter>
</activity>
diff --git a/hostsidetests/signedconfig/app/version2_instant_AndroidManifest.xml b/hostsidetests/signedconfig/app/version2_instant_AndroidManifest.xml
index b2d2e56..5010ce3 100755
--- a/hostsidetests/signedconfig/app/version2_instant_AndroidManifest.xml
+++ b/hostsidetests/signedconfig/app/version2_instant_AndroidManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?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");
@@ -13,25 +13,26 @@
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.cts.signedconfig.app"
- android:versionCode="2"
- android:versionName="2">
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.cts.signedconfig.app"
+ android:versionCode="2"
+ android:versionName="2">
<application>
<meta-data android:name="android.settings.global"
- android:value="@string/signed_config_v2"/>
+ android:value="@string/signed_config_v2"/>
<meta-data android:name="android.settings.global.signature"
- android:value="@string/signed_config_signature_v2"/>
+ android:value="@string/signed_config_signature_v2"/>
- <activity android:name=".Empty">
+ <activity android:name=".Empty"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="cts.android.com" />
- <data android:path="/signedconfig" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="cts.android.com"/>
+ <data android:path="/signedconfig"/>
</intent-filter>
</activity>
diff --git a/hostsidetests/stagedinstall/Android.bp b/hostsidetests/stagedinstall/Android.bp
index 870c01e..6a463a1 100644
--- a/hostsidetests/stagedinstall/Android.bp
+++ b/hostsidetests/stagedinstall/Android.bp
@@ -20,6 +20,7 @@
libs: [
"cts-tradefed",
+ "cts-shim-host-lib",
"tradefed",
"truth-prebuilt",
"hamcrest",
diff --git a/hostsidetests/stagedinstall/app/AndroidManifest.xml b/hostsidetests/stagedinstall/app/AndroidManifest.xml
index ebe83e6..679c55d 100644
--- a/hostsidetests/stagedinstall/app/AndroidManifest.xml
+++ b/hostsidetests/stagedinstall/app/AndroidManifest.xml
@@ -15,38 +15,31 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.tests.stagedinstall" >
+ package="com.android.tests.stagedinstall">
<queries>
- <package android:name="com.android.cts.ctsshim" />
+ <package android:name="com.android.cts.ctsshim"/>
</queries>
<application>
<receiver android:name="com.android.cts.install.lib.LocalIntentSender"
- android:exported="true" />
+ android:exported="true"/>
<!-- This activity is necessary to register the test app as the default home activity (i.e.
- to receive SESSION_COMMITTED broadcasts.) -->
- <activity android:name=".LauncherActivity">
+ to receive SESSION_COMMITTED broadcasts.) -->
+ <activity android:name=".LauncherActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.HOME"/>
- <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <receiver android:name="com.android.tests.stagedinstall.SessionUpdateBroadcastReceiver">
- <intent-filter>
- <action android:name="android.content.pm.action.SESSION_UPDATED"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.content.pm.action.SESSION_COMMITTED"/>
- </intent-filter>
- </receiver>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.tests.stagedinstall"
- android:label="StagedInstall Test"/>
+ android:targetPackage="com.android.tests.stagedinstall"
+ android:label="StagedInstall Test"/>
</manifest>
diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/ApexShimValidationTest.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/ApexShimValidationTest.java
index 2abb723..f8eabdb 100644
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/ApexShimValidationTest.java
+++ b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/ApexShimValidationTest.java
@@ -16,6 +16,7 @@
package com.android.tests.stagedinstall;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
import static com.android.tests.stagedinstall.PackageInstallerSessionInfoSubject.assertThat;
import static com.google.common.truth.Truth.assertThat;
@@ -37,8 +38,6 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import java.util.concurrent.TimeUnit;
-
/**
* These tests use a similar structure to {@link StagedInstallTest}. See
* {@link StagedInstallTest} documentation for reference.
@@ -48,8 +47,6 @@
@RunWith(JUnit4.class)
public class ApexShimValidationTest {
- private static final String SHIM_APEX_PACKAGE_NAME = "com.android.apex.cts.shim";
-
@Before
public void adoptShellPermissions() {
InstrumentationRegistry
@@ -68,53 +65,38 @@
.dropShellPermissionIdentity();
}
- @Before
- public void clearBroadcastReceiver() {
- SessionUpdateBroadcastReceiver.sessionBroadcasts.clear();
- }
-
@Test
public void testRejectsApexWithAdditionalFile_Commit() throws Exception {
int sessionId = stageApex("com.android.apex.cts.shim.v2_additional_file.apex");
- PackageInstaller.SessionInfo info =
- SessionUpdateBroadcastReceiver.sessionBroadcasts.poll(60, TimeUnit.SECONDS);
- assertThat(info.getSessionId()).isEqualTo(sessionId);
+ PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
assertThat(info).isStagedSessionFailed();
}
@Test
public void testRejectsApexWithAdditionalFolder_Commit() throws Exception {
int sessionId = stageApex("com.android.apex.cts.shim.v2_additional_folder.apex");
- PackageInstaller.SessionInfo info =
- SessionUpdateBroadcastReceiver.sessionBroadcasts.poll(60, TimeUnit.SECONDS);
- assertThat(info.getSessionId()).isEqualTo(sessionId);
+ PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
assertThat(info).isStagedSessionFailed();
}
@Test
public void testRejectsApexWithPostInstallHook_Commit() throws Exception {
int sessionId = stageApex("com.android.apex.cts.shim.v2_with_post_install_hook.apex");
- PackageInstaller.SessionInfo info =
- SessionUpdateBroadcastReceiver.sessionBroadcasts.poll(60, TimeUnit.SECONDS);
- assertThat(info.getSessionId()).isEqualTo(sessionId);
+ PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
assertThat(info).isStagedSessionFailed();
}
@Test
public void testRejectsApexWithPreInstallHook_Commit() throws Exception {
int sessionId = stageApex("com.android.apex.cts.shim.v2_with_pre_install_hook.apex");
- PackageInstaller.SessionInfo info =
- SessionUpdateBroadcastReceiver.sessionBroadcasts.poll(60, TimeUnit.SECONDS);
- assertThat(info.getSessionId()).isEqualTo(sessionId);
+ PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
assertThat(info).isStagedSessionFailed();
}
@Test
public void testRejectsApexWrongSHA_Commit() throws Exception {
int sessionId = stageApex("com.android.apex.cts.shim.v2_wrong_sha.apex");
- PackageInstaller.SessionInfo info =
- SessionUpdateBroadcastReceiver.sessionBroadcasts.poll(60, TimeUnit.SECONDS);
- assertThat(info.getSessionId()).isEqualTo(sessionId);
+ PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
assertThat(info).isStagedSessionFailed();
}
@@ -129,8 +111,9 @@
int sessionId = Install.single(apexTestApp).setStaged().createSession();
try (PackageInstaller.Session session =
InstallUtils.openPackageInstallerSession(sessionId)) {
- session.commit(LocalIntentSender.getIntentSender());
- Intent result = LocalIntentSender.getIntentSenderResult();
+ LocalIntentSender sender = new LocalIntentSender();
+ session.commit(sender.getIntentSender());
+ Intent result = sender.getResult();
InstallUtils.assertStatusSuccess(result);
return sessionId;
}
diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/SessionUpdateBroadcastReceiver.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/SessionUpdateBroadcastReceiver.java
deleted file mode 100644
index d51c091..0000000
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/SessionUpdateBroadcastReceiver.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2019 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.tests.stagedinstall;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInstaller;
-import android.util.Log;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-public class SessionUpdateBroadcastReceiver extends BroadcastReceiver {
-
- static final BlockingQueue<PackageInstaller.SessionInfo> sessionBroadcasts
- = new LinkedBlockingQueue<>();
- static final BlockingQueue<PackageInstaller.SessionInfo> sessionCommittedBroadcasts
- = new LinkedBlockingQueue<>();
-
- private static final String TAG = "StagedInstallTest";
-
- @Override
- public void onReceive(Context context, Intent intent) {
- PackageInstaller.SessionInfo info =
- intent.getParcelableExtra(PackageInstaller.EXTRA_SESSION);
- assertThat(info).isNotNull();
- switch (intent.getAction()) {
- case PackageInstaller.ACTION_SESSION_UPDATED:
- handleSessionUpdatedBroadcast(info);
- break;
- case PackageInstaller.ACTION_SESSION_COMMITTED:
- handleSessionCommittedBroadcast(info);
- break;
- default:
- break;
- }
- }
-
- private void handleSessionUpdatedBroadcast(PackageInstaller.SessionInfo info) {
- Log.i(TAG, "Received SESSION_UPDATED for session " + info.getSessionId()
- + " isReady:" + info.isStagedSessionReady()
- + " isFailed:" + info.isStagedSessionFailed()
- + " isApplied:" + info.isStagedSessionApplied());
- try {
- sessionBroadcasts.put(info);
- } catch (InterruptedException e) {
-
- }
- }
-
- private void handleSessionCommittedBroadcast(PackageInstaller.SessionInfo info) {
- Log.e(TAG, "Received SESSION_COMMITTED for session " + info.getSessionId());
- try {
- sessionCommittedBroadcasts.put(info);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new IllegalStateException(
- "Interrupted while handling SESSION_COMMITTED broadcast", e);
- }
- }
-}
diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
index 93064e6..f3f4684 100644
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
+++ b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
@@ -16,7 +16,13 @@
package com.android.tests.stagedinstall;
+import static com.android.cts.install.lib.InstallUtils.assertStatusSuccess;
+import static com.android.cts.install.lib.InstallUtils.getInstalledVersion;
import static com.android.cts.install.lib.InstallUtils.getPackageInstaller;
+import static com.android.cts.shim.lib.ShimPackage.DIFFERENT_APEX_PACKAGE_NAME;
+import static com.android.cts.shim.lib.ShimPackage.NOT_PRE_INSTALL_APEX_PACKAGE_NAME;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_PACKAGE_NAME;
import static com.android.tests.stagedinstall.PackageInstallerSessionInfoSubject.assertThat;
import static com.google.common.truth.Truth.assertThat;
@@ -25,8 +31,10 @@
import static org.junit.Assert.fail;
import android.Manifest;
+import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageInstaller;
@@ -57,18 +65,19 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.BasicFileAttributes;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -104,61 +113,55 @@
private static final Duration WAIT_FOR_SESSION_REMOVED_TTL = Duration.ofSeconds(10);
private static final Duration SLEEP_DURATION = Duration.ofMillis(200);
- private static final String SHIM_PACKAGE_NAME = "com.android.apex.cts.shim";
- private static final String APK_SHIM_PACKAGE_NAME = "com.android.cts.ctsshim";
- private static final String NOT_PREINSTALL_APEX_PACKAGE_NAME =
- "com.android.apex.cts.shim_not_pre_installed";
- private static final String DIFFERENT_APEX_PACKAGE_NAME = "com.android.apex.cts.shim.different";
-
private static final TestApp TESTAPP_SAME_NAME_AS_APEX = new TestApp(
- "TestAppSamePackageNameAsApex", SHIM_PACKAGE_NAME, 1, /*isApex*/ false,
+ "TestAppSamePackageNameAsApex", SHIM_APEX_PACKAGE_NAME, 1, /*isApex*/ false,
"StagedInstallTestAppSamePackageNameAsApex.apk");
private static final TestApp Apex2DifferentCertificate = new TestApp(
- "Apex2DifferentCertificate", SHIM_PACKAGE_NAME, 2, /*isApex*/true,
+ "Apex2DifferentCertificate", SHIM_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_different_certificate.apex");
private static final TestApp Apex2DifferentPackageName = new TestApp(
"Apex2DifferentPackageName", DIFFERENT_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_different_package_name.apex");
private static final TestApp Apex2SignedBob = new TestApp(
- "Apex2SignedBob", SHIM_PACKAGE_NAME, 2, /*isApex*/true,
+ "Apex2SignedBob", SHIM_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_signed_bob.apex");
private static final TestApp Apex2SignedBobRot = new TestApp(
- "Apex2SignedBobRot", SHIM_PACKAGE_NAME, 2, /*isApex*/true,
+ "Apex2SignedBobRot", SHIM_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_signed_bob_rot.apex");
private static final TestApp Apex2SignedBobRotRollback = new TestApp(
- "Apex2SignedBobRotRollback", SHIM_PACKAGE_NAME, 2, /*isApex*/true,
+ "Apex2SignedBobRotRollback", SHIM_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex");
private static final TestApp ApexNoHashtree2 = new TestApp(
- "Apex2", SHIM_PACKAGE_NAME, 2, /*isApex*/true,
+ "Apex2", SHIM_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_no_hashtree.apex");
private static final TestApp ApexWrongSha2 = new TestApp(
- "ApexWrongSha2", SHIM_PACKAGE_NAME, 2, /*isApex*/true,
+ "ApexWrongSha2", SHIM_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_wrong_sha.apex");
private static final TestApp Apex2WithoutApkInApex = new TestApp(
- "Apex2WithoutApkInApex", SHIM_PACKAGE_NAME, 2, /*isApex*/true,
+ "Apex2WithoutApkInApex", SHIM_APEX_PACKAGE_NAME, 2, /*isApex*/true,
"com.android.apex.cts.shim.v2_without_apk_in_apex.apex");
private static final TestApp Apex3SignedBob = new TestApp(
- "Apex3SignedBob", SHIM_PACKAGE_NAME, 3, /*isApex*/true,
+ "Apex3SignedBob", SHIM_APEX_PACKAGE_NAME, 3, /*isApex*/true,
"com.android.apex.cts.shim.v3_signed_bob.apex");
private static final TestApp Apex3SignedBobRot = new TestApp(
- "Apex3SignedBobRot", SHIM_PACKAGE_NAME, 3, /*isApex*/true,
+ "Apex3SignedBobRot", SHIM_APEX_PACKAGE_NAME, 3, /*isApex*/true,
"com.android.apex.cts.shim.v3_signed_bob_rot.apex");
private static final TestApp ApexNotPreInstalled = new TestApp(
- "ApexNotPreInstalled", NOT_PREINSTALL_APEX_PACKAGE_NAME, 3, /*isApex*/true,
+ "ApexNotPreInstalled", NOT_PRE_INSTALL_APEX_PACKAGE_NAME, 3, /*isApex*/true,
"com.android.apex.cts.shim_not_pre_installed.apex");
private static final TestApp Apex2SdkTargetP = new TestApp(
- "StagedInstallTestApexV2_SdkTargetP", SHIM_PACKAGE_NAME, 2,
+ "StagedInstallTestApexV2_SdkTargetP", SHIM_APEX_PACKAGE_NAME, 2,
/*isApex*/true, "com.android.apex.cts.shim.v2_sdk_target_p.apex");
private static final TestApp Apex2ApkInApexSdkTargetP = new TestApp(
- "StagedInstallTestApexV2_ApkInApexSdkTargetP", SHIM_PACKAGE_NAME, 2,
+ "StagedInstallTestApexV2_ApkInApexSdkTargetP", SHIM_APEX_PACKAGE_NAME, 2,
/*isApex*/true, "com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex");
private static final TestApp CorruptedApex_b146895998 = new TestApp(
"StagedInstallTestCorruptedApex_b146895998", "", 1, true, "corrupted_b146895998.apex");
private static final TestApp Apex2NoApkSignature = new TestApp(
- "StagedInstallTestApexV2_NoApkSignature", SHIM_PACKAGE_NAME, 1,
+ "StagedInstallTestApexV2_NoApkSignature", SHIM_APEX_PACKAGE_NAME, 1,
/*isApex*/true, "com.android.apex.cts.shim.v2_unsigned_apk_container.apex");
private static final TestApp Apex2UnsignedPayload = new TestApp(
- "StagedInstallTestApexV2_UnsignedPayload", SHIM_PACKAGE_NAME, 1,
+ "StagedInstallTestApexV2_UnsignedPayload", SHIM_APEX_PACKAGE_NAME, 1,
/*isApex*/true, "com.android.apex.cts.shim.v2_unsigned_payload.apex");
@Before
@@ -179,12 +182,6 @@
.dropShellPermissionIdentity();
}
- @Before
- public void clearBroadcastReceiver() {
- SessionUpdateBroadcastReceiver.sessionBroadcasts.clear();
- SessionUpdateBroadcastReceiver.sessionCommittedBroadcasts.clear();
- }
-
// This is marked as @Test to take advantage of @Before/@After methods of this class. Actual
// purpose of this method to be called before and after each test case of
// com.android.test.stagedinstall.host.StagedInstallTest to reduce tests flakiness.
@@ -226,21 +223,23 @@
@Test
public void testInstallStagedApk_Commit() throws Exception {
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
int sessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
waitForIsReadyBroadcast(sessionId);
assertSessionReady(sessionId);
storeSessionId(sessionId);
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
- assertNoSessionCommitBroadcastSent();
+ counter.assertNoBroadcastReceived();
}
@Test
public void testInstallStagedApk_VerifyPostReboot() throws Exception {
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(1);
- assertNoSessionCommitBroadcastSent();
+ counter.assertNoBroadcastReceived();
}
@Test
@@ -255,6 +254,7 @@
@Test
public void testInstallMultipleStagedApks_Commit() throws Exception {
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
int sessionId = stageMultipleApks(TestApp.A1, TestApp.B1)
.assertSuccessful().getSessionId();
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
@@ -264,16 +264,17 @@
storeSessionId(sessionId);
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
assertThat(getInstalledVersion(TestApp.B)).isEqualTo(-1);
- assertNoSessionCommitBroadcastSent();
+ counter.assertNoBroadcastReceived();
}
@Test
public void testInstallMultipleStagedApks_VerifyPostReboot() throws Exception {
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(1);
assertThat(getInstalledVersion(TestApp.B)).isEqualTo(1);
- assertNoSessionCommitBroadcastSent();
+ counter.assertNoBroadcastReceived();
}
@Test
@@ -324,7 +325,7 @@
@Test
public void testStageAnotherSessionImmediatelyAfterAbandon() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
abandonSession(sessionId);
stageSingleApk(TestApp.Apex2).assertSuccessful();
@@ -332,7 +333,7 @@
@Test
public void testStageAnotherSessionImmediatelyAfterAbandonMultiPackage() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageMultipleApks(TestApp.Apex2, TestApp.A1, TestApp.B1)
.assertSuccessful().getSessionId();
abandonSession(sessionId);
@@ -341,15 +342,16 @@
@Test
public void testNoSessionUpdatedBroadcastSentForStagedSessionAbandon() throws Exception {
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_UPDATED);
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
// Using an apex in hopes that pre-reboot verification will take longer to complete
// and we will manage to abandon it before session becomes ready.
int sessionId = stageMultipleApks(TestApp.A1, TestApp.Apex2).assertSuccessful()
.getSessionId();
abandonSession(sessionId);
assertThat(getStagedSessionInfo(sessionId)).isNull();
- assertNoSessionUpdatedBroadcastSent();
+ counter.assertNoBroadcastReceived();
}
@Test
@@ -458,27 +460,30 @@
@Test
public void testInstallStagedApex_Commit() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
assertSessionReady(sessionId);
storeSessionId(sessionId);
// Version shouldn't change before reboot.
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
- assertNoSessionCommitBroadcastSent();
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
+ counter.assertNoBroadcastReceived();
}
@Test
public void testInstallStagedApex_VerifyPostReboot() throws Exception {
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
- assertNoSessionCommitBroadcastSent();
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
+ counter.assertNoBroadcastReceived();
}
@Test
public void testInstallStagedApexAndApk_Commit() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
int sessionId = stageMultipleApks(TestApp.Apex2, TestApp.A1)
.assertSuccessful().getSessionId();
@@ -486,18 +491,19 @@
assertSessionReady(sessionId);
storeSessionId(sessionId);
// Version shouldn't change before reboot.
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
- assertNoSessionCommitBroadcastSent();
+ counter.assertNoBroadcastReceived();
}
@Test
public void testInstallStagedApexAndApk_VerifyPostReboot() throws Exception {
+ BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
assertThat(getInstalledVersion(TestApp.A)).isEqualTo(1);
- assertNoSessionCommitBroadcastSent();
+ counter.assertNoBroadcastReceived();
}
@Test
@@ -517,7 +523,7 @@
@Test
public void testInstallStagedNonPreInstalledApex_Fails() throws Exception {
- assertThat(getInstalledVersion(NOT_PREINSTALL_APEX_PACKAGE_NAME)).isEqualTo(-1);
+ assertThat(getInstalledVersion(NOT_PRE_INSTALL_APEX_PACKAGE_NAME)).isEqualTo(-1);
int sessionId = stageSingleApk(ApexNotPreInstalled).assertSuccessful().getSessionId();
PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
assertThat(sessionInfo).isStagedSessionFailed();
@@ -526,7 +532,7 @@
@Test
public void testInstallStagedDifferentPackageNameWithInstalledApex_Fails() throws Exception {
assertThat(getInstalledVersion(DIFFERENT_APEX_PACKAGE_NAME)).isEqualTo(-1);
- assertThat(getInstalledVersion(SHIM_PACKAGE_NAME)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageSingleApk(Apex2DifferentPackageName).assertSuccessful().getSessionId();
PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
assertThat(sessionInfo.getStagedSessionErrorMessage()).contains(
@@ -535,7 +541,7 @@
@Test
public void testStageApkWithSameNameAsApexShouldFail_Commit() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageSingleApk(TESTAPP_SAME_NAME_AS_APEX).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
assertSessionReady(sessionId);
@@ -546,16 +552,16 @@
public void testStageApkWithSameNameAsApexShouldFail_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionFailed(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
}
@Test
public void testNonStagedInstallApkWithSameNameAsApexShouldFail() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
InstallUtils.commitExpectingFailure(AssertionError.class,
"is an APEX package and can't be installed as an APK",
Install.single(TESTAPP_SAME_NAME_AS_APEX));
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
}
@Test
@@ -570,8 +576,8 @@
public void testInstallV2Apex_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
- assertThat(getInstalledVersion(APK_SHIM_PACKAGE_NAME)).isNotEqualTo(-1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_PACKAGE_NAME)).isNotEqualTo(-1);
}
@Test
@@ -586,7 +592,7 @@
public void testInstallV2SignedBobApex_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
}
@Test
@@ -601,7 +607,7 @@
public void testInstallV3Apex_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
}
@Test
@@ -616,13 +622,13 @@
public void testInstallV3SignedBobApex_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
}
@Test
public void testStagedInstallDowngradeApex_DowngradeNotRequested_Fails_Commit()
throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
int sessionId = stageSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
assertThat(sessionInfo).isStagedSessionFailed();
@@ -637,13 +643,13 @@
int sessionId = retrieveLastSessionId();
assertSessionFailed(sessionId);
// INSTALL_REQUEST_DOWNGRADE wasn't set, so apex shouldn't be downgraded.
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
}
@Test
public void testStagedInstallDowngradeApex_DowngradeRequested_DebugBuild_Commit()
throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
int sessionId = stageDowngradeSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
assertSessionReady(sessionId);
@@ -656,13 +662,13 @@
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
// Apex should be downgraded.
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
}
@Test
public void testStagedInstallDowngradeApex_DowngradeRequested_UserBuild_Fails_Commit()
throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
int sessionId = stageDowngradeSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
assertThat(sessionInfo).isStagedSessionFailed();
@@ -677,13 +683,13 @@
int sessionId = retrieveLastSessionId();
assertSessionFailed(sessionId);
// Apex shouldn't be downgraded.
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
}
@Test
public void testStagedInstallDowngradeApexToSystemVersion_DebugBuild_Commit()
throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
int sessionId = stageDowngradeSingleApk(TestApp.Apex1).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
assertSessionReady(sessionId);
@@ -696,7 +702,7 @@
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
// Apex should be downgraded.
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
}
@Test
@@ -708,7 +714,7 @@
@Test
public void testFailsInvalidApexInstall_Commit() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageSingleApk(ApexWrongSha2).assertSuccessful()
.getSessionId();
waitForIsFailedBroadcast(sessionId);
@@ -784,7 +790,7 @@
@Test
public void testInstallStagedApexWithoutApexSuffix_Commit() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageSingleApk("com.android.apex.cts.shim.v2.apex", "package")
.assertSuccessful().getSessionId();
@@ -792,14 +798,14 @@
assertSessionReady(sessionId);
storeSessionId(sessionId);
// Version shouldn't change before reboot.
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
}
@Test
public void testInstallStagedApexWithoutApexSuffix_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
}
@Test
@@ -837,13 +843,13 @@
@Test
public void testUpdateWithDifferentKey_VerifyPostReboot() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
}
// Once updated with a new rotated key (bob), further updates with old key (alice) should fail
@Test
public void testUntrustedOldKeyIsRejected() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
int sessionId = stageSingleApk(TestApp.Apex3).assertSuccessful().getSessionId();
waitForIsFailedBroadcast(sessionId);
}
@@ -851,41 +857,41 @@
// Should be able to update with an old key which is trusted
@Test
public void testTrustedOldKeyIsAccepted_Commit() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageSingleApk(Apex2SignedBobRotRollback).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
}
@Test
public void testTrustedOldKeyIsAccepted_CommitPostReboot() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
int sessionId = stageSingleApk(TestApp.Apex3).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
}
@Test
public void testTrustedOldKeyIsAccepted_VerifyPostReboot() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
}
// Once updated with a new rotated key (bob), further updates with new key (bob) should pass
@Test
public void testAfterRotationNewKeyCanUpdateFurther_CommitPostReboot() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
int sessionId = stageSingleApk(Apex3SignedBobRot).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
}
@Test
public void testAfterRotationNewKeyCanUpdateFurther_VerifyPostReboot() throws Exception {
- assertThat(InstallUtils.getInstalledVersion(TestApp.Apex)).isEqualTo(3);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
}
// Once updated with a new rotated key (bob), further updates can be done with key only
@Test
public void testAfterRotationNewKeyCanUpdateFurtherWithoutLineage()
throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
int sessionId = stageSingleApk(Apex3SignedBob).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
}
@@ -1021,8 +1027,9 @@
@Test
public void testSamegradeSystemApex_Commit() throws Exception {
- final PackageInfo shim = InstrumentationRegistry.getInstrumentation().getContext()
- .getPackageManager().getPackageInfo(SHIM_PACKAGE_NAME, PackageManager.MATCH_APEX);
+ final PackageInfo shim =
+ InstrumentationRegistry.getInstrumentation().getContext().getPackageManager()
+ .getPackageInfo(SHIM_APEX_PACKAGE_NAME, PackageManager.MATCH_APEX);
assertThat(shim.getLongVersionCode()).isEqualTo(1);
assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM).isEqualTo(
ApplicationInfo.FLAG_SYSTEM);
@@ -1037,8 +1044,9 @@
public void testSamegradeSystemApex_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- final PackageInfo shim = InstrumentationRegistry.getInstrumentation().getContext()
- .getPackageManager().getPackageInfo(SHIM_PACKAGE_NAME, PackageManager.MATCH_APEX);
+ final PackageInfo shim =
+ InstrumentationRegistry.getInstrumentation().getContext().getPackageManager()
+ .getPackageInfo(SHIM_APEX_PACKAGE_NAME, PackageManager.MATCH_APEX);
assertThat(shim.getLongVersionCode()).isEqualTo(1);
// Check that APEX on /data wins.
assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM).isEqualTo(0);
@@ -1063,20 +1071,20 @@
@Test
public void testInstallStagedNoHashtreeApex_Commit() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
int sessionId = stageSingleApk(ApexNoHashtree2).assertSuccessful().getSessionId();
waitForIsReadyBroadcast(sessionId);
assertSessionReady(sessionId);
storeSessionId(sessionId);
// Version shouldn't change before reboot.
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
}
@Test
public void testInstallStagedNoHashtreeApex_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
// Read all files under /apex/com.android.apex.cts.shim to somewhat verify that hashtree
// is not corrupted
Files.walkFileTree(Paths.get("/apex/com.android.apex.cts.shim"),
@@ -1102,8 +1110,8 @@
@Test
public void testInstallStagedApex_SameGrade_NewOneWins_Commit() throws Exception {
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
- assertThat(getInstalledVersion(APK_SHIM_PACKAGE_NAME)).isNotEqualTo(-1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_PACKAGE_NAME)).isNotEqualTo(-1);
int sessionId = Install.single(Apex2WithoutApkInApex).setStaged().commit();
assertSessionReady(sessionId);
storeSessionId(sessionId);
@@ -1113,8 +1121,8 @@
public void testInstallStagedApex_SameGrade_NewOneWins_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionApplied(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(2);
- assertThat(getInstalledVersion(APK_SHIM_PACKAGE_NAME)).isEqualTo(-1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
+ assertThat(getInstalledVersion(SHIM_PACKAGE_NAME)).isEqualTo(-1);
}
/**
@@ -1143,7 +1151,7 @@
public void testApexFailsToInstallIfApkInApexFailsToScan_VerifyPostReboot() throws Exception {
int sessionId = retrieveLastSessionId();
assertSessionFailed(sessionId);
- assertThat(getInstalledVersion(TestApp.Apex)).isEqualTo(1);
+ assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
}
@Test
@@ -1174,26 +1182,17 @@
.contains("AVB footer verification failed");
}
- private static long getInstalledVersion(String packageName) {
- Context context = InstrumentationRegistry.getInstrumentation().getContext();
- PackageManager pm = context.getPackageManager();
- try {
- PackageInfo info = pm.getPackageInfo(packageName, PackageManager.MATCH_APEX);
- return info.getLongVersionCode();
- } catch (PackageManager.NameNotFoundException e) {
- return -1;
- }
- }
-
// It becomes harder to maintain this variety of install-related helper methods.
// TODO(ioffe): refactor install-related helper methods into a separate utility.
private static int createStagedSession() throws Exception {
return Install.single(TestApp.A1).setStaged().createSession();
}
- private static void commitSession(int sessionId) throws IOException {
+ private static Intent commitSession(int sessionId) throws IOException, InterruptedException {
+ LocalIntentSender sender = new LocalIntentSender();
InstallUtils.openPackageInstallerSession(sessionId)
- .commit(LocalIntentSender.getIntentSender());
+ .commit(sender.getIntentSender());
+ return sender.getResult();
}
private static StageSessionResult stageDowngradeSingleApk(TestApp testApp) throws Exception {
@@ -1201,26 +1200,20 @@
int sessionId = Install.single(testApp).setStaged().setRequestDowngrade().createSession();
// Commit the session (this will start the installation workflow).
Log.i(TAG, "Committing downgrade session for apk: " + testApp);
- commitSession(sessionId);
- return new StageSessionResult(sessionId, LocalIntentSender.getIntentSenderResult());
+ Intent result = commitSession(sessionId);
+ return new StageSessionResult(sessionId, result);
}
private static StageSessionResult stageSingleApk(String apkFileName, String outputFileName)
throws Exception {
- Log.i(TAG, "Staging an install of " + apkFileName);
- // this is a trick to open an empty install session so we can manually write the package
- // using writeApk
- TestApp empty = new TestApp(null, null, -1,
- apkFileName.endsWith(".apex"));
- int sessionId = Install.single(empty).setStaged().createSession();
- try (PackageInstaller.Session session =
- InstallUtils.openPackageInstallerSession(sessionId)) {
- writeApk(session, apkFileName, outputFileName);
- // Commit the session (this will start the installation workflow).
- Log.i(TAG, "Committing session for apk: " + apkFileName);
- commitSession(sessionId);
- return new StageSessionResult(sessionId, LocalIntentSender.getIntentSenderResult());
+ File tmpFile = File.createTempFile(outputFileName, null);
+ try (InputStream is =
+ StagedInstallTest.class.getClassLoader().getResourceAsStream(apkFileName)) {
+ Files.copy(is, tmpFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
}
+ TestApp testApp = new TestApp(tmpFile.getName(), null, -1,
+ apkFileName.endsWith(".apex"), tmpFile);
+ return stageSingleApk(testApp);
}
private static StageSessionResult stageSingleApk(TestApp testApp) throws Exception {
@@ -1228,17 +1221,15 @@
int sessionId = Install.single(testApp).setStaged().createSession();
// Commit the session (this will start the installation workflow).
Log.i(TAG, "Committing session for apk: " + testApp);
- commitSession(sessionId);
- return new StageSessionResult(sessionId,
- LocalIntentSender.getIntentSenderResult(sessionId));
+ Intent result = commitSession(sessionId);
+ return new StageSessionResult(sessionId, result);
}
private static StageSessionResult stageMultipleApks(TestApp... testApps) throws Exception {
Log.i(TAG, "Staging an install of " + Arrays.toString(testApps));
int multiPackageSessionId = Install.multi(testApps).setStaged().createSession();
- commitSession(multiPackageSessionId);
- return new StageSessionResult(
- multiPackageSessionId, LocalIntentSender.getIntentSenderResult());
+ Intent result = commitSession(multiPackageSessionId);
+ return new StageSessionResult(multiPackageSessionId, result);
}
private static void assertSessionApplied(int sessionId) {
@@ -1313,20 +1304,6 @@
}
}
- private static void writeApk(PackageInstaller.Session session, String apkFileName,
- String outputFileName)
- throws Exception {
- try (OutputStream packageInSession = session.openWrite(outputFileName, 0, -1);
- InputStream is =
- StagedInstallTest.class.getClassLoader().getResourceAsStream(apkFileName)) {
- byte[] buffer = new byte[4096];
- int n;
- while ((n = is.read(buffer)) >= 0) {
- packageInSession.write(buffer, 0, n);
- }
- }
- }
-
// TODO(ioffe): not really-tailored to staged install, rename to InstallResult?
private static final class StageSessionResult {
private final int sessionId;
@@ -1351,6 +1328,38 @@
}
}
+ /**
+ * Counts the number of broadcast intents received for a given type during the test.
+ * Used by to check no broadcast intents were received during the test.
+ */
+ private static class BroadcastCounter extends BroadcastReceiver {
+ private final Context mContext;
+ private final AtomicInteger mNumBroadcastReceived = new AtomicInteger();
+
+ BroadcastCounter(String action) {
+ mContext = InstrumentationRegistry.getInstrumentation().getContext();
+ mContext.registerReceiver(this, new IntentFilter(action));
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ mNumBroadcastReceived.incrementAndGet();
+ }
+
+ /**
+ * Waits for a while and checks no broadcasts are received.
+ */
+ void assertNoBroadcastReceived() {
+ try {
+ // Sleep for a reasonable amount of time and check no broadcast is received
+ Thread.sleep(TimeUnit.SECONDS.toMillis(10));
+ } catch (InterruptedException ignore) {
+ }
+ mContext.unregisterReceiver(this);
+ assertThat(mNumBroadcastReceived.get()).isEqualTo(0);
+ }
+ }
+
private static String extractErrorMessage(Intent result) {
int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,
PackageInstaller.STATUS_FAILURE);
@@ -1384,59 +1393,20 @@
return getPackageInstaller().getSessionInfo(sessionId);
}
- private static void assertStatusSuccess(Intent result) {
- int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,
- PackageInstaller.STATUS_FAILURE);
- if (status == -1) {
- throw new AssertionError("PENDING USER ACTION");
- } else if (status > 0) {
- String message = result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
- throw new AssertionError(message == null ? "UNKNOWN FAILURE" : message);
- }
- }
-
private void waitForIsFailedBroadcast(int sessionId) {
Log.i(TAG, "Waiting for session " + sessionId + " to be marked as failed");
- try {
-
- PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
- assertThat(info).isStagedSessionFailed();
- } catch (Exception e) {
- throw new AssertionError(e);
- }
+ PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
+ assertThat(info).isStagedSessionFailed();
}
private void waitForIsReadyBroadcast(int sessionId) {
Log.i(TAG, "Waiting for session " + sessionId + " to be ready");
- try {
- PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
- assertThat(info).isStagedSessionReady();
- } catch (Exception e) {
- throw new AssertionError(e);
- }
+ PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
+ assertThat(info).isStagedSessionReady();
}
- private PackageInstaller.SessionInfo waitForBroadcast(int sessionId) throws Exception {
- PackageInstaller.SessionInfo info =
- SessionUpdateBroadcastReceiver.sessionBroadcasts.poll(60, TimeUnit.SECONDS);
- assertWithMessage("Timed out while waiting for session to get ready")
- .that(info).isNotNull();
- assertThat(info.getSessionId()).isEqualTo(sessionId);
- return info;
- }
-
- private void assertNoSessionCommitBroadcastSent() throws Exception {
- PackageInstaller.SessionInfo info =
- SessionUpdateBroadcastReceiver.sessionCommittedBroadcasts.poll(10,
- TimeUnit.SECONDS);
- assertThat(info).isNull();
- }
-
- private void assertNoSessionUpdatedBroadcastSent() throws Exception {
- PackageInstaller.SessionInfo info =
- SessionUpdateBroadcastReceiver.sessionBroadcasts.poll(10,
- TimeUnit.SECONDS);
- assertThat(info).isNull();
+ private PackageInstaller.SessionInfo waitForBroadcast(int sessionId) {
+ return InstallUtils.waitForSession(sessionId);
}
@Test
diff --git a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
index 2034faa..31b53dd 100644
--- a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
+++ b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/ApexShimValidationTest.java
@@ -16,6 +16,10 @@
package com.android.tests.stagedinstall.host;
+import static com.android.cts.shim.lib.ShimPackage.PRIVILEGED_SHIM_PACKAGE_NAME;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_PACKAGE_NAME;
+
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
@@ -63,7 +67,6 @@
@RunWith(DeviceJUnit4ClassRunner.class)
public class ApexShimValidationTest extends BaseHostJUnit4Test {
- private static final String SHIM_APEX_PACKAGE_NAME = "com.android.apex.cts.shim";
private static final String SHIM_APK_CODE_PATH_PREFIX = "/apex/" + SHIM_APEX_PACKAGE_NAME + "/";
private static final String STAGED_INSTALL_TEST_FILE_NAME = "StagedInstallTest.apk";
private static final String APEX_FILE_SUFFIX = ".apex";
@@ -75,7 +78,7 @@
private static final long DEFAULT_RUN_TIMEOUT_MS = 30 * 1000L;
private static final List<String> ALLOWED_SHIM_PACKAGE_NAMES = Arrays.asList(
- "com.android.cts.ctsshim", "com.android.cts.priv.ctsshim");
+ SHIM_PACKAGE_NAME, PRIVILEGED_SHIM_PACKAGE_NAME);
private File mDeapexingDir;
private File mDeapexerZip;
diff --git a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
index 427dbcc..118a896 100644
--- a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
+++ b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
@@ -16,6 +16,8 @@
package com.android.tests.stagedinstall.host;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+
import static com.google.common.truth.Truth.assertThat;
import static org.hamcrest.CoreMatchers.endsWith;
@@ -46,8 +48,6 @@
private static final String TAG = "StagedInstallTest";
- private static final String SHIM_APEX_PACKAGE_NAME = "com.android.apex.cts.shim";
-
private static final String PACKAGE_NAME = "com.android.tests.stagedinstall";
private static final String BROADCAST_RECEIVER_COMPONENT = PACKAGE_NAME + "/"
diff --git a/hostsidetests/stagedinstall/testdata/apk/StagedInstallTestAppSamePackageNameAsApex.xml b/hostsidetests/stagedinstall/testdata/apk/StagedInstallTestAppSamePackageNameAsApex.xml
index 2954538..6aa9b5b 100644
--- a/hostsidetests/stagedinstall/testdata/apk/StagedInstallTestAppSamePackageNameAsApex.xml
+++ b/hostsidetests/stagedinstall/testdata/apk/StagedInstallTestAppSamePackageNameAsApex.xml
@@ -22,7 +22,8 @@
<uses-sdk android:minSdkVersion="19" />
<application android:label="StagedInstall Test App With Same Package Name As Apex">
- <activity android:name="com.android.tests.stagedinstall.testapp.MainActivity">
+ <activity android:name="com.android.tests.stagedinstall.testapp.MainActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/hostsidetests/statsd/Android.bp b/hostsidetests/statsd/Android.bp
index 283d650..d418f42 100644
--- a/hostsidetests/statsd/Android.bp
+++ b/hostsidetests/statsd/Android.bp
@@ -29,13 +29,13 @@
"compatibility-host-util",
"cts-tradefed",
"host-libprotobuf-java-full",
- "perfetto_config-full",
"platformprotos",
"tradefed",
"truth-prebuilt",
],
static_libs: [
"core_cts_test_resources",
+ "perfetto_config-full",
],
data: [
"**/*.pbtxt",
diff --git a/hostsidetests/statsd/TEST_MAPPING b/hostsidetests/statsd/TEST_MAPPING
new file mode 100644
index 0000000..f48ff4b
--- /dev/null
+++ b/hostsidetests/statsd/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "postsubmit" : [
+ {
+ "name" : "CtsStatsdHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/statsd/apps/statsdapp/AndroidManifest.xml b/hostsidetests/statsd/apps/statsdapp/AndroidManifest.xml
index 2b479bd..a343fee 100644
--- a/hostsidetests/statsd/apps/statsdapp/AndroidManifest.xml
+++ b/hostsidetests/statsd/apps/statsdapp/AndroidManifest.xml
@@ -15,9 +15,9 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.server.cts.device.statsd"
- android:versionCode="10" >
- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+ package="com.android.server.cts.device.statsd"
+ android:versionCode="10">
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -27,86 +27,92 @@
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
- <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" />
- <uses-permission android:name="android.permission.DUMP" /> <!-- must be granted via pm grant -->
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.READ_SYNC_STATS" />
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
- <uses-permission android:name="android.permission.VIBRATE" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+ <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"/>
+ <uses-permission android:name="android.permission.DUMP"/> <!-- must be granted via pm grant -->
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+ <uses-permission android:name="android.permission.VIBRATE"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
+ <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<application android:label="@string/app_name">
- <uses-library android:name="android.test.runner" />
- <uses-library android:name="org.apache.http.legacy" android:required="false" />
+ <uses-library android:name="android.test.runner"/>
+ <uses-library android:name="org.apache.http.legacy"
+ android:required="false"/>
- <service android:name=".StatsdCtsBackgroundService" android:exported="true" />
- <activity android:name=".StatsdCtsForegroundActivity" android:exported="true" />
+ <service android:name=".StatsdCtsBackgroundService"
+ android:exported="true"/>
+ <activity android:name=".StatsdCtsForegroundActivity"
+ android:exported="true"/>
<service android:name=".StatsdCtsForegroundService"
- android:foregroundServiceType="camera" android:exported="true" />
+ android:foregroundServiceType="camera"
+ android:exported="true"/>
- <activity
- android:name=".VideoPlayerActivity"
- android:label="@string/app_name"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
- android:launchMode="singleTop" >
+ <activity android:name=".VideoPlayerActivity"
+ android:label="@string/app_name"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+ android:launchMode="singleTop"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".DaveyActivity" android:exported="true" />
- <activity android:name=".HiddenApiUsedActivity" android:exported="true" />
- <activity
- android:name=".ANRActivity"
- android:label="ANR Test Activity"
- android:launchMode="singleInstance"
- android:process=":ANRProcess"
- android:exported="true"
- />
+ <activity android:name=".DaveyActivity"
+ android:exported="true"/>
+ <activity android:name=".HiddenApiUsedActivity"
+ android:exported="true"/>
+ <activity android:name=".ANRActivity"
+ android:label="ANR Test Activity"
+ android:launchMode="singleInstance"
+ android:process=":ANRProcess"
+ android:exported="true"/>
<service android:name=".StatsdAuthenticator"
- android:exported="false">
+ android:exported="false">
<intent-filter>
- <action android:name="android.accounts.AccountAuthenticator" />
+ <action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
<meta-data android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/authenticator" />
+ android:resource="@xml/authenticator"/>
</service>
<service android:name="StatsdSyncService"
- android:exported="false" >
+ android:exported="false">
<intent-filter>
- <action android:name="android.content.SyncAdapter" />
+ <action android:name="android.content.SyncAdapter"/>
</intent-filter>
<meta-data android:name="android.content.SyncAdapter"
- android:resource="@xml/syncadapter" />
+ android:resource="@xml/syncadapter"/>
</service>
<provider android:name=".StatsdProvider"
- android:authorities="com.android.server.cts.device.statsd.provider" />
+ android:authorities="com.android.server.cts.device.statsd.provider"/>
<service android:name=".StatsdJobService"
- android:permission="android.permission.BIND_JOB_SERVICE" />
+ android:permission="android.permission.BIND_JOB_SERVICE"/>
<service android:name=".DummyCallscreeningService"
- android:permission="android.permission.BIND_SCREENING_SERVICE">
+ android:permission="android.permission.BIND_SCREENING_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.CallScreeningService" />
+ <action android:name="android.telecom.CallScreeningService"/>
</intent-filter>
</service>
- <service android:name=".IsolatedProcessService" android:isolatedProcess="true" />
+ <service android:name=".IsolatedProcessService"
+ android:isolatedProcess="true"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.server.cts.device.statsd"
- android:label="CTS tests of android.os.statsd stats collection">
+ android:targetPackage="com.android.server.cts.device.statsd"
+ android:label="CTS tests of android.os.statsd stats collection">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
- </instrumentation>/>
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
+ </instrumentation>/>
</manifest>
diff --git a/hostsidetests/statsd/src/android/cts/statsd/validation/ValidationTests.java b/hostsidetests/statsd/src/android/cts/statsd/validation/ValidationTests.java
index 87f6840..3e2de0a 100644
--- a/hostsidetests/statsd/src/android/cts/statsd/validation/ValidationTests.java
+++ b/hostsidetests/statsd/src/android/cts/statsd/validation/ValidationTests.java
@@ -143,7 +143,6 @@
// ADB disconnection causes failure of getUid(). Move up here before turnScreenOff().
final int EXPECTED_UID = getUid();
-
turnScreenOn(); // To ensure that the ScreenOff later gets logged.
// AoD needs to be turned off because the screen should go into an off state. But, if AoD is
// on and the device doesn't support STATE_DOZE, the screen sadly goes back to STATE_ON.
@@ -190,7 +189,7 @@
long statsdDurationMs = statsdWakelockData.get(EXPECTED_UID)
.get(EXPECTED_TAG_HASH) / 1_000_000;
assertWithMessage(
- "Wakelock in statsd with uid %s and tag %s was too short or too long",
+ "Wakelock in statsd with uid %s and tag %s was too short or too long",
EXPECTED_UID, EXPECTED_TAG
).that(statsdDurationMs).isIn(Range.closed((long) MIN_DURATION, (long) MAX_DURATION));
diff --git a/hostsidetests/sustainedperf/TEST_MAPPING b/hostsidetests/sustainedperf/TEST_MAPPING
new file mode 100644
index 0000000..b3f1cff
--- /dev/null
+++ b/hostsidetests/sustainedperf/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsSustainedPerformanceHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/sustainedperf/app/AndroidManifest.xml b/hostsidetests/sustainedperf/app/AndroidManifest.xml
index eff4a7f..7ba4a2b 100755
--- a/hostsidetests/sustainedperf/app/AndroidManifest.xml
+++ b/hostsidetests/sustainedperf/app/AndroidManifest.xml
@@ -16,16 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.test.app">
+ package="android.test.app">
<application>
- <activity android:name=".DeviceTestActivity" >
+ <activity android:name=".DeviceTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/sustainedperf/dhrystone/dhry_1.c b/hostsidetests/sustainedperf/dhrystone/dhry_1.c
index 3682052..fe51acb 100644
--- a/hostsidetests/sustainedperf/dhrystone/dhry_1.c
+++ b/hostsidetests/sustainedperf/dhrystone/dhry_1.c
@@ -82,8 +82,8 @@
Enumeration Enum_Loc;
Str_30 Str_1_Loc;
Str_30 Str_2_Loc;
- REG int Run_Index;
- REG int Number_Of_Runs;
+ REG long Run_Index;
+ REG long Number_Of_Runs;
/* Initializations */
@@ -103,8 +103,8 @@
/* Arr_2_Glob [8][7] would have an undefined value. */
/* Warning: With 16-Bit processors and Number_Of_Runs > 32000, */
/* overflow may occur for this array element. */
- int n;
- scanf ("%d", &n);
+ long n;
+ scanf ("%ld", &n);
Number_Of_Runs = n;
diff --git a/hostsidetests/sustainedperf/shadertoy_android/AndroidManifest.xml b/hostsidetests/sustainedperf/shadertoy_android/AndroidManifest.xml
index 77dee18..91cf3ed 100644
--- a/hostsidetests/sustainedperf/shadertoy_android/AndroidManifest.xml
+++ b/hostsidetests/sustainedperf/shadertoy_android/AndroidManifest.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2009, 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.gputest">
- <application
- android:label="@string/gpustresstest_activity">
- <activity android:name="GPUStressTestActivity"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:launchMode="singleTask"
- android:configChanges="orientation|keyboardHidden">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
- <uses-feature android:glEsVersion="0x00020000"/>
- <uses-sdk android:minSdkVersion="5"/>
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="com.qti.permission.PROFILER" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-</manifest>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2009, 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.gputest">
+ <application android:label="@string/gpustresstest_activity">
+ <activity android:name="GPUStressTestActivity"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:launchMode="singleTask"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+ <uses-feature android:glEsVersion="0x00020000"/>
+ <uses-sdk android:minSdkVersion="5"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="com.qti.permission.PROFILER"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+</manifest>
diff --git a/hostsidetests/systemui/TEST_MAPPING b/hostsidetests/systemui/TEST_MAPPING
new file mode 100644
index 0000000..6680744
--- /dev/null
+++ b/hostsidetests/systemui/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsSystemUiHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/systemui/app/AndroidManifest.xml b/hostsidetests/systemui/app/AndroidManifest.xml
index 30be410..3ca3ef5 100755
--- a/hostsidetests/systemui/app/AndroidManifest.xml
+++ b/hostsidetests/systemui/app/AndroidManifest.xml
@@ -16,35 +16,36 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.systemui.cts">
+ package="android.systemui.cts">
<application>
<service android:name=".TestTileService"
- android:icon="@android:drawable/ic_delete"
- android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+ android:icon="@android:drawable/ic_delete"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.quicksettings.action.QS_TILE" />
+ <action android:name="android.service.quicksettings.action.QS_TILE"/>
</intent-filter>
</service>
<service android:name=".TestActiveTileService"
- android:icon="@android:drawable/ic_delete"
- android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+ android:icon="@android:drawable/ic_delete"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.quicksettings.action.QS_TILE" />
+ <action android:name="android.service.quicksettings.action.QS_TILE"/>
</intent-filter>
<meta-data android:name="android.service.quicksettings.ACTIVE_TILE"
- android:value="true" />
+ android:value="true"/>
</service>
- <receiver
- android:name=".TestActiveTileService$Receiver">
+ <receiver android:name=".TestActiveTileService$Receiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.sysui.testtile.REQUEST_LISTENING" />
+ <action android:name="android.sysui.testtile.REQUEST_LISTENING"/>
</intent-filter>
</receiver>
</application>
</manifest>
-
diff --git a/hostsidetests/tagging/src/com/android/cts/tagging/TaggingDefaultTest.java b/hostsidetests/tagging/src/com/android/cts/tagging/TaggingDefaultTest.java
index 3c4ffc3..777e92c 100644
--- a/hostsidetests/tagging/src/com/android/cts/tagging/TaggingDefaultTest.java
+++ b/hostsidetests/tagging/src/com/android/cts/tagging/TaggingDefaultTest.java
@@ -59,7 +59,7 @@
}
}
- public void testCompatFeatureDisabled() throws Exception {
+ public void testHeapTaggingCompatFeatureDisabled() throws Exception {
if (!supportsTaggedPointers || supportsMemoryTagging) {
return;
}
diff --git a/hostsidetests/testharness/app/AndroidManifest.xml b/hostsidetests/testharness/app/AndroidManifest.xml
index 421894d..8fd4ad1 100755
--- a/hostsidetests/testharness/app/AndroidManifest.xml
+++ b/hostsidetests/testharness/app/AndroidManifest.xml
@@ -16,20 +16,19 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.testharness.app">
+ package="android.testharness.app">
<application>
- <activity android:name=".TestHarnessActivity" >
+ <activity android:name=".TestHarnessActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.testharness.app" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.testharness.app"/>
</manifest>
-
diff --git a/hostsidetests/theme/app/AndroidManifest.xml b/hostsidetests/theme/app/AndroidManifest.xml
index 7487a05..49f2d84 100755
--- a/hostsidetests/theme/app/AndroidManifest.xml
+++ b/hostsidetests/theme/app/AndroidManifest.xml
@@ -16,29 +16,30 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.theme.app">
+ package="android.theme.app">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
<application android:requestLegacyExternalStorage="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name=".ThemeDeviceActivity"
- android:screenOrientation="portrait">
+ android:screenOrientation="portrait"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".GenerateImagesActivity"
- android:screenOrientation="portrait"
- android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|uiMode"
- android:exported="true" />
+ android:screenOrientation="portrait"
+ android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|uiMode"
+ android:exported="true"/>
</application>
<!-- self-instrumenting test package. -->
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.theme.app"
- android:label="Generates Theme reference images"/>
+ android:targetPackage="android.theme.app"
+ android:label="Generates Theme reference images"/>
</manifest>
diff --git a/hostsidetests/trustedvoice/TEST_MAPPING b/hostsidetests/trustedvoice/TEST_MAPPING
new file mode 100644
index 0000000..fb71ad2
--- /dev/null
+++ b/hostsidetests/trustedvoice/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsTrustedVoiceHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/trustedvoice/app/AndroidManifest.xml b/hostsidetests/trustedvoice/app/AndroidManifest.xml
index f54af61..7a0d23c 100755
--- a/hostsidetests/trustedvoice/app/AndroidManifest.xml
+++ b/hostsidetests/trustedvoice/app/AndroidManifest.xml
@@ -16,18 +16,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.trustedvoice.app">
+ package="android.trustedvoice.app">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application>
<activity android:name=".TrustedVoiceActivity"
- android:turnScreenOn="true">
+ android:turnScreenOn="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/tv/TEST_MAPPING b/hostsidetests/tv/TEST_MAPPING
new file mode 100644
index 0000000..56367b9
--- /dev/null
+++ b/hostsidetests/tv/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsHostsideTvTests"
+ }
+ ]
+}
diff --git a/hostsidetests/tv/app/AndroidManifest.xml b/hostsidetests/tv/app/AndroidManifest.xml
index bec7daa..09ac6a3 100644
--- a/hostsidetests/tv/app/AndroidManifest.xml
+++ b/hostsidetests/tv/app/AndroidManifest.xml
@@ -15,22 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.tv.hostside">
+ package="com.android.cts.tv.hostside">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name=".StubTvInputService"
- android:permission="android.permission.BIND_TV_INPUT">
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:exported="true">
<intent-filter>
<action android:name="android.media.tv.TvInputService"/>
</intent-filter>
<meta-data android:name="android.media.tv.input"
- android:resource="@xml/stub_tv_input_service" />
+ android:resource="@xml/stub_tv_input_service"/>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.tv.hostside" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.tv.hostside"/>
</manifest>
diff --git a/hostsidetests/tv/app2/AndroidManifest.xml b/hostsidetests/tv/app2/AndroidManifest.xml
index 5b0f7b6..66a6d1b 100644
--- a/hostsidetests/tv/app2/AndroidManifest.xml
+++ b/hostsidetests/tv/app2/AndroidManifest.xml
@@ -15,20 +15,20 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.tv.hostside.app2">
+ package="com.android.cts.tv.hostside.app2">
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="com.android.cts.tv.hostside.app2.TvViewMonitorActivity" >
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="com.android.cts.tv.hostside.app2.TvViewMonitorActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.tv.hostside.app2" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.tv.hostside.app2"/>
</manifest>
diff --git a/hostsidetests/tzdata/TEST_MAPPING b/hostsidetests/tzdata/TEST_MAPPING
new file mode 100644
index 0000000..cb259b1
--- /dev/null
+++ b/hostsidetests/tzdata/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsHostTzDataTests"
+ }
+ ]
+}
diff --git a/hostsidetests/ui/appA/AndroidManifest.xml b/hostsidetests/ui/appA/AndroidManifest.xml
index 8d574d5..4d64df4 100644
--- a/hostsidetests/ui/appA/AndroidManifest.xml
+++ b/hostsidetests/ui/appA/AndroidManifest.xml
@@ -15,29 +15,29 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.taskswitching.appa"
- android:targetSandboxVersion="2">
+ package="android.taskswitching.appa"
+ android:targetSandboxVersion="2">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name=".AppAActivity"
- android:screenOrientation="portrait" >
+ <activity android:name=".AppAActivity"
+ android:screenOrientation="portrait"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="foo.com" />
- <data android:path="/appa" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="foo.com"/>
+ <data android:path="/appa"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.taskswitching.appa" />
+ android:targetPackage="android.taskswitching.appa"/>
</manifest>
diff --git a/hostsidetests/ui/appB/AndroidManifest.xml b/hostsidetests/ui/appB/AndroidManifest.xml
index 9b370c1..ca53ae4 100644
--- a/hostsidetests/ui/appB/AndroidManifest.xml
+++ b/hostsidetests/ui/appB/AndroidManifest.xml
@@ -15,32 +15,32 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.taskswitching.appb"
- android:targetSandboxVersion="2">
+ package="android.taskswitching.appb"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name=".AppBActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
- android:screenOrientation="portrait" >
+ <activity android:name=".AppBActivity"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+ android:screenOrientation="portrait"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="foo.com" />
- <data android:path="/appb" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="foo.com"/>
+ <data android:path="/appb"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.taskswitching.appb" />
+ android:targetPackage="android.taskswitching.appb"/>
</manifest>
diff --git a/hostsidetests/usage/Android.bp b/hostsidetests/usage/Android.bp
index e5aacfd..7871e4a 100644
--- a/hostsidetests/usage/Android.bp
+++ b/hostsidetests/usage/Android.bp
@@ -26,5 +26,6 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
}
diff --git a/hostsidetests/usage/AndroidTest.xml b/hostsidetests/usage/AndroidTest.xml
index 5c9b845..a29a7b2 100644
--- a/hostsidetests/usage/AndroidTest.xml
+++ b/hostsidetests/usage/AndroidTest.xml
@@ -28,4 +28,9 @@
<option name="jar" value="CtsAppUsageHostTestCases.jar" />
<option name="runtime-hint" value="2m" />
</test>
+
+ <object type="module_controller"
+ class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+ <option name="mainline-module-package-name" value="android.scheduling"/>
+ </object>
</configuration>
diff --git a/hostsidetests/usage/TEST_MAPPING b/hostsidetests/usage/TEST_MAPPING
new file mode 100644
index 0000000..6d04088
--- /dev/null
+++ b/hostsidetests/usage/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAppUsageHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/usage/app/Android.bp b/hostsidetests/usage/app/Android.bp
index 57e6fc7..323be9b 100644
--- a/hostsidetests/usage/app/Android.bp
+++ b/hostsidetests/usage/app/Android.bp
@@ -22,6 +22,7 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
}
@@ -37,6 +38,7 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
aaptflags: [
"--rename-manifest-package",
diff --git a/hostsidetests/usage/app/AndroidManifest.xml b/hostsidetests/usage/app/AndroidManifest.xml
index 303c26f..2541659 100755
--- a/hostsidetests/usage/app/AndroidManifest.xml
+++ b/hostsidetests/usage/app/AndroidManifest.xml
@@ -16,15 +16,15 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.app.usage.app">
+ package="android.app.usage.app">
<application>
- <activity android:name="android.app.usage.app.TestActivity">
+ <activity android:name="android.app.usage.app.TestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/hostsidetests/usb/TEST_MAPPING b/hostsidetests/usb/TEST_MAPPING
new file mode 100644
index 0000000..502f1e8
--- /dev/null
+++ b/hostsidetests/usb/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsUsbTests"
+ }
+ ]
+}
diff --git a/hostsidetests/userspacereboot/testapps/BasicTestApp/AndroidManifest.xml b/hostsidetests/userspacereboot/testapps/BasicTestApp/AndroidManifest.xml
index c5536b5..333a8a5 100644
--- a/hostsidetests/userspacereboot/testapps/BasicTestApp/AndroidManifest.xml
+++ b/hostsidetests/userspacereboot/testapps/BasicTestApp/AndroidManifest.xml
@@ -16,33 +16,34 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.userspacereboot.basic" >
+ package="com.android.cts.userspacereboot.basic">
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<application android:forceQueryable="true">
- <activity android:name=".LauncherActivity">
+ <activity android:name=".LauncherActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<receiver android:name=".BasicUserspaceRebootTest$BootReceiver"
- android:exported="true"
- android:directBootAware="true">
+ android:exported="true"
+ android:directBootAware="true">
<intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
- <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+ <action android:name="android.intent.action.BOOT_COMPLETED"/>
+ <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<provider android:name=".BasicUserspaceRebootTest$Provider"
- android:authorities="com.android.cts.userspacereboot.basic"
- android:exported="true"
- android:directBootAware="true">
+ android:authorities="com.android.cts.userspacereboot.basic"
+ android:exported="true"
+ android:directBootAware="true">
</provider>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.userspacereboot.basic"
- android:label="Basic userspace reboot device side tests"/>
+ android:targetPackage="com.android.cts.userspacereboot.basic"
+ android:label="Basic userspace reboot device side tests"/>
</manifest>
diff --git a/hostsidetests/webkit/TEST_MAPPING b/hostsidetests/webkit/TEST_MAPPING
new file mode 100644
index 0000000..fcd8ab5
--- /dev/null
+++ b/hostsidetests/webkit/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsHostsideWebViewTests"
+ }
+ ]
+}
diff --git a/hostsidetests/webkit/app/AndroidManifest.xml b/hostsidetests/webkit/app/AndroidManifest.xml
index b7b17db..2e3ead5 100644
--- a/hostsidetests/webkit/app/AndroidManifest.xml
+++ b/hostsidetests/webkit/app/AndroidManifest.xml
@@ -15,30 +15,30 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.webkit" android:targetSandboxVersion="2">
+ package="com.android.cts.webkit"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
- <application
- android:maxRecents="1"
- android:usesCleartextTraffic="true" >
- <uses-library android:name="org.apache.http.legacy" />
- <uses-library android:name="android.test.runner" />
+ <application android:maxRecents="1"
+ android:usesCleartextTraffic="true">
+ <uses-library android:name="org.apache.http.legacy"/>
+ <uses-library android:name="android.test.runner"/>
<activity android:name=".WebViewStartupCtsActivity"
- android:label="WebViewStartupCtsActivity"
- android:screenOrientation="nosensor">
+ android:label="WebViewStartupCtsActivity"
+ android:screenOrientation="nosensor"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.webkit"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.webkit"/>
</manifest>
diff --git a/hostsidetests/wifibroadcasts/TEST_MAPPING b/hostsidetests/wifibroadcasts/TEST_MAPPING
new file mode 100644
index 0000000..d740fae
--- /dev/null
+++ b/hostsidetests/wifibroadcasts/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsWifiBroadcastsHostTestCases"
+ }
+ ]
+}
diff --git a/hostsidetests/wifibroadcasts/app/AndroidManifest.xml b/hostsidetests/wifibroadcasts/app/AndroidManifest.xml
index 7bc2d00..5e29ffc 100644
--- a/hostsidetests/wifibroadcasts/app/AndroidManifest.xml
+++ b/hostsidetests/wifibroadcasts/app/AndroidManifest.xml
@@ -16,16 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.wifibroadcasts.app">
+ package="android.wifibroadcasts.app">
<application>
- <activity android:name=".WifiBroadcastsDeviceActivity" >
+ <activity android:name=".WifiBroadcastsDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/libs/input/src/com/android/cts/input/HidDevice.java b/libs/input/src/com/android/cts/input/HidDevice.java
index 173531a..d584972 100644
--- a/libs/input/src/com/android/cts/input/HidDevice.java
+++ b/libs/input/src/com/android/cts/input/HidDevice.java
@@ -88,7 +88,9 @@
// Even though the device has been added, it still may not be ready to process the events
// right away. This seems to be a kernel bug.
// Add a small delay here to ensure device is "ready".
- SystemClock.sleep(500);
+ // Some kernel drivers will enumrate multiple input device interfaces and needs longer
+ // wait before device is responsive to HID reports.
+ SystemClock.sleep(20000);
}
/**
diff --git a/libs/install/Android.bp b/libs/install/Android.bp
index 0e1ebb0..54f9d5c 100644
--- a/libs/install/Android.bp
+++ b/libs/install/Android.bp
@@ -65,6 +65,14 @@
}
android_test_helper_app {
+ name: "TestAppBv3",
+ manifest: "testapp/Bv3.xml",
+ sdk_version: "current",
+ srcs: ["testapp/src/**/*.java"],
+ resource_dirs: ["testapp/res_v3"],
+}
+
+android_test_helper_app {
name: "TestAppCv1",
manifest: "testapp/Cv1.xml",
sdk_version: "current",
@@ -73,6 +81,14 @@
}
android_test_helper_app {
+ name: "TestAppCv2",
+ manifest: "testapp/Cv2.xml",
+ sdk_version: "current",
+ srcs: ["testapp/src/**/*.java"],
+ resource_dirs: ["testapp/res_v2"],
+}
+
+android_test_helper_app {
name: "TestAppASplitV1",
manifest: "testapp/Av1.xml",
sdk_version: "current",
@@ -93,7 +109,12 @@
java_library {
name: "cts-install-lib",
srcs: ["src/**/*.java"],
- static_libs: ["androidx.test.rules", "compatibility-device-util-axt", "truth-prebuilt"],
+ static_libs: [
+ "androidx.test.rules",
+ "compatibility-device-util-axt",
+ "cts-shim-lib",
+ "truth-prebuilt"
+ ],
sdk_version: "test_current",
java_resources: [
":TestAppAv1",
@@ -101,7 +122,9 @@
":TestAppAv3",
":TestAppBv1",
":TestAppBv2",
+ ":TestAppBv3",
":TestAppCv1",
+ ":TestAppCv2",
":TestAppACrashingV2",
":TestAppASplitV1",
":TestAppASplitV2",
diff --git a/libs/install/src/com/android/cts/install/lib/Install.java b/libs/install/src/com/android/cts/install/lib/Install.java
index cd18906..9f278a0 100644
--- a/libs/install/src/com/android/cts/install/lib/Install.java
+++ b/libs/install/src/com/android/cts/install/lib/Install.java
@@ -154,17 +154,10 @@
int sessionId = createSession();
try (PackageInstaller.Session session =
InstallUtils.openPackageInstallerSession(sessionId)) {
- session.commit(LocalIntentSender.getIntentSender());
- Intent result = LocalIntentSender.getIntentSenderResult();
- int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,
- PackageInstaller.STATUS_FAILURE);
- if (status == -1) {
- throw new AssertionError("PENDING USER ACTION");
- } else if (status > 0) {
- String message = result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
- throw new AssertionError(message == null ? "UNKNOWN FAILURE" : message);
- }
-
+ LocalIntentSender sender = new LocalIntentSender();
+ session.commit(sender.getIntentSender());
+ Intent result = sender.getResult();
+ InstallUtils.assertStatusSuccess(result);
if (mIsStaged) {
InstallUtils.waitForSessionReady(sessionId);
}
diff --git a/libs/install/src/com/android/cts/install/lib/InstallUtils.java b/libs/install/src/com/android/cts/install/lib/InstallUtils.java
index 9a8cfbd..eecfa74 100644
--- a/libs/install/src/com/android/cts/install/lib/InstallUtils.java
+++ b/libs/install/src/com/android/cts/install/lib/InstallUtils.java
@@ -17,9 +17,11 @@
package com.android.cts.install.lib;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.fail;
+import android.app.UiAutomation;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -31,6 +33,7 @@
import android.content.pm.PackageManager;
import android.os.Handler;
import android.os.HandlerThread;
+import android.os.SystemClock;
import androidx.test.InstrumentationRegistry;
@@ -41,6 +44,7 @@
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
/**
* Utilities to facilitate installation in tests.
@@ -48,25 +52,31 @@
public class InstallUtils {
private static final int NUM_MAX_POLLS = 5;
private static final int POLL_WAIT_TIME_MILLIS = 200;
+ private static final long GET_UIAUTOMATION_TIMEOUT_MS = 60000;
+
+ private static UiAutomation getUiAutomation() {
+ final long start = SystemClock.uptimeMillis();
+ while (SystemClock.uptimeMillis() - start < GET_UIAUTOMATION_TIMEOUT_MS) {
+ UiAutomation ui = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+ if (ui != null) {
+ return ui;
+ }
+ }
+ throw new AssertionError("Failed to get UiAutomation");
+ }
/**
* Adopts the given shell permissions.
*/
public static void adoptShellPermissionIdentity(String... permissions) {
- InstrumentationRegistry
- .getInstrumentation()
- .getUiAutomation()
- .adoptShellPermissionIdentity(permissions);
+ getUiAutomation().adoptShellPermissionIdentity(permissions);
}
/**
* Drops all shell permissions.
*/
public static void dropShellPermissionIdentity() {
- InstrumentationRegistry
- .getInstrumentation()
- .getUiAutomation()
- .dropShellPermissionIdentity();
+ getUiAutomation().dropShellPermissionIdentity();
}
/**
* Returns the version of the given package installed on device.
@@ -84,10 +94,9 @@
}
/**
- * Waits for the given session to be marked as ready.
- * Throws an assertion if the session fails.
+ * Waits for the given session to be marked as ready or failed and returns it.
*/
- public static void waitForSessionReady(int sessionId) {
+ public static PackageInstaller.SessionInfo waitForSession(int sessionId) {
BlockingQueue<PackageInstaller.SessionInfo> sessionStatus = new LinkedBlockingQueue<>();
BroadcastReceiver sessionUpdatedReceiver = new BroadcastReceiver() {
@Override
@@ -118,18 +127,30 @@
if (info.isStagedSessionReady() || info.isStagedSessionFailed()) {
sessionStatus.put(info);
}
-
- info = sessionStatus.take();
+ info = sessionStatus.poll(60, TimeUnit.SECONDS);
context.unregisterReceiver(sessionUpdatedReceiver);
- if (info.isStagedSessionFailed()) {
- throw new AssertionError(info.getStagedSessionErrorMessage());
- }
+ assertWithMessage("Timed out while waiting for session to get ready/failed")
+ .that(info).isNotNull();
+ assertThat(info.getSessionId()).isEqualTo(sessionId);
+ return info;
} catch (InterruptedException e) {
throw new AssertionError(e);
}
}
/**
+ * Waits for the given session to be marked as ready.
+ * Throws an assertion if the session fails.
+ */
+ public static void waitForSessionReady(int sessionId) {
+ PackageInstaller.SessionInfo info = waitForSession(sessionId);
+ // TODO: migrate to PackageInstallerSessionInfoSubject
+ if (info.isStagedSessionFailed()) {
+ throw new AssertionError(info.getStagedSessionErrorMessage());
+ }
+ }
+
+ /**
* Returns the info for the given package name.
*/
public static PackageInfo getPackageInfo(String packageName) {
diff --git a/libs/install/src/com/android/cts/install/lib/LocalIntentSender.java b/libs/install/src/com/android/cts/install/lib/LocalIntentSender.java
index 4560ab1..cd0a6c1 100644
--- a/libs/install/src/com/android/cts/install/lib/LocalIntentSender.java
+++ b/libs/install/src/com/android/cts/install/lib/LocalIntentSender.java
@@ -22,7 +22,9 @@
import android.content.Intent;
import android.content.IntentSender;
import android.content.pm.PackageInstaller;
+import android.os.SystemClock;
import android.util.Log;
+import android.util.SparseArray;
import androidx.test.InstrumentationRegistry;
@@ -35,46 +37,62 @@
*/
public class LocalIntentSender extends BroadcastReceiver {
private static final String TAG = "cts.install.lib";
+ private static final String EXTRA_REQUEST_ID = LocalIntentSender.class.getName() + ".ID";
+ // Access to this member must be synchronized because it is used by multiple threads
+ private static final SparseArray<BlockingQueue<Intent>> sResults = new SparseArray<>();
- private static final BlockingQueue<Intent> sIntentSenderResults = new LinkedBlockingQueue<>();
+ // Generate a unique id to ensure each LocalIntentSender gets its own results.
+ private final int mRequestId = (int) SystemClock.elapsedRealtime();
@Override
public void onReceive(Context context, Intent intent) {
Log.i(TAG, "Received intent " + prettyPrint(intent));
- sIntentSenderResults.add(intent);
+ int id = intent.getIntExtra(EXTRA_REQUEST_ID, 0);
+ BlockingQueue<Intent> queue = getQueue(id);
+ // queue will be null if this broadcast comes from the session staged in previous tests
+ if (queue != null) {
+ queue.add(intent);
+ }
}
/**
* Get a LocalIntentSender.
*/
- public static IntentSender getIntentSender() {
+ public IntentSender getIntentSender() {
+ addQueue(mRequestId);
Context context = InstrumentationRegistry.getContext();
Intent intent = new Intent(context, LocalIntentSender.class);
- PendingIntent pending = PendingIntent.getBroadcast(context, 0, intent, 0);
+ intent.putExtra(EXTRA_REQUEST_ID, mRequestId);
+ PendingIntent pending = PendingIntent.getBroadcast(context, mRequestId, intent, 0);
return pending.getIntentSender();
}
/**
- * Returns the most recent Intent sent by a LocalIntentSender.
+ * Returns and remove the most early Intent received by this LocalIntentSender.
*/
- public static Intent getIntentSenderResult() throws InterruptedException {
- Intent intent = sIntentSenderResults.take();
+ public Intent getResult() throws InterruptedException {
+ Intent intent = getQueue(mRequestId).take();
Log.i(TAG, "Taking intent " + prettyPrint(intent));
return intent;
}
/**
- * Returns an Intent that targets the given {@code sessionId}, while discarding others.
+ * Returns the most recent Intent sent by a LocalIntentSender.
+ * TODO(b/136260017): To be removed when all callers are cleaned up.
*/
- public static Intent getIntentSenderResult(int sessionId) throws InterruptedException {
- while (true) {
- Intent intent = sIntentSenderResults.take();
- if (intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1) == sessionId) {
- Log.i(TAG, "Taking intent " + prettyPrint(intent));
- return intent;
- } else {
- Log.i(TAG, "Discarding intent " + prettyPrint(intent));
- }
+ public static Intent getIntentSenderResult() throws InterruptedException {
+ return null;
+ }
+
+ private static BlockingQueue<Intent> getQueue(int requestId) {
+ synchronized (sResults) {
+ return sResults.get(requestId);
+ }
+ }
+
+ private static void addQueue(int requestId) {
+ synchronized (sResults) {
+ sResults.append(requestId, new LinkedBlockingQueue<>());
}
}
@@ -82,11 +100,13 @@
int sessionId = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1);
int status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS,
PackageInstaller.STATUS_FAILURE);
+ int id = intent.getIntExtra(EXTRA_REQUEST_ID, 0);
String message = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
return String.format("%s: {\n"
+ + "requestId = %d\n"
+ "sessionId = %d\n"
+ "status = %d\n"
+ "message = %s\n"
- + "}", intent, sessionId, status, message);
+ + "}", intent, id, sessionId, status, message);
}
}
diff --git a/libs/install/src/com/android/cts/install/lib/TestApp.java b/libs/install/src/com/android/cts/install/lib/TestApp.java
index cb77517..4ff5b99 100644
--- a/libs/install/src/com/android/cts/install/lib/TestApp.java
+++ b/libs/install/src/com/android/cts/install/lib/TestApp.java
@@ -16,6 +16,8 @@
package com.android.cts.install.lib;
+import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
+
import android.content.pm.VersionedPackage;
import java.io.File;
@@ -28,11 +30,10 @@
* Collection of dummy apps used in tests.
*/
public class TestApp {
+
public static final String A = "com.android.cts.install.lib.testapp.A";
public static final String B = "com.android.cts.install.lib.testapp.B";
public static final String C = "com.android.cts.install.lib.testapp.C";
- public static final String Apex = "com.android.apex.cts.shim";
- public static final String NotPreInstalledApex = "com.android.apex.cts.shim_not_pre_installed";
// Apk collection
public static final TestApp A1 = new TestApp("Av1", A, 1, /*isApex*/false,
@@ -52,17 +53,21 @@
"TestAppBv1.apk");
public static final TestApp B2 = new TestApp("Bv2", B, 2, /*isApex*/false,
"TestAppBv2.apk");
+ public static final TestApp B3 = new TestApp("Bv3", B, 3, /*isApex*/false,
+ "TestAppBv3.apk");
public static final TestApp C1 = new TestApp("Cv1", C, 1, /*isApex*/false,
"TestAppCv1.apk");
+ public static final TestApp C2 = new TestApp("Cv2", C, 2, /*isApex*/false,
+ "TestAppCv2.apk");
// Apex collection
- public static final TestApp Apex1 = new TestApp("Apex1", Apex, 1, /*isApex*/true,
- "com.android.apex.cts.shim.v1.apex");
- public static final TestApp Apex2 = new TestApp("Apex2", Apex, 2, /*isApex*/true,
- "com.android.apex.cts.shim.v2.apex");
- public static final TestApp Apex3 = new TestApp("Apex3", Apex, 3, /*isApex*/true,
- "com.android.apex.cts.shim.v3.apex");
+ public static final TestApp Apex1 = new TestApp("Apex1", SHIM_APEX_PACKAGE_NAME, 1,
+ /*isApex*/true, "com.android.apex.cts.shim.v1.apex");
+ public static final TestApp Apex2 = new TestApp("Apex2", SHIM_APEX_PACKAGE_NAME, 2,
+ /*isApex*/true, "com.android.apex.cts.shim.v2.apex");
+ public static final TestApp Apex3 = new TestApp("Apex3", SHIM_APEX_PACKAGE_NAME, 3,
+ /*isApex*/true, "com.android.apex.cts.shim.v3.apex");
private final String mName;
private final String mPackageName;
diff --git a/libs/install/src/com/android/cts/install/lib/Uninstall.java b/libs/install/src/com/android/cts/install/lib/Uninstall.java
index 0444130..899bd11 100644
--- a/libs/install/src/com/android/cts/install/lib/Uninstall.java
+++ b/libs/install/src/com/android/cts/install/lib/Uninstall.java
@@ -46,7 +46,8 @@
Context context = InstrumentationRegistry.getContext();
PackageManager packageManager = context.getPackageManager();
PackageInstaller packageInstaller = packageManager.getPackageInstaller();
- packageInstaller.uninstall(packageName, LocalIntentSender.getIntentSender());
- InstallUtils.assertStatusSuccess(LocalIntentSender.getIntentSenderResult());
+ LocalIntentSender sender = new LocalIntentSender();
+ packageInstaller.uninstall(packageName, sender.getIntentSender());
+ InstallUtils.assertStatusSuccess(sender.getResult());
}
}
diff --git a/libs/install/testapp/ACrashingV2.xml b/libs/install/testapp/ACrashingV2.xml
index 0ec90cf..d7b4edd 100644
--- a/libs/install/testapp/ACrashingV2.xml
+++ b/libs/install/testapp/ACrashingV2.xml
@@ -15,21 +15,23 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.install.lib.testapp.A"
- android:versionCode="2"
- android:versionName="2.0" >
+ package="com.android.cts.install.lib.testapp.A"
+ android:versionCode="2"
+ android:versionName="2.0">
- <uses-sdk android:minSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="19"/>
- <application android:label="Test App A v2" android:forceQueryable="true">
+ <application android:label="Test App A v2"
+ android:forceQueryable="true">
<receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
- android:exported="true" />
- <activity android:name="com.android.cts.install.lib.testapp.CrashingMainActivity">
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.CrashingMainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/>
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/libs/install/testapp/Av1.xml b/libs/install/testapp/Av1.xml
index 5b47699..b8f9302 100644
--- a/libs/install/testapp/Av1.xml
+++ b/libs/install/testapp/Av1.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.install.lib.testapp.A"
- android:versionCode="1"
- android:versionName="1.0" >
+ package="com.android.cts.install.lib.testapp.A"
+ android:versionCode="1"
+ android:versionName="1.0">
- <uses-sdk android:minSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="19"/>
- <application android:label="Test App A1" android:forceQueryable="true">
+ <application android:label="Test App A1"
+ android:forceQueryable="true">
<receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
- android:exported="true" />
- <activity android:name="com.android.cts.install.lib.testapp.MainActivity">
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/libs/install/testapp/Av2.xml b/libs/install/testapp/Av2.xml
index 9f2c21a..fae55e8 100644
--- a/libs/install/testapp/Av2.xml
+++ b/libs/install/testapp/Av2.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.install.lib.testapp.A"
- android:versionCode="2"
- android:versionName="2.0" >
+ package="com.android.cts.install.lib.testapp.A"
+ android:versionCode="2"
+ android:versionName="2.0">
- <uses-sdk android:minSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="19"/>
- <application android:label="Test App A2" android:forceQueryable="true">
+ <application android:label="Test App A2"
+ android:forceQueryable="true">
<receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
- android:exported="true" />
- <activity android:name="com.android.cts.install.lib.testapp.MainActivity">
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/libs/install/testapp/Av3.xml b/libs/install/testapp/Av3.xml
index d86aebd..656e242 100644
--- a/libs/install/testapp/Av3.xml
+++ b/libs/install/testapp/Av3.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.install.lib.testapp.A"
- android:versionCode="3"
- android:versionName="3.0" >
+ package="com.android.cts.install.lib.testapp.A"
+ android:versionCode="3"
+ android:versionName="3.0">
- <uses-sdk android:minSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="19"/>
- <application android:label="Test App A3" android:forceQueryable="true">
+ <application android:label="Test App A3"
+ android:forceQueryable="true">
<receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
- android:exported="true" />
- <activity android:name="com.android.cts.install.lib.testapp.MainActivity">
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/libs/install/testapp/Bv1.xml b/libs/install/testapp/Bv1.xml
index f990713..c3e470f 100644
--- a/libs/install/testapp/Bv1.xml
+++ b/libs/install/testapp/Bv1.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.install.lib.testapp.B"
- android:versionCode="1"
- android:versionName="1.0" >
+ package="com.android.cts.install.lib.testapp.B"
+ android:versionCode="1"
+ android:versionName="1.0">
- <uses-sdk android:minSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="19"/>
- <application android:label="Test App B1" android:forceQueryable="true">
+ <application android:label="Test App B1"
+ android:forceQueryable="true">
<receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
- android:exported="true" />
- <activity android:name="com.android.cts.install.lib.testapp.MainActivity">
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/libs/install/testapp/Bv2.xml b/libs/install/testapp/Bv2.xml
index 3bd7292..b0b5f7a 100644
--- a/libs/install/testapp/Bv2.xml
+++ b/libs/install/testapp/Bv2.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.install.lib.testapp.B"
- android:versionCode="2"
- android:versionName="2.0" >
+ package="com.android.cts.install.lib.testapp.B"
+ android:versionCode="2"
+ android:versionName="2.0">
- <uses-sdk android:minSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="19"/>
- <application android:label="Test App B2" android:forceQueryable="true">
+ <application android:label="Test App B2"
+ android:forceQueryable="true">
<receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
- android:exported="true" />
- <activity android:name="com.android.cts.install.lib.testapp.MainActivity">
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/libs/install/testapp/Bv3.xml b/libs/install/testapp/Bv3.xml
new file mode 100644
index 0000000..d8b23b5
--- /dev/null
+++ b/libs/install/testapp/Bv3.xml
@@ -0,0 +1,37 @@
+<?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="com.android.cts.install.lib.testapp.B"
+ android:versionCode="3"
+ android:versionName="3.0">
+
+
+ <uses-sdk android:minSdkVersion="19"/>
+
+ <application android:label="Test App B3"
+ android:forceQueryable="true">
+ <receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+</manifest>
diff --git a/libs/install/testapp/Cv1.xml b/libs/install/testapp/Cv1.xml
index 32f6989..bf0204c 100644
--- a/libs/install/testapp/Cv1.xml
+++ b/libs/install/testapp/Cv1.xml
@@ -16,20 +16,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.install.lib.testapp.C"
- android:versionCode="1"
- android:versionName="1.0" >
+ package="com.android.cts.install.lib.testapp.C"
+ android:versionCode="1"
+ android:versionName="1.0">
- <uses-sdk android:minSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="19"/>
- <application android:label="Test App C1" android:forceQueryable="true">
+ <application android:label="Test App C1"
+ android:forceQueryable="true">
<receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
- android:exported="true" />
- <activity android:name="com.android.cts.install.lib.testapp.MainActivity">
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/libs/install/testapp/Cv2.xml b/libs/install/testapp/Cv2.xml
new file mode 100644
index 0000000..66e8978
--- /dev/null
+++ b/libs/install/testapp/Cv2.xml
@@ -0,0 +1,39 @@
+<?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="com.android.cts.install.lib.testapp.C"
+ android:versionCode="2"
+ android:versionName="2.0">
+
+
+ <uses-sdk android:minSdkVersion="19"/>
+
+ <application android:label="Test App C2"
+ android:forceQueryable="true"
+ android:rollbackDataPolicy="wipe">
+ <receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
+ android:exported="true"/>
+ <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+</manifest>
diff --git a/libs/rollback/src/com/android/cts/rollback/lib/RollbackUtils.java b/libs/rollback/src/com/android/cts/rollback/lib/RollbackUtils.java
index 4d8a3b9..c37aafc 100644
--- a/libs/rollback/src/com/android/cts/rollback/lib/RollbackUtils.java
+++ b/libs/rollback/src/com/android/cts/rollback/lib/RollbackUtils.java
@@ -126,8 +126,9 @@
}
RollbackManager rm = getRollbackManager();
- rm.commitRollback(rollbackId, causes, LocalIntentSender.getIntentSender());
- Intent result = LocalIntentSender.getIntentSenderResult();
+ LocalIntentSender sender = new LocalIntentSender();
+ rm.commitRollback(rollbackId, causes, sender.getIntentSender());
+ Intent result = sender.getResult();
int status = result.getIntExtra(RollbackManager.EXTRA_STATUS,
RollbackManager.STATUS_FAILURE);
if (status != RollbackManager.STATUS_SUCCESS) {
diff --git a/libs/shim/Android.bp b/libs/shim/Android.bp
new file mode 100644
index 0000000..908cd8e
--- /dev/null
+++ b/libs/shim/Android.bp
@@ -0,0 +1,28 @@
+//
+// 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.
+//
+
+java_library {
+ name: "cts-shim-lib",
+ host_supported: true,
+ srcs: ["src/**/*.java"],
+ sdk_version: "current",
+}
+
+// Compatibility version of host library
+java_library_host {
+ name: "cts-shim-host-lib",
+ static_libs: ["cts-shim-lib"],
+}
diff --git a/libs/shim/src/com/android/cts/shim/lib/ShimPackage.java b/libs/shim/src/com/android/cts/shim/lib/ShimPackage.java
new file mode 100644
index 0000000..a357941
--- /dev/null
+++ b/libs/shim/src/com/android/cts/shim/lib/ShimPackage.java
@@ -0,0 +1,49 @@
+/*
+ * 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 com.android.cts.shim.lib;
+
+/**
+ * The constants about shim package.
+ */
+public class ShimPackage {
+
+ /**
+ * Package name of the privileged CTS shim apk
+ */
+ public static final String PRIVILEGED_SHIM_PACKAGE_NAME = "com.android.cts.priv.ctsshim";
+
+ /**
+ * Package name of the system CTS shim apk
+ */
+ public static final String SHIM_PACKAGE_NAME = "com.android.cts.ctsshim";
+
+ /**
+ * Package name of the system CTS shim apex
+ */
+ public static final String SHIM_APEX_PACKAGE_NAME = "com.android.apex.cts.shim";
+
+ /**
+ * Package name of the non pre-installed CTS shim apex
+ */
+ public static final String NOT_PRE_INSTALL_APEX_PACKAGE_NAME =
+ "com.android.apex.cts.shim_not_pre_installed";
+
+ /**
+ * Package name of the CTS shim apex that has the different package name
+ */
+ public static final String DIFFERENT_APEX_PACKAGE_NAME = "com.android.apex.cts.shim.different";
+}
diff --git a/suite/audio_quality/client/AndroidManifest.xml b/suite/audio_quality/client/AndroidManifest.xml
index 70a6b7e..ad6eca1 100644
--- a/suite/audio_quality/client/AndroidManifest.xml
+++ b/suite/audio_quality/client/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!-- Copyright (C) 2012 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,23 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.audiotest" >
-<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ package="com.android.cts.audiotest">
+<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
- <application
- android:label="@string/app_name" >
- <activity
- android:name=".CtsAudioClientActivity"
- android:label="@string/app_name"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" >
+ <application android:label="@string/app_name">
+ <activity android:name=".CtsAudioClientActivity"
+ android:label="@string/app_name"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/AlarmManager/Android.bp b/tests/AlarmManager/Android.bp
index 204f5a3..5a3f127 100644
--- a/tests/AlarmManager/Android.bp
+++ b/tests/AlarmManager/Android.bp
@@ -28,6 +28,7 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
platform_apis: true,
}
diff --git a/tests/AlarmManager/AndroidTest.xml b/tests/AlarmManager/AndroidTest.xml
index 4369acc..d4bbeae 100644
--- a/tests/AlarmManager/AndroidTest.xml
+++ b/tests/AlarmManager/AndroidTest.xml
@@ -32,4 +32,8 @@
<option name="runtime-hint" value="1m" />
</test>
+ <object type="module_controller"
+ class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+ <option name="mainline-module-package-name" value="android.scheduling"/>
+ </object>
</configuration>
diff --git a/tests/AlarmManager/TEST_MAPPING b/tests/AlarmManager/TEST_MAPPING
new file mode 100644
index 0000000..e80fa11
--- /dev/null
+++ b/tests/AlarmManager/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAlarmManagerTestCases"
+ }
+ ]
+}
diff --git a/tests/AlarmManager/app/Android.bp b/tests/AlarmManager/app/Android.bp
index faf64a7..af435e0 100644
--- a/tests/AlarmManager/app/Android.bp
+++ b/tests/AlarmManager/app/Android.bp
@@ -20,6 +20,7 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
srcs: ["src/**/*.java"],
dex_preopt: {
diff --git a/tests/BlobStore/OWNERS b/tests/BlobStore/OWNERS
index 16b25bb..bf870975 100644
--- a/tests/BlobStore/OWNERS
+++ b/tests/BlobStore/OWNERS
@@ -1,2 +1,2 @@
# Bug component: 95221
-include platform/frameworks/base:apex/blobstore/OWNERS
+include platform/frameworks/base:/apex/blobstore/OWNERS
diff --git a/tests/JobScheduler/Android.bp b/tests/JobScheduler/Android.bp
index aa4b99f..dd5fa63 100644
--- a/tests/JobScheduler/Android.bp
+++ b/tests/JobScheduler/Android.bp
@@ -31,6 +31,7 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
// sdk_version: "current",
platform_apis: true,
diff --git a/tests/JobScheduler/AndroidTest.xml b/tests/JobScheduler/AndroidTest.xml
index 6c487be..54b3495 100644
--- a/tests/JobScheduler/AndroidTest.xml
+++ b/tests/JobScheduler/AndroidTest.xml
@@ -33,4 +33,9 @@
<option name="runtime-hint" value="2m" />
<option name="isolated-storage" value="false" />
</test>
+
+ <object type="module_controller"
+ class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+ <option name="mainline-module-package-name" value="android.scheduling"/>
+ </object>
</configuration>
diff --git a/tests/JobScheduler/JobTestApp/Android.bp b/tests/JobScheduler/JobTestApp/Android.bp
index 5db7c14..319f3d1 100644
--- a/tests/JobScheduler/JobTestApp/Android.bp
+++ b/tests/JobScheduler/JobTestApp/Android.bp
@@ -21,6 +21,7 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
sdk_version: "current",
}
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/IdleConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/IdleConstraintTest.java
index e75d109..6d2090f 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/IdleConstraintTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/IdleConstraintTest.java
@@ -166,10 +166,7 @@
}
private boolean isCarModeSupported() {
- // TVs don't support car mode.
- return !getContext().getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_LEANBACK_ONLY)
- && !getContext().getSystemService(UiModeManager.class).isUiModeLocked();
+ return !getContext().getSystemService(UiModeManager.class).isUiModeLocked();
}
/**
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/JobSchedulingTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/JobSchedulingTest.java
index dcffd72..44a1f62 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/JobSchedulingTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/JobSchedulingTest.java
@@ -73,7 +73,7 @@
Settings.Global.putString(getContext().getContentResolver(),
Settings.Global.JOB_SCHEDULER_CONSTANTS,
"enable_api_quotas=true,aq_schedule_count=300,aq_schedule_window_ms=300000,"
- + "aq_schedule_throw_exception=false");
+ + "aq_schedule_throw_exception=false,aq_schedule_return_failure=true");
JobInfo jobInfo = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
.setMinimumLatency(60 * 60 * 1000L)
@@ -89,13 +89,33 @@
}
/**
+ * Test that scheduling succeeds even after an app hits the schedule quota limit.
+ */
+ public void testContinuingScheduleOnQuotaExceeded() {
+ Settings.Global.putString(getContext().getContentResolver(),
+ Settings.Global.JOB_SCHEDULER_CONSTANTS,
+ "enable_api_quotas=true,aq_schedule_count=300,aq_schedule_window_ms=300000,"
+ + "aq_schedule_throw_exception=false,aq_schedule_return_failure=false");
+
+ JobInfo jobInfo = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+ .setMinimumLatency(60 * 60 * 1000L)
+ .setPersisted(true)
+ .build();
+
+ for (int i = 0; i < 500; ++i) {
+ assertEquals("Got unexpected result for schedule #" + (i + 1),
+ JobScheduler.RESULT_SUCCESS, mJobScheduler.schedule(jobInfo));
+ }
+ }
+
+ /**
* Test that non-persisted jobs aren't limited by quota.
*/
public void testNonPersistedJobsNotLimited() {
Settings.Global.putString(getContext().getContentResolver(),
Settings.Global.JOB_SCHEDULER_CONSTANTS,
"enable_api_quotas=true,aq_schedule_count=300,aq_schedule_window_ms=60000,"
- + "aq_schedule_throw_exception=false");
+ + "aq_schedule_throw_exception=false,aq_schedule_return_failure=true");
JobInfo jobInfo = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
.setMinimumLatency(60 * 60 * 1000L)
diff --git a/tests/JobSchedulerSharedUid/TEST_MAPPING b/tests/JobSchedulerSharedUid/TEST_MAPPING
new file mode 100644
index 0000000..90ff197
--- /dev/null
+++ b/tests/JobSchedulerSharedUid/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsJobSchedulerSharedUidTestCases"
+ }
+ ]
+}
diff --git a/tests/accessibility/AndroidManifest.xml b/tests/accessibility/AndroidManifest.xml
index 4a7348d..bf3b1a8 100644
--- a/tests/accessibility/AndroidManifest.xml
+++ b/tests/accessibility/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
* Copyright (C) 2012 The Android Open Source Project
*
@@ -17,79 +16,83 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.view.accessibility.cts"
- android:targetSandboxVersion="2">
+ package="android.view.accessibility.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
<application android:theme="@android:style/Theme.Holo.NoActionBar"
- android:requestLegacyExternalStorage="true">
+ android:requestLegacyExternalStorage="true">
<uses-library android:name="android.test.runner"/>
<service android:name=".SpeakingAccessibilityService"
- android:label="@string/title_speaking_accessibility_service"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ android:label="@string/title_speaking_accessibility_service"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.accessibilityservice.AccessibilityService"/>
</intent-filter>
<meta-data android:name="android.accessibilityservice"
- android:resource="@xml/speaking_accessibilityservice" />
+ android:resource="@xml/speaking_accessibilityservice"/>
</service>
<service android:name=".VibratingAccessibilityService"
- android:label="@string/title_vibrating_accessibility_service"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ android:label="@string/title_vibrating_accessibility_service"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.accessibilityservice.AccessibilityService"/>
</intent-filter>
<meta-data android:name="android.accessibilityservice"
- android:resource="@xml/vibrating_accessibilityservice" />
+ android:resource="@xml/vibrating_accessibilityservice"/>
</service>
<service android:name=".SpeakingAndVibratingAccessibilityService"
- android:label="@string/title_speaking_and_vibrating_accessibility_service"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ android:label="@string/title_speaking_and_vibrating_accessibility_service"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.accessibilityservice.AccessibilityService"/>
</intent-filter>
<meta-data android:name="android.accessibilityservice"
- android:resource="@xml/speaking_and_vibrating_accessibilityservice" />
+ android:resource="@xml/speaking_and_vibrating_accessibilityservice"/>
</service>
<service android:name=".AccessibilityButtonService"
- android:label="@string/title_accessibility_button_service"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ android:label="@string/title_accessibility_button_service"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.accessibilityservice.AccessibilityService"/>
</intent-filter>
<meta-data android:name="android.accessibilityservice"
- android:resource="@xml/accessibility_button_service" />
+ android:resource="@xml/accessibility_button_service"/>
</service>
- <activity
- android:label="@string/some_description"
- android:name=".DummyActivity"
- android:screenOrientation="locked"/>
+ <activity android:label="@string/some_description"
+ android:name=".DummyActivity"
+ android:screenOrientation="locked"/>
<activity android:name=".AccessibilityShortcutTargetActivity"
- android:label="@string/shortcut_target_title">
+ android:label="@string/shortcut_target_title"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.ACCESSIBILITY_SHORTCUT_TARGET" />
+ <category android:name="android.intent.category.ACCESSIBILITY_SHORTCUT_TARGET"/>
</intent-filter>
<meta-data android:name="android.accessibilityshortcut.target"
- android:resource="@xml/shortcut_target_activity"/>
+ android:resource="@xml/shortcut_target_activity"/>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.view.accessibility.cts"
- android:label="Tests for the accessibility APIs.">
+ android:targetPackage="android.view.accessibility.cts"
+ android:label="Tests for the accessibility APIs.">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/accessibility/OWNERS b/tests/accessibility/OWNERS
index e54f581..fe6e38e 100644
--- a/tests/accessibility/OWNERS
+++ b/tests/accessibility/OWNERS
@@ -1,3 +1,4 @@
# Bug component: 44214
pweaver@google.com
rhedjao@google.com
+qasid@google.com
diff --git a/tests/accessibilityservice/AndroidManifest.xml b/tests/accessibilityservice/AndroidManifest.xml
index ff2fed4..29fb23b 100644
--- a/tests/accessibilityservice/AndroidManifest.xml
+++ b/tests/accessibilityservice/AndroidManifest.xml
@@ -16,201 +16,180 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.accessibilityservice.cts"
- android:targetSandboxVersion="2">
+ package="android.accessibilityservice.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
- <uses-permission android:name="android.permission.USE_FINGERPRINT" />
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<application android:theme="@android:style/Theme.Holo.NoActionBar"
- android:requestLegacyExternalStorage="true">
+ android:requestLegacyExternalStorage="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:label="@string/accessibility_end_to_end_test_activity"
- android:name=".activities.AccessibilityEndToEndActivity"
- android:screenOrientation="locked"/>
+ <activity android:label="@string/accessibility_end_to_end_test_activity"
+ android:name=".activities.AccessibilityEndToEndActivity"
+ android:screenOrientation="locked"/>
- <activity
- android:label="@string/accessibility_query_window_test_activity"
- android:name=".activities.AccessibilityWindowQueryActivity"
- android:supportsPictureInPicture="true"
- android:screenOrientation="locked"/>
+ <activity android:label="@string/accessibility_query_window_test_activity"
+ android:name=".activities.AccessibilityWindowQueryActivity"
+ android:supportsPictureInPicture="true"
+ android:screenOrientation="locked"/>
- <activity
- android:label="@string/accessibility_view_tree_reporting_test_activity"
- android:name=".activities.AccessibilityViewTreeReportingActivity"
- android:screenOrientation="locked"/>
+ <activity android:label="@string/accessibility_view_tree_reporting_test_activity"
+ android:name=".activities.AccessibilityViewTreeReportingActivity"
+ android:screenOrientation="locked"/>
- <activity
- android:label="@string/accessibility_focus_and_input_focus_sync_test_activity"
- android:name=".activities.AccessibilityFocusAndInputFocusSyncActivity"
- android:screenOrientation="locked"/>
+ <activity android:label="@string/accessibility_focus_and_input_focus_sync_test_activity"
+ android:name=".activities.AccessibilityFocusAndInputFocusSyncActivity"
+ android:screenOrientation="locked"/>
- <activity
- android:label="@string/accessibility_text_traversal_test_activity"
- android:name=".activities.AccessibilityTextTraversalActivity"
- android:screenOrientation="locked"/>
+ <activity android:label="@string/accessibility_text_traversal_test_activity"
+ android:name=".activities.AccessibilityTextTraversalActivity"
+ android:screenOrientation="locked"/>
<activity android:label="Activity for testing window accessibility reporting"
android:name=".activities.AccessibilityWindowReportingActivity"
android:supportsPictureInPicture="true"
android:screenOrientation="locked"/>
- <activity
- android:label="Full screen activity for gesture dispatch testing"
- android:name=".AccessibilityGestureDispatchTest$GestureDispatchActivity"
- android:screenOrientation="locked" />
+ <activity android:label="Full screen activity for gesture dispatch testing"
+ android:name=".AccessibilityGestureDispatchTest$GestureDispatchActivity"
+ android:screenOrientation="locked"/>
- <activity
- android:label="@string/accessibility_soft_keyboard_modes_activity"
- android:name=".AccessibilitySoftKeyboardModesTest$SoftKeyboardModesActivity" />
+ <activity android:label="@string/accessibility_soft_keyboard_modes_activity"
+ android:name=".AccessibilitySoftKeyboardModesTest$SoftKeyboardModesActivity"/>
- <activity
- android:label="@string/accessibility_embedded_display_test_parent_activity"
- android:name=".AccessibilityEmbeddedDisplayTest$EmbeddedDisplayParentActivity"
- android:theme="@android:style/Theme.Dialog"
- android:screenOrientation="locked" />
+ <activity android:label="@string/accessibility_embedded_display_test_parent_activity"
+ android:name=".AccessibilityEmbeddedDisplayTest$EmbeddedDisplayParentActivity"
+ android:theme="@android:style/Theme.Dialog"
+ android:screenOrientation="locked"/>
- <activity
- android:label="@string/accessibility_embedded_display_test_activity"
- android:name=".AccessibilityEmbeddedDisplayTest$EmbeddedDisplayActivity"
- android:screenOrientation="locked" />
+ <activity android:label="@string/accessibility_embedded_display_test_activity"
+ android:name=".AccessibilityEmbeddedDisplayTest$EmbeddedDisplayActivity"
+ android:screenOrientation="locked"/>
- <activity
- android:label="@string/accessibility_embedded_hierarchy_test_activity"
- android:name=".AccessibilityEmbeddedHierarchyTest$AccessibilityEmbeddedHierarchyActivity"
- android:theme="@android:style/Theme.Dialog"
- android:screenOrientation="locked"/>
+ <activity android:label="@string/accessibility_embedded_hierarchy_test_activity"
+ android:name=".AccessibilityEmbeddedHierarchyTest$AccessibilityEmbeddedHierarchyActivity"
+ android:theme="@android:style/Theme.Dialog"
+ android:screenOrientation="locked"/>
- <service
- android:name=".StubSystemActionsAccessibilityService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name=".StubSystemActionsAccessibilityService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_system_actions_a11y_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_system_actions_a11y_service"/>
</service>
- <service
- android:name=".StubGestureAccessibilityService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name=".StubGestureAccessibilityService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_gesture_dispatch_a11y_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_gesture_dispatch_a11y_service"/>
</service>
- <service
- android:name=".GestureDetectionStubAccessibilityService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name=".GestureDetectionStubAccessibilityService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_gesture_detect_a11y_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_gesture_detect_a11y_service"/>
</service>
- <service
- android:name=".TouchExplorationStubAccessibilityService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name=".TouchExplorationStubAccessibilityService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_touch_exploration_a11y_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_touch_exploration_a11y_service"/>
</service>
- <service
- android:name="android.accessibility.cts.common.InstrumentedAccessibilityService"
- android:label="@string/title_soft_keyboard_modes_accessibility_service"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name="android.accessibility.cts.common.InstrumentedAccessibilityService"
+ android:label="@string/title_soft_keyboard_modes_accessibility_service"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_soft_keyboard_modes_accessibility_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_soft_keyboard_modes_accessibility_service"/>
</service>
- <service
- android:name=".StubMagnificationAccessibilityService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name=".StubMagnificationAccessibilityService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_magnification_a11y_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_magnification_a11y_service"/>
</service>
- <service
- android:name=".StubFingerprintGestureService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name=".StubFingerprintGestureService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_fingerprint_gesture_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_fingerprint_gesture_service"/>
</service>
- <service
- android:name=".StubAccessibilityButtonService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name=".StubAccessibilityButtonService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_accessibility_button_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_accessibility_button_service"/>
</service>
- <service
- android:name=".StubTakeScreenshotService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name=".StubTakeScreenshotService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_take_screenshot_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_take_screenshot_service"/>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.accessibilityservice.cts"
- android:label="Tests for the accessibility APIs.">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.accessibilityservice.cts"
+ android:label="Tests for the accessibility APIs.">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
diff --git a/tests/accessibilityservice/OWNERS b/tests/accessibilityservice/OWNERS
index e54f581..fe6e38e 100644
--- a/tests/accessibilityservice/OWNERS
+++ b/tests/accessibilityservice/OWNERS
@@ -1,3 +1,4 @@
# Bug component: 44214
pweaver@google.com
rhedjao@google.com
+qasid@google.com
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
index 648c963..6c63a97 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
@@ -18,6 +18,7 @@
import static android.accessibility.cts.common.InstrumentedAccessibilityService.enableService;
import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterForEventType;
+import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterForEventTypeWithAction;
import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterForEventTypeWithResource;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.findWindowByTitle;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.getActivityTitle;
@@ -699,9 +700,11 @@
assertFalse(hasTooltipShowing(R.id.buttonWithTooltip));
assertThat(ACTION_SHOW_TOOLTIP, in(buttonNode.getActionList()));
assertThat(ACTION_HIDE_TOOLTIP, not(in(buttonNode.getActionList())));
- sUiAutomation.executeAndWaitForEvent(() -> buttonNode.performAction(
- ACTION_SHOW_TOOLTIP.getId()),
- filterForEventType(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED),
+ sUiAutomation.executeAndWaitForEvent(
+ () -> buttonNode.performAction(ACTION_SHOW_TOOLTIP.getId()),
+ filterForEventTypeWithAction(
+ AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED,
+ ACTION_SHOW_TOOLTIP.getId()),
DEFAULT_TIMEOUT_MS);
// The button should now be showing the tooltip, so it should have the option to hide it.
@@ -813,7 +816,9 @@
// Perform an action and wait for an event
sUiAutomation.executeAndWaitForEvent(
() -> button.performAction(AccessibilityNodeInfo.ACTION_CLICK),
- filterForEventType(AccessibilityEvent.TYPE_VIEW_CLICKED), DEFAULT_TIMEOUT_MS);
+ filterForEventTypeWithAction(
+ AccessibilityEvent.TYPE_VIEW_CLICKED, AccessibilityNodeInfo.ACTION_CLICK),
+ DEFAULT_TIMEOUT_MS);
// Make sure the MotionEvent.ACTION_OUTSIDE is received.
verify(listener, timeout(DEFAULT_TIMEOUT_MS).atLeastOnce()).onTouch(any(View.class),
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFocusAndInputFocusSyncTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFocusAndInputFocusSyncTest.java
index b7ccc19..1845eea 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFocusAndInputFocusSyncTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFocusAndInputFocusSyncTest.java
@@ -14,8 +14,11 @@
package android.accessibilityservice.cts;
+import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterForEventTypeWithAction;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
import static android.accessibilityservice.cts.utils.AsyncUtils.DEFAULT_TIMEOUT_MS;
+import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED;
+import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED;
import static android.view.accessibility.AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS;
import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS;
@@ -34,7 +37,6 @@
import android.platform.test.annotations.Presubmit;
import android.test.suitebuilder.annotation.MediumTest;
import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import androidx.test.InstrumentationRegistry;
@@ -115,8 +117,8 @@
sUiAutomation.executeAndWaitForEvent(
() -> assertTrue(expected.performAction(ACTION_ACCESSIBILITY_FOCUS)),
- (event) ->
- event.getEventType() == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,
+ filterForEventTypeWithAction(
+ TYPE_VIEW_ACCESSIBILITY_FOCUSED, ACTION_ACCESSIBILITY_FOCUS),
DEFAULT_TIMEOUT_MS);
// Get the second expected node info.
@@ -151,8 +153,8 @@
sUiAutomation.executeAndWaitForEvent(
() -> assertTrue(rootLinearLayout.performAction(ACTION_ACCESSIBILITY_FOCUS)),
- (event) ->
- event.getEventType() == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,
+ filterForEventTypeWithAction(
+ TYPE_VIEW_ACCESSIBILITY_FOCUSED, ACTION_ACCESSIBILITY_FOCUS),
DEFAULT_TIMEOUT_MS);
// Get the node info again.
@@ -174,8 +176,8 @@
sUiAutomation.executeAndWaitForEvent(
() -> assertTrue(rootLinearLayout.performAction(ACTION_ACCESSIBILITY_FOCUS)),
- (event) ->
- event.getEventType() == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,
+ filterForEventTypeWithAction(
+ TYPE_VIEW_ACCESSIBILITY_FOCUSED, ACTION_ACCESSIBILITY_FOCUS),
DEFAULT_TIMEOUT_MS);
// Refresh the node info.
@@ -186,8 +188,8 @@
sUiAutomation.executeAndWaitForEvent(
() -> assertTrue(rootLinearLayout.performAction(ACTION_CLEAR_ACCESSIBILITY_FOCUS)),
- (event) -> event.getEventType()
- == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED,
+ filterForEventTypeWithAction(
+ TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED, ACTION_CLEAR_ACCESSIBILITY_FOCUS),
DEFAULT_TIMEOUT_MS);
// Refresh the node info.
@@ -211,8 +213,8 @@
sUiAutomation.executeAndWaitForEvent(
() -> assertTrue(firstEditText.performAction(ACTION_ACCESSIBILITY_FOCUS)),
- (event) ->
- event.getEventType() == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,
+ filterForEventTypeWithAction(
+ TYPE_VIEW_ACCESSIBILITY_FOCUSED, ACTION_ACCESSIBILITY_FOCUS),
DEFAULT_TIMEOUT_MS);
// Get the second not focused edit text.
@@ -226,8 +228,8 @@
sUiAutomation.executeAndWaitForEvent(
() -> assertTrue(secondEditText.performAction(ACTION_ACCESSIBILITY_FOCUS)),
- (event) ->
- event.getEventType() == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,
+ filterForEventTypeWithAction(
+ TYPE_VIEW_ACCESSIBILITY_FOCUSED, ACTION_ACCESSIBILITY_FOCUS),
DEFAULT_TIMEOUT_MS);
// Get the node info again.
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityViewTreeReportingTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityViewTreeReportingTest.java
index 0ca307a..1e71541 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityViewTreeReportingTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityViewTreeReportingTest.java
@@ -317,44 +317,54 @@
assertTrue(awaitedEvent.getSource().isImportantForAccessibility());
}
-
@Test
- public void testHideView_receiveSubtreeEvent() throws Throwable {
+ public void testSetViewInvisible_receiveSubtreeEvent() throws Throwable {
final View view = mActivity.findViewById(R.id.secondButton);
- AccessibilityEvent awaitedEvent =
- sUiAutomation.executeAndWaitForEvent(
- () -> mActivity.runOnUiThread(() -> view.setVisibility(View.GONE)),
- (event) -> {
- boolean isContentChanged = event.getEventType()
- == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
- int isSubTree = (event.getContentChangeTypes()
- & AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
- boolean isFromThisPackage = TextUtils.equals(event.getPackageName(),
- mActivity.getPackageName());
- return isContentChanged && (isSubTree != 0) && isFromThisPackage;
- }, TIMEOUT_ASYNC_PROCESSING);
- awaitedEvent.recycle();
+ receiveSubtreeEventWhenViewChangesVisibility(view, (View) view.getParentForAccessibility(), View.INVISIBLE);
}
@Test
- public void testUnhideView_receiveSubtreeEvent() throws Throwable {
+ public void testSetViewGone_receiveSubtreeEvent() throws Throwable {
+ final View view = mActivity.findViewById(R.id.secondButton);
+ receiveSubtreeEventWhenViewChangesVisibility(view, (View) view.getParentForAccessibility(), View.GONE);
+ }
+
+ @Test
+ public void testSetViewVisible_receiveSubtreeEvent() throws Throwable {
final View view = mActivity.findViewById(R.id.hiddenButton);
+ receiveSubtreeEventWhenViewChangesVisibility(view, view, View.VISIBLE);
+ }
+
+ private void receiveSubtreeEventWhenViewChangesVisibility(View view, View sendA11yEventParent,
+ int visibility) throws Throwable {
AccessibilityEvent awaitedEvent =
sUiAutomation.executeAndWaitForEvent(
- () -> mActivity.runOnUiThread(() -> view.setVisibility(View.VISIBLE)),
+ () -> {
+ mActivity.runOnUiThread(() -> view.setVisibility(visibility));
+ },
(event) -> {
boolean isContentChanged = event.getEventType()
== AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
- int isSubTree = (event.getContentChangeTypes()
- & AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
+ boolean isSubTree = event.getContentChangeTypes()
+ == AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE;
boolean isFromThisPackage = TextUtils.equals(event.getPackageName(),
mActivity.getPackageName());
- return isContentChanged && (isSubTree != 0) && isFromThisPackage;
+ boolean isFromThisNode;
+ if (event.getSource() != null) {
+ isFromThisNode = TextUtils.equals(
+ event.getSource().getViewIdResourceName(),
+ sInstrumentation.getTargetContext().getResources()
+ .getResourceName(sendA11yEventParent.getId()));
+ } else {
+ isFromThisNode = TextUtils.equals(event.getClassName(),
+ sendA11yEventParent.getAccessibilityClassName());
+ }
+ return isContentChanged && isSubTree && isFromThisPackage
+ && isFromThisNode;
}, TIMEOUT_ASYNC_PROCESSING);
awaitedEvent.recycle();
}
-
private void setGetNonImportantViews(boolean getNonImportantViews) {
AccessibilityServiceInfo serviceInfo = sUiAutomation.getServiceInfo();
serviceInfo.flags &= ~AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
index 252fbcb..802fa40 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
@@ -17,13 +17,14 @@
package android.accessibilityservice.cts;
import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterForEventType;
+import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterForEventTypeWithAction;
import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterWindowsChangTypesAndWindowId;
import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterWindowsChangedWithChangeTypes;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityOnSpecifiedDisplayAndWaitForItToBeOnscreen;
import static android.accessibilityservice.cts.utils.AsyncUtils.DEFAULT_TIMEOUT_MS;
-import static android.accessibilityservice.cts.utils.DisplayUtils.getStatusBarHeight;
import static android.accessibilityservice.cts.utils.DisplayUtils.VirtualDisplaySession;
+import static android.accessibilityservice.cts.utils.DisplayUtils.getStatusBarHeight;
import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;
import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED;
import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED;
@@ -32,6 +33,7 @@
import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOWS_CHANGED;
import static android.view.accessibility.AccessibilityEvent.WINDOWS_CHANGE_ACCESSIBILITY_FOCUSED;
import static android.view.accessibility.AccessibilityEvent.WINDOWS_CHANGE_ADDED;
+import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS;
import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_FOCUS;
import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_SELECTION;
import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;
@@ -61,9 +63,7 @@
import android.app.UiAutomation;
import android.app.UiAutomation.AccessibilityEventFilter;
import android.content.pm.PackageManager;
-import android.content.res.Resources;
import android.graphics.Rect;
-import android.os.Bundle;
import android.platform.test.annotations.AppModeFull;
import android.test.suitebuilder.annotation.MediumTest;
import android.util.SparseArray;
@@ -213,9 +213,11 @@
"android.accessibilityservice.cts:id/button1").get(0);
// Click the button to generate an event
- AccessibilityEvent event = sUiAutomation.executeAndWaitForEvent(
- () -> button1.performAction(ACTION_CLICK),
- filterForEventType(TYPE_VIEW_CLICKED), DEFAULT_TIMEOUT_MS);
+ AccessibilityEvent event =
+ sUiAutomation.executeAndWaitForEvent(
+ () -> button1.performAction(ACTION_CLICK),
+ filterForEventTypeWithAction(TYPE_VIEW_CLICKED, ACTION_CLICK),
+ DEFAULT_TIMEOUT_MS);
// Make sure the source window cannot be accessed.
assertNull(event.getSource().getWindow());
@@ -265,9 +267,11 @@
"android.accessibilityservice.cts:id/button1").get(0);
// Click the button.
- AccessibilityEvent event = sUiAutomation.executeAndWaitForEvent(
- () -> button1.performAction(ACTION_CLICK),
- filterForEventType(TYPE_VIEW_CLICKED), DEFAULT_TIMEOUT_MS);
+ AccessibilityEvent event =
+ sUiAutomation.executeAndWaitForEvent(
+ () -> button1.performAction(ACTION_CLICK),
+ filterForEventTypeWithAction(TYPE_VIEW_CLICKED, ACTION_CLICK),
+ DEFAULT_TIMEOUT_MS);
// Get the source window.
AccessibilityWindowInfo window = event.getSource().getWindow();
@@ -301,9 +305,11 @@
"android.accessibilityservice.cts:id/button1").get(0);
// Click the button.
- AccessibilityEvent event = sUiAutomation.executeAndWaitForEvent(
- () -> button1.performAction(ACTION_CLICK),
- filterForEventType(TYPE_VIEW_CLICKED), DEFAULT_TIMEOUT_MS);
+ AccessibilityEvent event =
+ sUiAutomation.executeAndWaitForEvent(
+ () -> button1.performAction(ACTION_CLICK),
+ filterForEventTypeWithAction(TYPE_VIEW_CLICKED, ACTION_CLICK),
+ DEFAULT_TIMEOUT_MS);
// Get the source window.
AccessibilityWindowInfo window = event.getSource().getWindow();
@@ -314,8 +320,10 @@
"android.accessibilityservice.cts:id/button2").get(0);
// Click the second button.
- sUiAutomation.executeAndWaitForEvent(() -> button2.performAction(ACTION_CLICK),
- filterForEventType(TYPE_VIEW_CLICKED), DEFAULT_TIMEOUT_MS);
+ sUiAutomation.executeAndWaitForEvent(
+ () -> button2.performAction(ACTION_CLICK),
+ filterForEventTypeWithAction(TYPE_VIEW_CLICKED, ACTION_CLICK),
+ DEFAULT_TIMEOUT_MS);
} finally {
clearAccessInteractiveWindowsFlag();
}
@@ -441,9 +449,11 @@
assertFalse(button.isSelected());
// Perform an action and wait for an event
- AccessibilityEvent expected = sUiAutomation.executeAndWaitForEvent(
- () -> button.performAction(ACTION_CLICK),
- filterForEventType(TYPE_VIEW_CLICKED), DEFAULT_TIMEOUT_MS);
+ AccessibilityEvent expected =
+ sUiAutomation.executeAndWaitForEvent(
+ () -> button.performAction(ACTION_CLICK),
+ filterForEventTypeWithAction(TYPE_VIEW_CLICKED, ACTION_CLICK),
+ DEFAULT_TIMEOUT_MS);
// Make sure the expected event was received.
assertNotNull(expected);
@@ -459,9 +469,11 @@
assertFalse(button.isSelected());
// Perform an action and wait for an event.
- AccessibilityEvent expected = sUiAutomation.executeAndWaitForEvent(
- () -> button.performAction(ACTION_LONG_CLICK),
- filterForEventType(TYPE_VIEW_LONG_CLICKED), DEFAULT_TIMEOUT_MS);
+ AccessibilityEvent expected =
+ sUiAutomation.executeAndWaitForEvent(
+ () -> button.performAction(ACTION_LONG_CLICK),
+ filterForEventTypeWithAction(TYPE_VIEW_LONG_CLICKED, ACTION_LONG_CLICK),
+ DEFAULT_TIMEOUT_MS);
// Make sure the expected event was received.
assertNotNull(expected);
@@ -500,9 +512,11 @@
assertFalse(button.isSelected());
// focus and wait for the event
- AccessibilityEvent awaitedEvent = sUiAutomation
- .executeAndWaitForEvent(() -> button.performAction(ACTION_FOCUS),
- filterForEventType(TYPE_VIEW_FOCUSED), DEFAULT_TIMEOUT_MS);
+ AccessibilityEvent awaitedEvent =
+ sUiAutomation.executeAndWaitForEvent(
+ () -> button.performAction(ACTION_FOCUS),
+ filterForEventTypeWithAction(TYPE_VIEW_FOCUSED, ACTION_FOCUS),
+ DEFAULT_TIMEOUT_MS);
assertNotNull(awaitedEvent);
@@ -573,7 +587,7 @@
@MediumTest
@Test
public void testWindowDockAndUndock_dividerWindowAppearsAndDisappears() throws Exception {
- if (!ActivityTaskManager.supportsSplitScreenMultiWindow(sInstrumentation.getContext())) {
+ if (!ActivityTaskManager.supportsSplitScreenMultiWindow(mActivity)) {
// Skipping test: no multi-window support
return;
}
@@ -843,20 +857,25 @@
private void ensureAccessibilityFocusCleared() {
try {
- sUiAutomation.executeAndWaitForEvent(() -> {
- List<AccessibilityWindowInfo> windows = sUiAutomation.getWindows();
- final int windowCount = windows.size();
- for (int i = 0; i < windowCount; i++) {
- AccessibilityWindowInfo window = windows.get(i);
- if (window.isAccessibilityFocused()) {
- AccessibilityNodeInfo root = window.getRoot();
- if (root != null) {
- root.performAction(
- AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);
+ sUiAutomation.executeAndWaitForEvent(
+ () -> {
+ List<AccessibilityWindowInfo> windows = sUiAutomation.getWindows();
+ final int windowCount = windows.size();
+ for (int i = 0; i < windowCount; i++) {
+ AccessibilityWindowInfo window = windows.get(i);
+ if (window.isAccessibilityFocused()) {
+ AccessibilityNodeInfo root = window.getRoot();
+ if (root != null) {
+ root.performAction(
+ AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);
+ }
+ }
}
- }
- }
- }, filterForEventType(TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED), DEFAULT_TIMEOUT_MS);
+ },
+ filterForEventTypeWithAction(
+ TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED,
+ ACTION_CLEAR_ACCESSIBILITY_FOCUS),
+ DEFAULT_TIMEOUT_MS);
} catch (TimeoutException te) {
/* ignore */
}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
index 80a3054..9224739 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 testDoubleTapNoFocus_doesNotPerformClick() {
+ public void testDoubleTapNoAccessibilityFocus_doesNotPerformClick() {
if (!mHasTouchscreen || !mScreenBigEnough) return;
dispatch(doubleTap(mTapLocation));
mHoverListener.assertNonePropagated();
@@ -291,12 +291,34 @@
}
/**
+ * Test the case where we want to long click on the item that has accessibility focus. Note that
+ * this test does not request that double tap and hold be dispatched to the accessibility
+ * service, meaning that it will be handled by the framework and the view will be long clicked.
+ */
+ @Test
+ @AppModeFull
+ public void testDoubleTapAndHoldAccessibilityFocus_performsLongClick() {
+ if (!mHasTouchscreen || !mScreenBigEnough) return;
+ syncAccessibilityFocusToInputFocus();
+ dispatch(doubleTapAndHold(mTapLocation));
+ mHoverListener.assertNonePropagated();
+ // The click should not be delivered via touch events in this case.
+ mTouchListener.assertNonePropagated();
+ mService.assertPropagated(
+ TYPE_VIEW_ACCESSIBILITY_FOCUSED,
+ TYPE_TOUCH_INTERACTION_START,
+ TYPE_VIEW_LONG_CLICKED,
+ TYPE_TOUCH_INTERACTION_END);
+ mLongClickListener.assertLongClicked(mView);
+ }
+
+ /**
* Test the case where we double tap and hold but there is no accessibility focus. Nothing
* should happen.
*/
@Test
@AppModeFull
- public void testDoubleTapAndHoldNoFocus_doesNotPerformLongClick() {
+ public void testDoubleTapAndHoldNoAccessibilityFocus_doesNotPerformLongClick() {
if (!mHasTouchscreen || !mScreenBigEnough) return;
dispatch(doubleTap(mTapLocation));
mHoverListener.assertNonePropagated();
@@ -336,63 +358,6 @@
}
/**
- * 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/accessibilityservice/src/android/accessibilityservice/cts/utils/AccessibilityEventFilterUtils.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/AccessibilityEventFilterUtils.java
index 0fd9477..7f1cd37 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/AccessibilityEventFilterUtils.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/AccessibilityEventFilterUtils.java
@@ -52,6 +52,13 @@
return (both(new AccessibilityEventTypeMatcher(eventType)).and(matchResourceName))::matches;
}
+ public static AccessibilityEventFilter filterForEventTypeWithAction(int eventType, int action) {
+ TypeSafeMatcher<AccessibilityEvent> matchAction =
+ new PropertyMatcher<>(
+ action, "Action", (event, expect) -> event.getAction() == action);
+ return (both(new AccessibilityEventTypeMatcher(eventType)).and(matchAction))::matches;
+ }
+
public static AccessibilityEventFilter filterWindowsChangeTypesAndWindowTitle(
@NonNull UiAutomation uiAutomation, int changeTypes, @NonNull String title) {
return allOf(new AccessibilityEventTypeMatcher(AccessibilityEvent.TYPE_WINDOWS_CHANGED),
diff --git a/tests/accessibilityservice/test-apps/WidgetProvider/AndroidManifest.xml b/tests/accessibilityservice/test-apps/WidgetProvider/AndroidManifest.xml
index e1628bf..af7ae8f 100644
--- a/tests/accessibilityservice/test-apps/WidgetProvider/AndroidManifest.xml
+++ b/tests/accessibilityservice/test-apps/WidgetProvider/AndroidManifest.xml
@@ -16,16 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="foo.bar.baz"
- android:targetSandboxVersion="2">
+ package="foo.bar.baz"
+ android:targetSandboxVersion="2">
<application>
- <receiver android:name="foo.bar.baz.MyAppWidgetProvider" >
+ <receiver android:name="foo.bar.baz.MyAppWidgetProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/appwidget_info" />
+ android:resource="@xml/appwidget_info"/>
</receiver>
</application>
diff --git a/tests/accessibilityservice/testsdk29/AndroidManifest.xml b/tests/accessibilityservice/testsdk29/AndroidManifest.xml
index 90b2f5f..ad47ad7 100644
--- a/tests/accessibilityservice/testsdk29/AndroidManifest.xml
+++ b/tests/accessibilityservice/testsdk29/AndroidManifest.xml
@@ -16,37 +16,34 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.accessibilityservice.cts.testsdk29">
+ package="android.accessibilityservice.cts.testsdk29">
- <uses-sdk android:targetSdkVersion="29" />
+ <uses-sdk android:targetSdkVersion="29"/>
<application android:theme="@android:style/Theme.Holo.NoActionBar"
- android:requestLegacyExternalStorage="true">
+ android:requestLegacyExternalStorage="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <service
- android:name="android.accessibilityservice.cts.StubAccessibilityButtonSdk29Service"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+ <service android:name="android.accessibilityservice.cts.StubAccessibilityButtonSdk29Service"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/stub_accessibility_button_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/stub_accessibility_button_service"/>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.accessibilityservice.cts.testsdk29"
- android:label="Tests for the accessibility Sdk 29 APIs.">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.accessibilityservice.cts.testsdk29"
+ android:label="Tests for the accessibility Sdk 29 APIs.">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/admin/app/AndroidManifest.xml b/tests/admin/app/AndroidManifest.xml
index baff9ab..c0eee88 100644
--- a/tests/admin/app/AndroidManifest.xml
+++ b/tests/admin/app/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
* Copyright (C) 2011 The Android Open Source Project
*
@@ -17,139 +16,152 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.admin.app">
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28"/>
+ package="android.admin.app">
+ <uses-sdk android:minSdkVersion="19"
+ android:targetSdkVersion="28"/>
<application android:testOnly="true">
<uses-library android:name="android.test.runner"/>
<receiver android:name="android.admin.app.CtsDeviceAdminDeviceOwner"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<receiver android:name="android.admin.app.CtsDeviceAdminProfileOwner"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<receiver android:name="android.admin.app.CtsDeviceAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<receiver android:name="android.admin.app.CtsDeviceAdminReceiver2"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin_2" />
+ android:resource="@xml/device_admin_2"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<receiver android:name="android.admin.app.CtsDeviceAdminReceiver3"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin_3" />
+ android:resource="@xml/device_admin_3"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<receiver android:name="android.admin.app.CtsDeviceAdminReceiverVisible"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin_visible" />
+ android:resource="@xml/device_admin_visible"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<receiver android:name="android.admin.app.CtsDeviceAdminReceiverInvisible"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin_invisible" />
+ android:resource="@xml/device_admin_invisible"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<!-- Device Admin that needs to be in the deactivated state in order
- for tests to pass. -->
+ for tests to pass. -->
<receiver android:name="android.admin.app.CtsDeviceAdminDeactivatedReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<!-- Helper Activity used by Device Admin activation tests -->
<activity android:name="android.admin.app.CtsDeviceAdminActivationTestActivity"
- android:label="Device Admin activation test" />
+ android:label="Device Admin activation test"/>
<!-- Broken device admin: meta-data missing -->
<receiver android:name="android.admin.app.CtsDeviceAdminBrokenReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<!-- Broken device admin: filter doesn't match an Intent with action
- android.app.action.DEVICE_ADMIN_ENABLED and nothing else (e.g.,
- data) set -->
+ android.app.action.DEVICE_ADMIN_ENABLED and nothing else (e.g.,
+ data) set -->
<receiver android:name="android.admin.app.CtsDeviceAdminBrokenReceiver2"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
- <data android:scheme="https" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
+ <data android:scheme="https"/>
</intent-filter>
</receiver>
<!-- Broken device admin: meta-data element doesn't point to valid
- Device Admin configuration/description -->
+ Device Admin configuration/description -->
<receiver android:name="android.admin.app.CtsDeviceAdminBrokenReceiver3"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/broken_device_admin" />
+ android:resource="@xml/broken_device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
<!-- Broken device admin: filter doesn't match Intents with action
- android.app.action.DEVICE_ADMIN_ENABLED -->
+ android.app.action.DEVICE_ADMIN_ENABLED -->
<receiver android:name="android.admin.app.CtsDeviceAdminBrokenReceiver4"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_DISABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_DISABLED"/>
</intent-filter>
</receiver>
<!-- Broken device admin: no intent-filter -->
<receiver android:name="android.admin.app.CtsDeviceAdminBrokenReceiver5"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
</receiver>
</application>
diff --git a/tests/app/ActivityManagerApi29Test/AndroidManifest.xml b/tests/app/ActivityManagerApi29Test/AndroidManifest.xml
index 0c75ff4..79a9020 100644
--- a/tests/app/ActivityManagerApi29Test/AndroidManifest.xml
+++ b/tests/app/ActivityManagerApi29Test/AndroidManifest.xml
@@ -16,27 +16,30 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.app.cts.activitymanager.api29">
- <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="29" />
+ package="android.app.cts.activitymanager.api29">
+ <uses-sdk android:minSdkVersion="11"
+ android:targetSdkVersion="29"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
<application android:usesCleartextTraffic="true">
- <uses-library android:name="android.test.runner" />
- <uses-library android:name="org.apache.http.legacy" android:required="false" />
+ <uses-library android:name="android.test.runner"/>
+ <uses-library android:name="org.apache.http.legacy"
+ android:required="false"/>
<activity android:name=".SimpleActivity"
- android:excludeFromRecents="true">
+ android:excludeFromRecents="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<service android:name="LocationForegroundService"
- android:foregroundServiceType="location|camera|microphone"
- android:exported="true">
+ android:foregroundServiceType="location|camera|microphone"
+ android:exported="true">
</service>
</application>
</manifest>
diff --git a/tests/app/CantSaveState1/AndroidManifest.xml b/tests/app/CantSaveState1/AndroidManifest.xml
index fadcaeb..26b3fd1 100644
--- a/tests/app/CantSaveState1/AndroidManifest.xml
+++ b/tests/app/CantSaveState1/AndroidManifest.xml
@@ -13,14 +13,17 @@
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.test.cantsavestate1">
- <application android:label="Can't Save 1" android:cantSaveState="true">
- <activity android:name="CantSave1Activity">
+ package="com.android.test.cantsavestate1">
+ <application android:label="Can't Save 1"
+ android:cantSaveState="true">
+ <activity android:name="CantSave1Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/app/CantSaveState2/AndroidManifest.xml b/tests/app/CantSaveState2/AndroidManifest.xml
index 8f4f01d..92b059d 100644
--- a/tests/app/CantSaveState2/AndroidManifest.xml
+++ b/tests/app/CantSaveState2/AndroidManifest.xml
@@ -13,14 +13,17 @@
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.test.cantsavestate2">
- <application android:label="Can't Save 2" android:cantSaveState="true">
- <activity android:name="CantSave2Activity">
+ package="com.android.test.cantsavestate2">
+ <application android:label="Can't Save 2"
+ android:cantSaveState="true">
+ <activity android:name="CantSave2Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/app/NotificationDelegator/AndroidManifest.xml b/tests/app/NotificationDelegator/AndroidManifest.xml
index fbdf219..a05dcd2 100644
--- a/tests/app/NotificationDelegator/AndroidManifest.xml
+++ b/tests/app/NotificationDelegator/AndroidManifest.xml
@@ -13,28 +13,32 @@
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.test.notificationdelegator">
+ package="com.android.test.notificationdelegator">
<application android:label="Notification Delegator">
- <activity android:name="com.android.test.notificationdelegator.NotificationDelegator">
+ <activity android:name="com.android.test.notificationdelegator.NotificationDelegator"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name="com.android.test.notificationdelegator.NotificationRevoker">
+ <activity android:name="com.android.test.notificationdelegator.NotificationRevoker"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity android:name="com.android.test.notificationdelegator.NotificationDelegateAndPost">
+ <activity android:name="com.android.test.notificationdelegator.NotificationDelegateAndPost"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
diff --git a/tests/app/StorageDelegator/AndroidManifest.xml b/tests/app/StorageDelegator/AndroidManifest.xml
index c252a80..7812a23 100644
--- a/tests/app/StorageDelegator/AndroidManifest.xml
+++ b/tests/app/StorageDelegator/AndroidManifest.xml
@@ -13,20 +13,22 @@
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.test.storagedelegator">
+ package="com.android.test.storagedelegator">
- <uses-sdk android:targetSdkVersion="28" />
+ <uses-sdk android:targetSdkVersion="28"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<application android:label="StorageDelegator">
<activity android:name=".StorageDelegator"
- android:theme="@android:style/Theme.NoDisplay">
+ android:theme="@android:style/Theme.NoDisplay"
+ android:exported="true">
<intent-filter>
- <action android:name="com.android.cts.action.CREATE_FILE_WITH_CONTENT" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="com.android.cts.action.CREATE_FILE_WITH_CONTENT"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/app/app/AndroidManifest.xml b/tests/app/app/AndroidManifest.xml
index a6fe151..ccf135e 100644
--- a/tests/app/app/AndroidManifest.xml
+++ b/tests/app/app/AndroidManifest.xml
@@ -16,75 +16,85 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.app.stubs">
+ package="android.app.stubs">
<permission android:name="android.app.stubs.permission.TEST_GRANTED"
- android:protectionLevel="normal"
- android:label="@string/permlab_testGranted"
- android:description="@string/permdesc_testGranted">
- <meta-data android:name="android.app.stubs.string" android:value="foo" />
- <meta-data android:name="android.app.stubs.boolean" android:value="true" />
- <meta-data android:name="android.app.stubs.integer" android:value="100" />
- <meta-data android:name="android.app.stubs.color" android:value="#ff000000" />
- <meta-data android:name="android.app.stubs.float" android:value="100.1" />
- <meta-data android:name="android.app.stubs.reference" android:resource="@xml/metadata" />
+ android:protectionLevel="normal"
+ android:label="@string/permlab_testGranted"
+ android:description="@string/permdesc_testGranted">
+ <meta-data android:name="android.app.stubs.string"
+ android:value="foo"/>
+ <meta-data android:name="android.app.stubs.boolean"
+ android:value="true"/>
+ <meta-data android:name="android.app.stubs.integer"
+ android:value="100"/>
+ <meta-data android:name="android.app.stubs.color"
+ android:value="#ff000000"/>
+ <meta-data android:name="android.app.stubs.float"
+ android:value="100.1"/>
+ <meta-data android:name="android.app.stubs.reference"
+ android:resource="@xml/metadata"/>
</permission>
- <uses-permission android:name="android.app.stubs.permission.TEST_GRANTED" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.WRITE_CONTACTS" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.BODY_SENSORS" />
- <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
- <uses-permission android:name="android.permission.SET_WALLPAPER" />
+ <uses-permission android:name="android.app.stubs.permission.TEST_GRANTED"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.BODY_SENSORS"/>
+ <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+ <uses-permission android:name="android.permission.SET_WALLPAPER"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
- <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+ <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application android:label="Android TestCase"
- android:icon="@drawable/size_48x48"
- android:maxRecents="1"
- android:multiArch="true"
- android:name="android.app.stubs.MockApplication"
- android:supportsRtl="true"
- android:networkSecurityConfig="@xml/network_security_config"
- android:zygotePreloadName=".ZygotePreload">
- <uses-library android:name="android.test.runner" />
- <uses-library android:name="org.apache.http.legacy" android:required="false" />
+ android:icon="@drawable/size_48x48"
+ android:maxRecents="1"
+ android:multiArch="true"
+ android:name="android.app.stubs.MockApplication"
+ android:supportsRtl="true"
+ android:networkSecurityConfig="@xml/network_security_config"
+ android:zygotePreloadName=".ZygotePreload">
+ <uses-library android:name="android.test.runner"/>
+ <uses-library android:name="org.apache.http.legacy"
+ android:required="false"/>
- <activity android:name="android.app.stubs.ScreenOnActivity" />
+ <activity android:name="android.app.stubs.ScreenOnActivity"/>
- <activity android:name="android.app.stubs.ActionBarActivity" />
+ <activity android:name="android.app.stubs.ActionBarActivity"/>
- <activity android:name="android.app.stubs.ActivityCallbacksTestActivity" />
+ <activity android:name="android.app.stubs.ActivityCallbacksTestActivity"/>
- <activity android:name="android.app.stubs.MockActivity" android:label="MockActivity">
+ <activity android:name="android.app.stubs.MockActivity"
+ android:label="MockActivity">
<meta-data android:name="android.app.alias"
- android:resource="@xml/alias" />
+ android:resource="@xml/alias"/>
<meta-data android:name="android.app.intent.filter"
- android:resource="@xml/intentfilter" />
+ android:resource="@xml/intentfilter"/>
</activity>
<activity android:name="android.app.stubs.MockApplicationActivity"
- android:label="MockApplicationActivity">
+ android:label="MockApplicationActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.app.stubs.InstrumentationTestActivity"
- android:label="InstrumentationTestActivity">
+ android:label="InstrumentationTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="vnd.android.cursor.dir/person" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="vnd.android.cursor.dir/person"/>
</intent-filter>
<intent-filter>
<action android:name="android.app.stubs.activity.INSTRUMENTATION_TEST"/>
@@ -92,343 +102,385 @@
</activity>
<activity android:name="android.app.stubs.ActivityMonitorTestActivity"
- android:label="ActivityMonitorTestActivity" />
+ android:label="ActivityMonitorTestActivity"/>
<activity android:name="android.app.stubs.AliasActivityStub">
<meta-data android:name="android.app.alias"
- android:resource="@xml/alias" />
+ android:resource="@xml/alias"/>
</activity>
<activity android:name="android.app.stubs.ChildActivity"
- android:label="ChildActivity" />
+ android:label="ChildActivity"/>
- <receiver android:name="android.app.stubs.MockReceiver">
+ <receiver android:name="android.app.stubs.MockReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.stubs.PendingIntentTest.TEST_RECEIVER" />
+ <action android:name="android.app.stubs.PendingIntentTest.TEST_RECEIVER"/>
</intent-filter>
</receiver>
- <service android:name="android.app.stubs.MockService" />
+ <service android:name="android.app.stubs.MockService"/>
- <service android:name="android.app.stubs.NullService" />
+ <service android:name="android.app.stubs.NullService"/>
<activity android:name="android.app.stubs.SearchManagerStubActivity"
- android:label="SearchManagerStubActivity">
+ android:label="SearchManagerStubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEARCH" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.SEARCH"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
- <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
+ <meta-data android:name="android.app.searchable"
+ android:resource="@xml/searchable"/>
</activity>
- <service android:name="android.app.stubs.LocalService">
+ <service android:name="android.app.stubs.LocalService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.stubs.activity.SERVICE_LOCAL" />
+ <action android:name="android.app.stubs.activity.SERVICE_LOCAL"/>
</intent-filter>
- <meta-data android:name="android.app.stubs.string" android:value="foo" />
- <meta-data android:name="android.app.stubs.boolean" android:value="true" />
- <meta-data android:name="android.app.stubs.integer" android:value="100" />
- <meta-data android:name="android.app.stubs.color" android:value="#ff000000" />
- <meta-data android:name="android.app.stubs.float" android:value="100.1" />
- <meta-data android:name="android.app.stubs.reference" android:resource="@xml/metadata" />
+ <meta-data android:name="android.app.stubs.string"
+ android:value="foo"/>
+ <meta-data android:name="android.app.stubs.boolean"
+ android:value="true"/>
+ <meta-data android:name="android.app.stubs.integer"
+ android:value="100"/>
+ <meta-data android:name="android.app.stubs.color"
+ android:value="#ff000000"/>
+ <meta-data android:name="android.app.stubs.float"
+ android:value="100.1"/>
+ <meta-data android:name="android.app.stubs.reference"
+ android:resource="@xml/metadata"/>
</service>
- <service android:name="android.app.stubs.LocalStoppedService" />
+ <service android:name="android.app.stubs.LocalStoppedService"/>
<service android:name="android.app.stubs.LocalForegroundService"
- android:foregroundServiceType="camera|microphone">
+ android:foregroundServiceType="camera|microphone"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.stubs.FOREGROUND_SERVICE" />
+ <action android:name="android.app.stubs.FOREGROUND_SERVICE"/>
</intent-filter>
</service>
<service android:name="android.app.stubs.LocalForegroundServiceLocation"
- android:foregroundServiceType="location|camera|microphone">
+ android:foregroundServiceType="location|camera|microphone"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.stubs.FOREGROUND_SERVICE_LOCATION" />
+ <action android:name="android.app.stubs.FOREGROUND_SERVICE_LOCATION"/>
</intent-filter>
</service>
<service android:name="android.app.stubs.LocalGrantedService"
- android:permission="android.app.stubs.permission.TEST_GRANTED">
+ android:permission="android.app.stubs.permission.TEST_GRANTED"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.stubs.activity.SERVICE_LOCAL_GRANTED" />
+ <action android:name="android.app.stubs.activity.SERVICE_LOCAL_GRANTED"/>
</intent-filter>
</service>
<service android:name="android.app.stubs.LocalDeniedService"
- android:permission="android.app.stubs.permission.TEST_DENIED">
+ android:permission="android.app.stubs.permission.TEST_DENIED"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.stubs.activity.SERVICE_LOCAL_DENIED" />
+ <action android:name="android.app.stubs.activity.SERVICE_LOCAL_DENIED"/>
</intent-filter>
</service>
- <service android:name="android.app.stubs.IsolatedService" android:isolatedProcess="true" android:useAppZygote="true">
+ <service android:name="android.app.stubs.IsolatedService"
+ android:isolatedProcess="true"
+ android:useAppZygote="true">
</service>
<activity android:name="android.app.stubs.TestedScreen"
- android:process=":remoteScreen">
+ android:process=":remoteScreen">
</activity>
- <activity android:name="android.app.stubs.LocalScreen" android:multiprocess="true">
+ <activity android:name="android.app.stubs.LocalScreen"
+ android:multiprocess="true">
</activity>
- <activity android:name="android.app.stubs.ClearTop" android:multiprocess="true"
- android:launchMode="singleTop">
+ <activity android:name="android.app.stubs.ClearTop"
+ android:multiprocess="true"
+ android:launchMode="singleTop">
</activity>
- <activity android:name="android.app.stubs.LocalDialog" android:multiprocess="true"
- android:theme="@android:style/Theme.Dialog">
+ <activity android:name="android.app.stubs.LocalDialog"
+ android:multiprocess="true"
+ android:theme="@android:style/Theme.Dialog">
</activity>
<activity android:name="android.app.stubs.PendingIntentStubActivity"
android:label="PendingIntentStubActivity"/>
<activity android:name="android.app.stubs.LocalActivityManagerStubActivity"
- android:label="LocalActivityManagerStubActivity" />
+ android:label="LocalActivityManagerStubActivity"/>
<activity android:name="android.app.stubs.LocalActivityManagerTestHelper"
- android:label="LocalActivityManagerTestHelper" />
+ android:label="LocalActivityManagerTestHelper"/>
- <activity android:name="android.app.stubs.LaunchpadTabActivity" android:multiprocess="true">
+ <activity android:name="android.app.stubs.LaunchpadTabActivity"
+ android:multiprocess="true">
</activity>
- <activity android:name="android.app.stubs.LocalActivity" android:multiprocess="true">
- <meta-data android:name="android.app.stubs.string" android:value="foo" />
- <meta-data android:name="android.app.stubs.boolean" android:value="true" />
- <meta-data android:name="android.app.stubs.integer" android:value="100" />
- <meta-data android:name="android.app.stubs.color" android:value="#ff000000" />
- <meta-data android:name="android.app.stubs.float" android:value="100.1" />
- <meta-data android:name="android.app.stubs.reference" android:resource="@xml/metadata" />
+ <activity android:name="android.app.stubs.LocalActivity"
+ android:multiprocess="true">
+ <meta-data android:name="android.app.stubs.string"
+ android:value="foo"/>
+ <meta-data android:name="android.app.stubs.boolean"
+ android:value="true"/>
+ <meta-data android:name="android.app.stubs.integer"
+ android:value="100"/>
+ <meta-data android:name="android.app.stubs.color"
+ android:value="#ff000000"/>
+ <meta-data android:name="android.app.stubs.float"
+ android:value="100.1"/>
+ <meta-data android:name="android.app.stubs.reference"
+ android:resource="@xml/metadata"/>
</activity>
<activity android:name="android.app.stubs.TestedActivity"
- android:process=":remoteActivity">
+ android:process=":remoteActivity">
</activity>
<activity android:name="android.app.stubs.ExpandableListTestActivity"
- android:label="ExpandableListTestActivity">
+ android:label="ExpandableListTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.app.stubs.FragmentTestActivity"
- android:label="FragmentTestActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.stubs.FragmentResultActivity" android:label="FragmentResultActivity" />
-
- <activity android:name="android.app.stubs.LauncherActivityStub"
- android:label="LauncherActivityStub" >
+ android:label="FragmentTestActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity android:name="android.app.stubs.MockTabActivity" android:label="MockTabActivity" />
+ <activity android:name="android.app.stubs.FragmentResultActivity"
+ android:label="FragmentResultActivity"/>
- <activity android:name="android.app.stubs.MockListActivity" android:label="MockListActivity" />
-
- <activity android:name="android.app.stubs.AppStubActivity" android:label="AppStubActivity">
+ <activity android:name="android.app.stubs.LauncherActivityStub"
+ android:label="LauncherActivityStub"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.stubs.MockTabActivity"
+ android:label="MockTabActivity"/>
+
+ <activity android:name="android.app.stubs.MockListActivity"
+ android:label="MockListActivity"/>
+
+ <activity android:name="android.app.stubs.AppStubActivity"
+ android:label="AppStubActivity"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.app.stubs.DialogStubActivity"
- android:label="DialogStubActivity">
+ android:label="DialogStubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.app.stubs.ActivityManagerStubFooActivity"
- android:label="ActivityManagerStubFooActivity">
+ android:label="ActivityManagerStubFooActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.app.stubs.ActivityManagerRecentOneActivity"
- android:label="ActivityManagerRecentOneActivity"
- android:allowTaskReparenting="true"
- android:taskAffinity="android.app.stubs.recentOne">
+ android:label="ActivityManagerRecentOneActivity"
+ android:allowTaskReparenting="true"
+ android:taskAffinity="android.app.stubs.recentOne"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<activity android:name="android.app.stubs.ActivityManagerRecentTwoActivity"
- android:label="ActivityManagerRecentTwoActivity"
- android:allowTaskReparenting="true"
- android:taskAffinity="android.app.stubs.recentTwo">
+ android:label="ActivityManagerRecentTwoActivity"
+ android:allowTaskReparenting="true"
+ android:taskAffinity="android.app.stubs.recentTwo"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<activity android:name="android.app.stubs.ActivityManagerStubCrashActivity"
- android:label="ActivityManagerStubCrashActivity"
- android:multiprocess="true"
- android:process=":ActivityManagerStubCrashActivity">
+ android:label="ActivityManagerStubCrashActivity"
+ android:multiprocess="true"
+ android:process=":ActivityManagerStubCrashActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<service android:name="android.app.stubs.StubRemoteService"
- android:process=":remote">
+ android:process=":remote"
+ android:exported="true">
<intent-filter>
- <action
- android:name="android.app.stubs.ISecondary" />
- <action
- android:name="android.app.REMOTESERVICE" />
+ <action android:name="android.app.stubs.ISecondary"/>
+ <action android:name="android.app.REMOTESERVICE"/>
</intent-filter>
</service>
<activity android:name="android.app.ActivityGroup"
- android:label="ActivityGroup" />
+ android:label="ActivityGroup"/>
<activity android:name="android.app.stubs.KeyguardManagerActivity"
- android:label="KeyguardManagerActivity">
+ android:label="KeyguardManagerActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<service android:name="android.app.stubs.IntentServiceStub"/>
<activity android:name="android.app.stubs.LaunchpadActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:multiprocess="true">
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:multiprocess="true">
</activity>
- <activity android:name="android.app.stubs.ActivityManagerMemoryClassLaunchActivity" />
+ <activity android:name="android.app.stubs.ActivityManagerMemoryClassLaunchActivity"/>
<activity android:name="android.app.stubs.ActivityManagerMemoryClassTestActivity"
- android:process=":memoryclass" />
+ android:process=":memoryclass"/>
<activity android:name="android.app.stubs.PipNotSupportedActivity"
- android:label="PipNotSupportedActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="false"
- android:configChanges="smallestScreenSize|orientation|screenSize|screenLayout">
+ android:label="PipNotSupportedActivity"
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="false"
+ android:configChanges="smallestScreenSize|orientation|screenSize|screenLayout"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity android:name="android.app.stubs.KeyboardShortcutsActivity" />
+ <activity android:name="android.app.stubs.KeyboardShortcutsActivity"/>
<activity android:name="android.app.stubs.NewDocumentTestActivity"
- android:documentLaunchMode="intoExisting" />
+ android:documentLaunchMode="intoExisting"/>
<activity android:name="android.app.stubs.DisplayTestActivity"
- android:configChanges="smallestScreenSize|orientation|screenSize|screenLayout" />
+ android:configChanges="smallestScreenSize|orientation|screenSize|screenLayout"/>
<activity android:name="android.app.stubs.ToolbarActivity"
- android:theme="@android:style/Theme.Material.Light.NoActionBar" />
+ android:theme="@android:style/Theme.Material.Light.NoActionBar"/>
- <service
- android:name="android.app.stubs.LiveWallpaper"
- android:icon="@drawable/robot"
- android:label="@string/wallpaper_title"
- android:permission="android.permission.BIND_WALLPAPER">
+ <service android:name="android.app.stubs.LiveWallpaper"
+ android:icon="@drawable/robot"
+ android:label="@string/wallpaper_title"
+ android:permission="android.permission.BIND_WALLPAPER"
+ android:exported="true">
<intent-filter>
<action android:name="android.service.wallpaper.WallpaperService">
</action>
</intent-filter>
- <meta-data
- android:name="android.service.wallpaper"
- android:resource="@xml/wallpaper">
+ <meta-data android:name="android.service.wallpaper"
+ android:resource="@xml/wallpaper">
</meta-data>
</service>
<service android:name="android.app.stubs.TestNotificationListener"
- android:exported="true"
- android:label="TestNotificationListener"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+ android:exported="true"
+ android:label="TestNotificationListener"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
<intent-filter>
- <action android:name="android.service.notification.NotificationListenerService" />
+ <action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
</service>
<service android:name="android.app.stubs.TestTileService"
- android:exported="true"
- android:label="TestTileService"
- android:icon="@drawable/robot"
- android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+ android:exported="true"
+ android:label="TestTileService"
+ android:icon="@drawable/robot"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<intent-filter>
- <action android:name="android.service.quicksettings.action.QS_TILE" />
+ <action android:name="android.service.quicksettings.action.QS_TILE"/>
</intent-filter>
</service>
<service android:name="android.app.stubs.ToggleableTestTileService"
- android:exported="true"
- android:label="BooleanTestTileService"
- android:icon="@drawable/robot"
- android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+ android:exported="true"
+ android:label="BooleanTestTileService"
+ android:icon="@drawable/robot"
+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<intent-filter>
- <action android:name="android.service.quicksettings.action.QS_TILE" />
+ <action android:name="android.service.quicksettings.action.QS_TILE"/>
</intent-filter>
<meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
- android:value="true"/>
+ android:value="true"/>
</service>
- <activity android:name="android.app.stubs.AutomaticZenRuleActivity">
+ <activity android:name="android.app.stubs.AutomaticZenRuleActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.app.action.AUTOMATIC_ZEN_RULE" />
+ <action android:name="android.app.action.AUTOMATIC_ZEN_RULE"/>
</intent-filter>
<meta-data android:name="android.service.zen.automatic.ruleType"
- android:value="@string/automatic_zen_rule_name" />
+ android:value="@string/automatic_zen_rule_name"/>
<meta-data android:name="android.service.zen.automatic.ruleInstanceLimit"
- android:value="2" />
+ android:value="2"/>
</activity>
<receiver android:name="android.app.stubs.CommandReceiver"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name="android.app.stubs.SendBubbleActivity"
- android:turnScreenOn="true">
+ android:turnScreenOn="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <action android:name="android.intent.action.SEND" />
- <data android:mimeType="text/plain" />
- <data android:mimeType="image/*" />
+ <action android:name="android.intent.action.VIEW"/>
+ <action android:name="android.intent.action.SEND"/>
+ <data android:mimeType="text/plain"/>
+ <data android:mimeType="image/*"/>
</intent-filter>
</activity>
<activity android:name="android.app.stubs.BubbledActivity"
- android:resizeableActivity="true"/>
+ android:resizeableActivity="true"/>
<service android:name="android.app.stubs.BubblesTestService"
- android:label="BubblesTestsService"
- android:exported="true">
+ android:label="BubblesTestsService"
+ android:exported="true">
</service>
- <service android:name="android.app.stubs.LocalAlertService" />
+ <service android:name="android.app.stubs.LocalAlertService"/>
<activity android:name=".SimpleActivity"
- android:excludeFromRecents="true">
+ android:excludeFromRecents="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<meta-data android:name="android.app.shortcuts"
- android:resource="@xml/shortcuts" />
+ android:resource="@xml/shortcuts"/>
</activity>
</application>
</manifest>
-
diff --git a/tests/app/src/android/app/cts/TileServiceTest.java b/tests/app/src/android/app/cts/TileServiceTest.java
index 152baa9..2509eb7 100644
--- a/tests/app/src/android/app/cts/TileServiceTest.java
+++ b/tests/app/src/android/app/cts/TileServiceTest.java
@@ -80,6 +80,16 @@
}
@Test
+ public void testTile_hasCorrectStateDescription() throws Exception {
+ initializeAndListen();
+
+ Tile tile = mTileService.getQsTile();
+ tile.setStateDescription("test_stateDescription");
+ tile.updateTile();
+ assertEquals("test_stateDescription", tile.getStateDescription());
+ }
+
+ @Test
public void testShowDialog() throws Exception {
Looper.prepare();
Dialog dialog = new AlertDialog.Builder(mContext).create();
diff --git a/tests/app/src/android/app/cts/UiModeManagerTest.java b/tests/app/src/android/app/cts/UiModeManagerTest.java
index e877350..b474fb8 100644
--- a/tests/app/src/android/app/cts/UiModeManagerTest.java
+++ b/tests/app/src/android/app/cts/UiModeManagerTest.java
@@ -23,11 +23,13 @@
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.os.ParcelFileDescriptor;
+import android.os.UserHandle;
import android.test.AndroidTestCase;
import android.util.Log;
import com.android.compatibility.common.util.BatteryUtils;
import com.android.compatibility.common.util.SettingsUtils;
+import com.android.compatibility.common.util.UserUtils;
import junit.framework.Assert;
@@ -108,6 +110,11 @@
}
public void testNightModeYesPersisted() throws InterruptedException {
+ if (mUiModeManager.isNightModeLocked()) {
+ Log.i(TAG, "testNightModeYesPersisted skipped: night mode is locked");
+ return;
+ }
+
// Reset the mode to no if it is set to another value
setNightMode(UiModeManager.MODE_NIGHT_NO);
@@ -116,6 +123,11 @@
}
public void testNightModeAutoPersisted() throws InterruptedException {
+ if (mUiModeManager.isNightModeLocked()) {
+ Log.i(TAG, "testNightModeAutoPersisted skipped: night mode is locked");
+ return;
+ }
+
// Reset the mode to no if it is set to another value
setNightMode(UiModeManager.MODE_NIGHT_NO);
@@ -125,6 +137,7 @@
public void testNightModeAutoNotPersistedCarMode() {
if (mUiModeManager.isNightModeLocked()) {
+ Log.i(TAG, "testNightModeAutoNotPersistedCarMode skipped: night mode is locked");
return;
}
@@ -139,6 +152,7 @@
public void testNightModeInCarModeIsTransient() {
if (mUiModeManager.isNightModeLocked()) {
+ Log.i(TAG, "testNightModeInCarModeIsTransient skipped: night mode is locked");
return;
}
@@ -156,6 +170,8 @@
public void testNightModeToggleInCarModeDoesNotChangeSetting() {
if (mUiModeManager.isNightModeLocked()) {
+ Log.i(TAG, "testNightModeToggleInCarModeDoesNotChangeSetting skipped: "
+ + "night mode is locked");
return;
}
@@ -174,6 +190,8 @@
public void testNightModeInCarModeOnPowerSaveIsTransient() throws Throwable {
if (mUiModeManager.isNightModeLocked() || !BatteryUtils.isBatterySaverSupported()) {
+ Log.i(TAG, "testNightModeInCarModeOnPowerSaveIsTransient skipped: "
+ + "night mode is locked or battery saver is not supported");
return;
}
@@ -347,7 +365,7 @@
int storedModeInt = -1;
// Settings.Secure.UI_NIGHT_MODE
for (int i = 0; i < MAX_WAIT_TIME; i += WAIT_TIME_INCR) {
- String storedMode = SettingsUtils.getSecureSetting("ui_night_mode");
+ String storedMode = getUiNightModeFromSetting();
storedModeInt = Integer.parseInt(storedMode);
if (mode == storedModeInt) break;
try {
@@ -404,4 +422,10 @@
}
}
+ private String getUiNightModeFromSetting() {
+ String key = "ui_night_mode";
+ return UserUtils.isHeadlessSystemUserMode()
+ ? SettingsUtils.getSecureSettingAsUser(UserHandle.USER_SYSTEM, key)
+ : SettingsUtils.getSecureSetting(key);
+ }
}
diff --git a/tests/appintegrity/AndroidManifest.xml b/tests/appintegrity/AndroidManifest.xml
index e0a8816..c7ad8b5 100644
--- a/tests/appintegrity/AndroidManifest.xml
+++ b/tests/appintegrity/AndroidManifest.xml
@@ -15,23 +15,23 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.appintegrity.cts">
+ package="android.appintegrity.cts">
<uses-sdk android:targetSdkVersion="30"/>
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="CtsAppIntegrityDeviceActivity" >
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="CtsAppIntegrityDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.appintegrity.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.appintegrity.cts">
</instrumentation>
</manifest>
diff --git a/tests/apppredictionservice/AndroidManifest.xml b/tests/apppredictionservice/AndroidManifest.xml
index 8ee464a..1c77832 100644
--- a/tests/apppredictionservice/AndroidManifest.xml
+++ b/tests/apppredictionservice/AndroidManifest.xml
@@ -14,31 +14,31 @@
* 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.apppredictionservice.cts"
- android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.apppredictionservice.cts"
+ android:targetSandboxVersion="2">
+
+ <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- TODO(b/111701043): Update with required permissions -->
- <service
- android:name=".PredictionService"
- android:label="CtsAppPredictionService">
+ <service android:name=".PredictionService"
+ android:label="CtsAppPredictionService"
+ android:exported="true">
<intent-filter>
<!-- This constant must match AppPredictionService.SERVICE_INTERFACE -->
- <action android:name="android.service.appprediction.AppPredictionService" />
+ <action android:name="android.service.appprediction.AppPredictionService"/>
</intent-filter>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for the App Prediction Framework APIs."
- android:targetPackage="android.apppredictionservice.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for the App Prediction Framework APIs."
+ android:targetPackage="android.apppredictionservice.cts">
</instrumentation>
</manifest>
diff --git a/tests/appsearch/Android.bp b/tests/appsearch/Android.bp
new file mode 100644
index 0000000..2bb810d
--- /dev/null
+++ b/tests/appsearch/Android.bp
@@ -0,0 +1,32 @@
+// Copyright (C) 2019 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: "CtsAppSearchTestCases",
+ defaults: ["cts_defaults"],
+ static_libs: [
+ "androidx.test.ext.junit",
+ "androidx.test.rules",
+ "compatibility-device-util-axt",
+ "testng",
+ ],
+ srcs: ["src/**/*.java"],
+ test_suites: [
+ "cts",
+ "vts",
+ "vts10",
+ "general-tests",
+ ],
+ platform_apis: true,
+}
diff --git a/tests/appsearch/AndroidManifest.xml b/tests/appsearch/AndroidManifest.xml
new file mode 100644
index 0000000..7eac46b
--- /dev/null
+++ b/tests/appsearch/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2019 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.cts.appsearch" >
+ <application android:label="CtsAppSearchTestCases">
+ <uses-library android:name="android.test.runner"/>
+ </application>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.appsearch"
+ android:label="CtsAppSearchTestCases"/>
+</manifest>
diff --git a/tests/appsearch/AndroidTest.xml b/tests/appsearch/AndroidTest.xml
new file mode 100644
index 0000000..a86e339
--- /dev/null
+++ b/tests/appsearch/AndroidTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2019 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.
+ -->
+<configuration description="Config for CTS AppSearch test cases">
+ <option name="test-suite-tag" value="cts" />
+ <option name="config-descriptor:metadata" key="component" value="framework" />
+ <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+ <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+ <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="CtsAppSearchTestCases.apk" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.cts.appsearch" />
+ </test>
+</configuration>
diff --git a/tests/appsearch/OWNERS b/tests/appsearch/OWNERS
new file mode 100644
index 0000000..cf3ad8a
--- /dev/null
+++ b/tests/appsearch/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 755061
+adorokhine@google.com
diff --git a/tests/appsearch/TEST_MAPPING b/tests/appsearch/TEST_MAPPING
new file mode 100644
index 0000000..f728da5
--- /dev/null
+++ b/tests/appsearch/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAppSearchTestCases"
+ }
+ ]
+}
diff --git a/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java b/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java
new file mode 100644
index 0000000..7da22ac
--- /dev/null
+++ b/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2019 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.cts.appsearch;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.appsearch.AppSearchBatchResult;
+import android.app.appsearch.AppSearchDocument;
+import android.app.appsearch.AppSearchEmail;
+import android.app.appsearch.AppSearchManager;
+import android.app.appsearch.AppSearchResult;
+import android.app.appsearch.AppSearchSchema;
+import android.app.appsearch.AppSearchSchema.PropertyConfig;
+import android.app.appsearch.SearchResults;
+import android.app.appsearch.SearchSpec;
+import android.content.Context;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.google.common.collect.ImmutableList;
+
+import junit.framework.AssertionFailedError;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class AppSearchManagerTest {
+ private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
+ private final AppSearchManager mAppSearch = mContext.getSystemService(AppSearchManager.class);
+
+ @After
+ public void tearDown() {
+ mAppSearch.deleteAll();
+ }
+
+ @Test
+ public void testGetService() {
+ assertThat(mContext.getSystemService(Context.APP_SEARCH_SERVICE)).isNotNull();
+ assertThat(mContext.getSystemService(AppSearchManager.class)).isNotNull();
+ assertThat(mAppSearch).isNotNull();
+ }
+
+ @Test
+ public void testSetSchema() {
+ AppSearchSchema emailSchema = new AppSearchSchema.Builder("Email")
+ .addProperty(new AppSearchSchema.PropertyConfig.Builder("subject")
+ .setDataType(PropertyConfig.DATA_TYPE_STRING)
+ .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+ .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+ .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
+ .build()
+ ).addProperty(new AppSearchSchema.PropertyConfig.Builder("body")
+ .setDataType(PropertyConfig.DATA_TYPE_STRING)
+ .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+ .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+ .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
+ .build()
+ ).build();
+ checkIsSuccess(mAppSearch.setSchema(emailSchema));
+ }
+
+ @Test
+ public void testPutDocuments() {
+ // Schema registration
+ checkIsSuccess(mAppSearch.setSchema(AppSearchEmail.SCHEMA));
+
+ // Index a document
+ AppSearchEmail email = new AppSearchEmail.Builder("uri1")
+ .setFrom("from@example.com")
+ .setTo("to1@example.com", "to2@example.com")
+ .setSubject("testPut example")
+ .setBody("This is the body of the testPut email")
+ .build();
+
+ AppSearchBatchResult result = mAppSearch.putDocuments(ImmutableList.of(email));
+ checkIsSuccess(result);
+ assertThat(result.getSuccesses()).containsExactly("uri1", null);
+ assertThat(result.getFailures()).isEmpty();
+ }
+
+ @Test
+ public void testGetDocuments() {
+ // Schema registration
+ checkIsSuccess(mAppSearch.setSchema(AppSearchEmail.SCHEMA));
+
+ // Index a document
+ AppSearchEmail inEmail =
+ new AppSearchEmail.Builder("uri1")
+ .setFrom("from@example.com")
+ .setTo("to1@example.com", "to2@example.com")
+ .setSubject("testPut example")
+ .setBody("This is the body of the testPut email")
+ .build();
+ checkIsSuccess(mAppSearch.putDocuments(ImmutableList.of(inEmail)));
+
+ // Get the document
+ List<AppSearchDocument> outDocuments = doGet("uri1");
+ assertThat(outDocuments).hasSize(1);
+ AppSearchEmail outEmail = new AppSearchEmail(outDocuments.get(0));
+ assertThat(outEmail).isEqualTo(inEmail);
+ }
+
+ @Test
+ public void testQuery() {
+ // Schema registration
+ checkIsSuccess(mAppSearch.setSchema(AppSearchEmail.SCHEMA));
+
+ // Index a document
+ AppSearchEmail inEmail =
+ new AppSearchEmail.Builder("uri1")
+ .setFrom("from@example.com")
+ .setTo("to1@example.com", "to2@example.com")
+ .setSubject("testPut example")
+ .setBody("This is the body of the testPut email")
+ .build();
+ checkIsSuccess(mAppSearch.putDocuments(ImmutableList.of(inEmail)));
+
+ // Query for the document
+ List<AppSearchDocument> results = doQuery("body");
+ assertThat(results).hasSize(1);
+ assertThat(results.get(0)).isEqualTo(inEmail);
+
+ // Multi-term query
+ results = doQuery("body email");
+ assertThat(results).hasSize(1);
+ assertThat(results.get(0)).isEqualTo(inEmail);
+ }
+
+ @Test
+ public void testQuery_TypeFilter() {
+ // Schema registration
+ checkIsSuccess(mAppSearch.setSchema(AppSearchEmail.SCHEMA));
+
+ // Index a document
+ AppSearchEmail inEmail =
+ new AppSearchEmail.Builder("uri1")
+ .setFrom("from@example.com")
+ .setTo("to1@example.com", "to2@example.com")
+ .setSubject("testPut example")
+ .setBody("This is the body of the testPut email")
+ .build();
+ AppSearchDocument inDoc =
+ new AppSearchDocument.Builder("uri2", "Test").setProperty("foo", "body").build();
+ checkIsSuccess(mAppSearch.putDocuments(ImmutableList.of(inEmail, inDoc)));
+
+ // Query for the documents
+ List<AppSearchDocument> results = doQuery("body");
+ assertThat(results).hasSize(2);
+ assertThat(results).containsExactly(inEmail, inDoc);
+
+ // Query only for Document
+ results = doQuery("body", "Test");
+ assertThat(results).hasSize(1);
+ assertThat(results).containsExactly(inDoc);
+ }
+
+ @Test
+ public void testDelete() {
+ // Schema registration
+ checkIsSuccess(mAppSearch.setSchema(AppSearchEmail.SCHEMA));
+
+ // Index documents
+ AppSearchEmail email1 =
+ new AppSearchEmail.Builder("uri1")
+ .setFrom("from@example.com")
+ .setTo("to1@example.com", "to2@example.com")
+ .setSubject("testPut example")
+ .setBody("This is the body of the testPut email")
+ .build();
+ AppSearchEmail email2 =
+ new AppSearchEmail.Builder("uri2")
+ .setFrom("from@example.com")
+ .setTo("to1@example.com", "to2@example.com")
+ .setSubject("testPut example 2")
+ .setBody("This is the body of the testPut second email")
+ .build();
+ checkIsSuccess(mAppSearch.putDocuments(ImmutableList.of(email1, email2)));
+
+ // Check the presence of the documents
+ assertThat(doGet("uri1")).hasSize(1);
+ assertThat(doGet("uri2")).hasSize(1);
+
+ // Delete the document
+ checkIsSuccess(mAppSearch.delete(ImmutableList.of("uri1")));
+
+ // Make sure it's really gone
+ AppSearchBatchResult<String, AppSearchDocument> getResult =
+ mAppSearch.getDocuments(ImmutableList.of("uri1", "uri2"));
+ assertThat(getResult.isSuccess()).isFalse();
+ assertThat(getResult.getFailures().get("uri1").getResultCode())
+ .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
+ assertThat(getResult.getSuccesses().get("uri2")).isEqualTo(email2);
+ }
+
+ @Test
+ public void testDeleteByTypes() {
+ // Schema registration
+ checkIsSuccess(mAppSearch.setSchema(AppSearchEmail.SCHEMA));
+
+ // Index documents
+ AppSearchEmail email1 =
+ new AppSearchEmail.Builder("uri1")
+ .setFrom("from@example.com")
+ .setTo("to1@example.com", "to2@example.com")
+ .setSubject("testPut example")
+ .setBody("This is the body of the testPut email")
+ .build();
+ AppSearchEmail email2 =
+ new AppSearchEmail.Builder("uri2")
+ .setFrom("from@example.com")
+ .setTo("to1@example.com", "to2@example.com")
+ .setSubject("testPut example 2")
+ .setBody("This is the body of the testPut second email")
+ .build();
+ AppSearchDocument document1 =
+ new AppSearchDocument.Builder("uri3", "schemaType")
+ .setProperty("foo", "bar").build();
+ checkIsSuccess(mAppSearch.putDocuments(ImmutableList.of(email1, email2, document1)));
+
+ // Check the presence of the documents
+ assertThat(doGet("uri1", "uri2", "uri3")).hasSize(3);
+
+ // Delete the email type
+ checkIsSuccess(mAppSearch.deleteByTypes(ImmutableList.of(AppSearchEmail.SCHEMA_TYPE)));
+
+ // Make sure it's really gone
+ AppSearchBatchResult<String, AppSearchDocument> getResult =
+ mAppSearch.getDocuments(ImmutableList.of("uri1", "uri2", "uri3"));
+ assertThat(getResult.isSuccess()).isFalse();
+ assertThat(getResult.getFailures().get("uri1").getResultCode())
+ .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
+ assertThat(getResult.getFailures().get("uri2").getResultCode())
+ .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
+ assertThat(getResult.getSuccesses().get("uri3")).isEqualTo(document1);
+ }
+
+ private List<AppSearchDocument> doGet(String... uris) {
+ AppSearchBatchResult<String, AppSearchDocument> result =
+ mAppSearch.getDocuments(Arrays.asList(uris));
+ checkIsSuccess(result);
+ assertThat(result.getSuccesses()).hasSize(uris.length);
+ assertThat(result.getFailures()).isEmpty();
+ List<AppSearchDocument> list = new ArrayList<>(uris.length);
+ for (String uri : uris) {
+ list.add(result.getSuccesses().get(uri));
+ }
+ return list;
+ }
+
+ private List<AppSearchDocument> doQuery(String queryExpression, String... schemaTypes) {
+ AppSearchResult<SearchResults> result = mAppSearch.query(
+ queryExpression,
+ SearchSpec.newBuilder()
+ .setSchemaTypes(schemaTypes)
+ .setTermMatchType(SearchSpec.TERM_MATCH_TYPE_EXACT_ONLY)
+ .build());
+ checkIsSuccess(result);
+ SearchResults searchResults = result.getResultValue();
+ List<AppSearchDocument> documents = new ArrayList<>();
+ while (searchResults.hasNext()) {
+ documents.add(searchResults.next().getDocument());
+ }
+ return documents;
+ }
+
+ private void checkIsSuccess(AppSearchResult<?> result) {
+ if (!result.isSuccess()) {
+ throw new AssertionFailedError("AppSearchResult not successful: " + result);
+ }
+ }
+
+ private void checkIsSuccess(AppSearchBatchResult<?,?> result) {
+ if (!result.isSuccess()) {
+ throw new AssertionFailedError(
+ "AppSearchBatchResult not successful: " + result.getFailures());
+ }
+ }
+}
diff --git a/tests/aslr/TEST_MAPPING b/tests/aslr/TEST_MAPPING
new file mode 100644
index 0000000..ee44915
--- /dev/null
+++ b/tests/aslr/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAslrMallocTestCases"
+ }
+ ]
+}
diff --git a/tests/attentionservice/AndroidManifest.xml b/tests/attentionservice/AndroidManifest.xml
index 22ab937..341a6f9 100644
--- a/tests/attentionservice/AndroidManifest.xml
+++ b/tests/attentionservice/AndroidManifest.xml
@@ -16,30 +16,30 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.attentionservice.cts">
+ package="android.attentionservice.cts">
<application>
- <uses-library android:name="android.test.runner" />
- <service
- android:name=".CtsTestAttentionService"
- android:label="CtsTestAttentionService"
- android:permission="android.permission.BIND_ATTENTION_SERVICE">
+ <uses-library android:name="android.test.runner"/>
+ <service android:name=".CtsTestAttentionService"
+ android:label="CtsTestAttentionService"
+ android:permission="android.permission.BIND_ATTENTION_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.service.attention.AttentionService"/>
</intent-filter>
</service>
- <activity android:name="CtsAttentionServiceDeviceActivity" >
+ <activity android:name="CtsAttentionServiceDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for the Attention Service APIs."
- android:targetPackage="android.attentionservice.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for the Attention Service APIs."
+ android:targetPackage="android.attentionservice.cts">
</instrumentation>
</manifest>
diff --git a/tests/autofillservice/AndroidManifest.xml b/tests/autofillservice/AndroidManifest.xml
index f690678..b584b5b 100644
--- a/tests/autofillservice/AndroidManifest.xml
+++ b/tests/autofillservice/AndroidManifest.xml
@@ -14,202 +14,211 @@
* 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.autofillservice.cts"
- android:targetSandboxVersion="2">
+ package="android.autofillservice.cts"
+ android:targetSandboxVersion="2">
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
- <uses-permission android:name="android.permission.INJECT_EVENTS" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+ <uses-permission android:name="android.permission.INJECT_EVENTS"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name=".LoginActivity" >
+ <activity android:name=".LoginActivity"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".PreFilledLoginActivity" />
+ <activity android:name=".PreFilledLoginActivity"/>
<activity android:name=".LoginWithCustomHighlightActivity"
- android:theme="@style/MyAutofilledHighlight"/>
- <activity android:name=".LoginWithStringsActivity" />
- <activity android:name=".LoginNotImportantForAutofillActivity" />
- <activity android:name=".LoginNotImportantForAutofillWrappedActivityContextActivity" />
- <activity android:name=".LoginNotImportantForAutofillWrappedApplicationContextActivity" />
- <activity android:name=".WelcomeActivity" android:taskAffinity=".WelcomeActivity"/>
+ android:theme="@style/MyAutofilledHighlight"/>
+ <activity android:name=".LoginWithStringsActivity"/>
+ <activity android:name=".LoginNotImportantForAutofillActivity"/>
+ <activity android:name=".LoginNotImportantForAutofillWrappedActivityContextActivity"/>
+ <activity android:name=".LoginNotImportantForAutofillWrappedApplicationContextActivity"/>
+ <activity android:name=".WelcomeActivity"
+ android:taskAffinity=".WelcomeActivity"/>
<activity android:name=".ViewActionActivity"
- android:taskAffinity=".ViewActionActivity"
- android:launchMode="singleTask">
+ android:taskAffinity=".ViewActionActivity"
+ android:launchMode="singleTask"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <data android:scheme="autofillcts" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.VIEW"/>
+ <data android:scheme="autofillcts"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity android:name=".SecondActivity" android:taskAffinity=".SecondActivity"/>
- <activity android:name=".ViewAttributesTestActivity" />
- <activity android:name=".AuthenticationActivity" />
- <activity android:name=".ManualAuthenticationActivity" />
- <activity android:name=".CheckoutActivity" android:taskAffinity=".CheckoutActivity"/>
- <activity android:name=".InitializedCheckoutActivity" />
- <activity android:name=".DatePickerCalendarActivity" />
- <activity android:name=".DatePickerSpinnerActivity" />
- <activity android:name=".TimePickerClockActivity" />
- <activity android:name=".TimePickerSpinnerActivity" />
- <activity android:name=".FatActivity" />
- <activity android:name=".VirtualContainerActivity">
+ <activity android:name=".SecondActivity"
+ android:taskAffinity=".SecondActivity"/>
+ <activity android:name=".ViewAttributesTestActivity"/>
+ <activity android:name=".AuthenticationActivity"/>
+ <activity android:name=".ManualAuthenticationActivity"/>
+ <activity android:name=".CheckoutActivity"
+ android:taskAffinity=".CheckoutActivity"/>
+ <activity android:name=".InitializedCheckoutActivity"/>
+ <activity android:name=".DatePickerCalendarActivity"/>
+ <activity android:name=".DatePickerSpinnerActivity"/>
+ <activity android:name=".TimePickerClockActivity"/>
+ <activity android:name=".TimePickerSpinnerActivity"/>
+ <activity android:name=".FatActivity"/>
+ <activity android:name=".VirtualContainerActivity"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".OptionalSaveActivity" />
- <activity android:name=".AllAutofillableViewsActivity" />
+ <activity android:name=".OptionalSaveActivity"/>
+ <activity android:name=".AllAutofillableViewsActivity"/>
<activity android:name=".GridActivity"/>
<activity android:name=".EmptyActivity"/>
<activity android:name=".DummyActivity"/>
<activity android:name=".OutOfProcessLoginActivity"
- android:process="android.autofillservice.cts.outside"/>
- <activity android:name=".FragmentContainerActivity" />
+ android:process="android.autofillservice.cts.outside"/>
+ <activity android:name=".FragmentContainerActivity"/>
<activity android:name=".DuplicateIdActivity"
- android:theme="@android:style/Theme.NoTitleBar" />
+ android:theme="@android:style/Theme.NoTitleBar"/>
<activity android:name=".SimpleSaveActivity"/>
- <activity android:name=".PreSimpleSaveActivity">
+ <activity android:name=".PreSimpleSaveActivity"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".WebViewActivity"/>
<activity android:name=".WebViewMultiScreenLoginActivity"/>
<activity android:name=".TrampolineWelcomeActivity"/>
<activity android:name=".AttachedContextActivity"/>
- <activity android:name=".DialogLauncherActivity" >
+ <activity android:name=".DialogLauncherActivity"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".MultiWindowLoginActivity" />
+ <activity android:name=".MultiWindowLoginActivity"/>
<activity android:name=".MultiWindowEmptyActivity"
- android:taskAffinity="nobody.but.EmptyActivity"
- android:exported="true" />
+ android:taskAffinity="nobody.but.EmptyActivity"
+ android:exported="true"/>
- <activity android:name=".TrampolineForResultActivity" />
+ <activity android:name=".TrampolineForResultActivity"/>
<activity android:name=".OnCreateServiceStatusVerifierActivity"/>
- <activity android:name=".UsernameOnlyActivity" >
+ <activity android:name=".UsernameOnlyActivity"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".PasswordOnlyActivity" >
+ <activity android:name=".PasswordOnlyActivity"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".augmented.AugmentedLoginActivity">
+ <activity android:name=".augmented.AugmentedLoginActivity"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".augmented.AugmentedAuthActivity" />
- <activity android:name=".SimpleAfterLoginActivity" />
- <activity android:name=".SimpleBeforeLoginActivity" />
- <activity android:name=".NonAutofillableActivity" />
+ <activity android:name=".SimpleAfterLoginActivity"/>
+ <activity android:name=".SimpleBeforeLoginActivity"/>
+ <activity android:name=".NonAutofillableActivity"/>
<receiver android:name=".SelfDestructReceiver"
- android:exported="true"
- android:process="android.autofillservice.cts.outside"/>
+ android:exported="true"
+ android:process="android.autofillservice.cts.outside"/>
<receiver android:name=".OutOfProcessLoginActivityFinisherReceiver"
- android:exported="true"
- android:process="android.autofillservice.cts.outside"/>
+ android:exported="true"
+ android:process="android.autofillservice.cts.outside"/>
- <service
- android:name=".InstrumentedAutoFillService"
- android:label="InstrumentedAutoFillService"
- android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
+ <service android:name=".InstrumentedAutoFillService"
+ android:label="InstrumentedAutoFillService"
+ android:permission="android.permission.BIND_AUTOFILL_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.autofill.AutofillService" />
+ <action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
- <service
- android:name=".InstrumentedAutoFillServiceCompatMode"
- android:label="InstrumentedAutoFillServiceCompatMode"
- android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
+ <service android:name=".InstrumentedAutoFillServiceCompatMode"
+ android:label="InstrumentedAutoFillServiceCompatMode"
+ android:permission="android.permission.BIND_AUTOFILL_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.autofill.AutofillService" />
+ <action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
- <meta-data
- android:name="android.autofill"
- android:resource="@xml/autofill_service_compat_mode_config">
+ <meta-data android:name="android.autofill"
+ android:resource="@xml/autofill_service_compat_mode_config">
</meta-data>
</service>
- <service
- android:name=".inline.InstrumentedAutoFillServiceInlineEnabled"
- android:label="InstrumentedAutoFillServiceInlineEnabled"
- android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
+ <service android:name=".inline.InstrumentedAutoFillServiceInlineEnabled"
+ android:label="InstrumentedAutoFillServiceInlineEnabled"
+ android:permission="android.permission.BIND_AUTOFILL_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.autofill.AutofillService" />
+ <action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
- <meta-data
- android:name="android.autofill"
- android:resource="@xml/autofill_service_inline_enabled">
+ <meta-data android:name="android.autofill"
+ android:resource="@xml/autofill_service_inline_enabled">
</meta-data>
</service>
- <service
- android:name=".NoOpAutofillService"
- android:label="NoOpAutofillService"
- android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
+ <service android:name=".NoOpAutofillService"
+ android:label="NoOpAutofillService"
+ android:permission="android.permission.BIND_AUTOFILL_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.autofill.AutofillService" />
+ <action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
<!-- BadAutofillService does not declare the proper permission -->
- <service
- android:name=".BadAutofillService"
- android:label="BadAutofillService">
+ <service android:name=".BadAutofillService"
+ android:label="BadAutofillService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.autofill.AutofillService" />
+ <action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
- <service
- android:name=".augmented.CtsAugmentedAutofillService"
- android:label="CtsAugmentedAutofillService"
- android:permission="android.permission.BIND_AUGMENTED_AUTOFILL_SERVICE" >
+ <service android:name=".augmented.CtsAugmentedAutofillService"
+ android:label="CtsAugmentedAutofillService"
+ android:permission="android.permission.BIND_AUGMENTED_AUTOFILL_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.autofill.AutofillService" />
+ <action android:name="android.service.autofill.AutofillService"/>
</intent-filter>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for the AutoFill Framework APIs."
- android:targetPackage="android.autofillservice.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for the AutoFill Framework APIs."
+ android:targetPackage="android.autofillservice.cts">
</instrumentation>
</manifest>
diff --git a/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java
index 9e7c599..f7af289 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java
@@ -2727,7 +2727,7 @@
final ViewNode password = findNodeByResourceId(request.structure, ID_PASSWORD);
assertThat(password.getMinTextEms()).isEqualTo(-1);
assertThat(password.getMaxTextEms()).isEqualTo(-1);
- assertThat(password.getMaxTextLength()).isEqualTo(-1);
+ assertThat(password.getMaxTextLength()).isEqualTo(5000);
}
@Test
diff --git a/tests/autofillservice/src/android/autofillservice/cts/MultiWindowLoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/MultiWindowLoginActivityTest.java
index e7f26e2..52ab3df 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/MultiWindowLoginActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/MultiWindowLoginActivityTest.java
@@ -68,7 +68,7 @@
@Before
public void setup() {
assumeTrue("Skipping test: no split multi-window support",
- ActivityTaskManager.supportsSplitScreenMultiWindow(mContext));
+ ActivityTaskManager.supportsSplitScreenMultiWindow(mActivity));
}
/**
diff --git a/tests/backup/app/fullbackup/AndroidManifest.xml b/tests/backup/app/fullbackup/AndroidManifest.xml
index 138c774..7f639f9 100644
--- a/tests/backup/app/fullbackup/AndroidManifest.xml
+++ b/tests/backup/app/fullbackup/AndroidManifest.xml
@@ -16,28 +16,28 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.backup.app" >
+ package="android.backup.app">
- <application
- android:allowBackup="true"
- android:backupAgent="FullBackupBackupAgent"
- android:label="Android Backup CTS App"
- android:fullBackupOnly="true">
- <uses-library android:name="android.test.runner" />
+ <application android:allowBackup="true"
+ android:backupAgent="FullBackupBackupAgent"
+ android:label="Android Backup CTS App"
+ android:fullBackupOnly="true">
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name=".MainActivity"
- android:label="Android Backup CTS App" >
+ <activity android:name=".MainActivity"
+ android:label="Android Backup CTS App"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <receiver android:name=".WakeUpReceiver">
+ <receiver android:name=".WakeUpReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.backup.app.ACTION_WAKE_UP" />
+ <action android:name="android.backup.app.ACTION_WAKE_UP"/>
</intent-filter>
</receiver>
diff --git a/tests/backup/app/keyvalue/AndroidManifest.xml b/tests/backup/app/keyvalue/AndroidManifest.xml
index 3ed302d..c36d70c 100644
--- a/tests/backup/app/keyvalue/AndroidManifest.xml
+++ b/tests/backup/app/keyvalue/AndroidManifest.xml
@@ -16,20 +16,19 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.backup.kvapp" >
+ package="android.backup.kvapp">
- <application
- android:allowBackup="true"
- android:backupAgent="android.backup.app.KeyValueBackupAgent"
- android:label="Android Key Value Backup CTS App">
- <uses-library android:name="android.test.runner" />
+ <application android:allowBackup="true"
+ android:backupAgent="android.backup.app.KeyValueBackupAgent"
+ android:label="Android Key Value Backup CTS App">
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name="android.backup.app.MainActivity"
- android:label="Android Key Value Backup CTS App" >
+ <activity android:name="android.backup.app.MainActivity"
+ android:label="Android Key Value Backup CTS App"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/bugreport/Android.bp b/tests/bugreport/Android.bp
index 40e8975..d008efb 100644
--- a/tests/bugreport/Android.bp
+++ b/tests/bugreport/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test_helper_app {
+android_test {
name: "CtsBugreportTestCases",
defaults: ["cts_defaults"],
static_libs: [
@@ -25,4 +25,8 @@
],
srcs: ["src/**/*.java"],
sdk_version: "test_current",
+ test_suites: [
+ "cts",
+ "general-tests",
+ ],
}
diff --git a/tests/bugreport/AndroidTest.xml b/tests/bugreport/AndroidTest.xml
index b46682a..bdb66bb 100644
--- a/tests/bugreport/AndroidTest.xml
+++ b/tests/bugreport/AndroidTest.xml
@@ -16,7 +16,7 @@
-->
<configuration description="Bugreport Manager tests">
<option name="test-suite-tag" value="cts" />
- <option name="config-descriptor:metadata" key="component" value="auto" />
+ <option name="config-descriptor:metadata" key="component" value="framework" />
<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<option name="config-descriptor:metadata" key="parameter" value="not_secondary_user" />
@@ -26,5 +26,6 @@
</target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="android.bugreport.cts" />
+ <option name="runtime-hint" value="3m40s" />
</test>
</configuration>
diff --git a/tests/bugreport/OWNERS b/tests/bugreport/OWNERS
index 32da65d..6ac6141 100644
--- a/tests/bugreport/OWNERS
+++ b/tests/bugreport/OWNERS
@@ -1,2 +1,3 @@
+# Bug component: 153446
abkaur@google.com
nandana@google.com
diff --git a/tests/bugreport/TEST_MAPPING b/tests/bugreport/TEST_MAPPING
new file mode 100644
index 0000000..4244967
--- /dev/null
+++ b/tests/bugreport/TEST_MAPPING
@@ -0,0 +1,17 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsBugreportTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.LargeTest"
+ }
+ ]
+ }
+ ],
+ "postsubmit": [
+ {
+ "name": "CtsBugreportTestCases"
+ }
+ ]
+}
diff --git a/tests/bugreport/src/android/bugreport/cts/BugreportManagerTest.java b/tests/bugreport/src/android/bugreport/cts/BugreportManagerTest.java
index 0a9b3f8..bea0dd1 100644
--- a/tests/bugreport/src/android/bugreport/cts/BugreportManagerTest.java
+++ b/tests/bugreport/src/android/bugreport/cts/BugreportManagerTest.java
@@ -29,6 +29,7 @@
import android.util.Pair;
import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
@@ -91,6 +92,7 @@
assertThat(screenshot).isNull();
}
+ @LargeTest
@Test
public void testFullBugreport() throws Exception {
Pair<String, String> brFiles = triggerBugreport(BugreportParams.BUGREPORT_MODE_FULL);
diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java b/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
index 4374db9..80e8f69 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
@@ -2520,6 +2520,17 @@
CaptureRequest.DISTORTION_CORRECTION_MODE_OFF);
}
+ // Scaler settings
+ if (mStaticInfo.areKeysAvailable(
+ CameraCharacteristics.SCALER_AVAILABLE_ROTATE_AND_CROP_MODES)) {
+ List<Integer> rotateAndCropModes = Arrays.asList(toObject(
+ props.get(CameraCharacteristics.SCALER_AVAILABLE_ROTATE_AND_CROP_MODES)));
+ if (rotateAndCropModes.contains(SCALER_ROTATE_AND_CROP_AUTO)) {
+ mCollector.expectKeyValueEquals(request, SCALER_ROTATE_AND_CROP,
+ CaptureRequest.SCALER_ROTATE_AND_CROP_AUTO);
+ }
+ }
+
// Check JPEG quality
if (mStaticInfo.isColorOutputSupported()) {
mCollector.expectKeyValueNotNull(request, JPEG_QUALITY);
diff --git a/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java b/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java
index a5c8978..8e8f421 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java
@@ -733,6 +733,10 @@
waiverKeys.add(CaptureResult.CONTROL_EXTENDED_SCENE_MODE);
}
+ if (!staticInfo.isRotateAndCropSupported()) {
+ waiverKeys.add(CaptureResult.SCALER_ROTATE_AND_CROP);
+ }
+
if (staticInfo.isHardwareLevelAtLeastFull()) {
return waiverKeys;
}
@@ -847,6 +851,7 @@
waiverKeys.add(CaptureResult.STATISTICS_FACE_DETECT_MODE);
waiverKeys.add(CaptureResult.FLASH_MODE);
waiverKeys.add(CaptureResult.SCALER_CROP_REGION);
+ waiverKeys.add(CaptureResult.SCALER_ROTATE_AND_CROP);
return waiverKeys;
}
@@ -1019,6 +1024,7 @@
resultKeys.add(CaptureResult.NOISE_REDUCTION_MODE);
resultKeys.add(CaptureResult.REQUEST_PIPELINE_DEPTH);
resultKeys.add(CaptureResult.SCALER_CROP_REGION);
+ resultKeys.add(CaptureResult.SCALER_ROTATE_AND_CROP);
resultKeys.add(CaptureResult.SENSOR_EXPOSURE_TIME);
resultKeys.add(CaptureResult.SENSOR_FRAME_DURATION);
resultKeys.add(CaptureResult.SENSOR_SENSITIVITY);
diff --git a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index 7bf1f4c..2a8ef17 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -2315,6 +2315,53 @@
}
}
+ /**
+ * Check rotate-and-crop camera reporting.
+ * Every device must report NONE; if actually supporting feature, must report NONE, 90, AUTO at
+ * least.
+ */
+ @Test
+ public void testRotateAndCropCharacteristics() {
+ for (int i = 0; i < mAllCameraIds.length; i++) {
+ Log.i(TAG, "testRotateAndCropCharacteristics: Testing camera ID " + mAllCameraIds[i]);
+
+ CameraCharacteristics c = mCharacteristics.get(i);
+
+ if (!arrayContains(mCameraIdsUnderTest, mAllCameraIds[i])) {
+ // Skip hidden physical cameras
+ continue;
+ }
+
+ int[] availableRotateAndCropModes = c.get(
+ CameraCharacteristics.SCALER_AVAILABLE_ROTATE_AND_CROP_MODES);
+ assertTrue("availableRotateAndCropModes must not be null",
+ availableRotateAndCropModes != null);
+ boolean foundAuto = false;
+ boolean foundNone = false;
+ boolean found90 = false;
+ for (int mode : availableRotateAndCropModes) {
+ switch(mode) {
+ case CameraCharacteristics.SCALER_ROTATE_AND_CROP_NONE:
+ foundNone = true;
+ break;
+ case CameraCharacteristics.SCALER_ROTATE_AND_CROP_90:
+ found90 = true;
+ break;
+ case CameraCharacteristics.SCALER_ROTATE_AND_CROP_AUTO:
+ foundAuto = true;
+ break;
+ }
+ }
+ if (availableRotateAndCropModes.length > 1) {
+ assertTrue("To support SCALER_ROTATE_AND_CROP: NONE, 90, and AUTO must be included",
+ foundNone && found90 && foundAuto);
+ } else {
+ assertTrue("If only one SCALER_ROTATE_AND_CROP value is supported, it must be NONE",
+ foundNone);
+ }
+ }
+ }
+
private boolean matchParametersToCharacteritics(Camera.Parameters params,
Camera.CameraInfo info, CameraCharacteristics ch) {
Integer facing = ch.get(CameraCharacteristics.LENS_FACING);
diff --git a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
index a05af2a..60eaebe 100644
--- a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
+++ b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
@@ -2571,6 +2571,26 @@
}
/**
+ * Check if rotate and crop is supported
+ */
+ public boolean isRotateAndCropSupported() {
+ int[] availableRotateAndCropModes = mCharacteristics.get(
+ CameraCharacteristics.SCALER_AVAILABLE_ROTATE_AND_CROP_MODES);
+
+ if (availableRotateAndCropModes == null) {
+ return false;
+ }
+
+ for (int mode : availableRotateAndCropModes) {
+ if (mode != CameraMetadata.SCALER_ROTATE_AND_CROP_NONE) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
* Check if distortion correction is supported.
*/
public boolean isDistortionCorrectionSupported() {
diff --git a/tests/contentcaptureservice/AndroidManifest.xml b/tests/contentcaptureservice/AndroidManifest.xml
index a4b456e..1ec33f9 100644
--- a/tests/contentcaptureservice/AndroidManifest.xml
+++ b/tests/contentcaptureservice/AndroidManifest.xml
@@ -14,116 +14,125 @@
* 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.contentcaptureservice.cts"
- android:targetSandboxVersion="2">
+ package="android.contentcaptureservice.cts"
+ android:targetSandboxVersion="2">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name=".BlankActivity"
- android:label="Blank"
- android:taskAffinity=".BlankActivity"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:label="Blank"
+ android:taskAffinity=".BlankActivity"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".BlankWithTitleActivity"
- android:label="Blanka"
- android:taskAffinity=".BlankWithTitleActivity">
+ android:label="Blanka"
+ android:taskAffinity=".BlankWithTitleActivity"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".LoginActivity"
- android:label="Login"
- android:taskAffinity=".LoginActivity"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:label="Login"
+ android:taskAffinity=".LoginActivity"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".ResizingEditActivity"
- android:label="ReizingEdit"
- android:taskAffinity=".ResizingEditActivity"
- android:windowSoftInputMode="adjustResize"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:label="ReizingEdit"
+ android:taskAffinity=".ResizingEditActivity"
+ android:windowSoftInputMode="adjustResize"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".ChildlessActivity"
- android:label="Childless"
- android:taskAffinity=".ChildlessActivity"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:label="Childless"
+ android:taskAffinity=".ChildlessActivity"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".CustomViewActivity"
- android:label="CustomView"
- android:taskAffinity=".CustomViewActivity"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:label="CustomView"
+ android:taskAffinity=".CustomViewActivity"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".OutOfProcessActivity"
- android:label="Oop"
- android:taskAffinity=".OutOfProcessActivity"
- android:theme="@android:style/Theme.NoTitleBar"
- android:process="android.contentcapture.cts.outside">
+ android:label="Oop"
+ android:taskAffinity=".OutOfProcessActivity"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:process="android.contentcapture.cts.outside"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".DataSharingActivity"
- android:label="DataSharing"
- android:taskAffinity=".DataSharingActivity"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:label="DataSharing"
+ android:taskAffinity=".DataSharingActivity"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<receiver android:name=".SelfDestructReceiver"
- android:exported="true"
- android:process="android.contentcapture.cts.outside"/>
+ android:exported="true"
+ android:process="android.contentcapture.cts.outside"/>
- <service
- android:name=".CtsContentCaptureService"
- android:label="CtsContentCaptureService"
- android:permission="android.permission.BIND_CONTENT_CAPTURE_SERVICE">
+ <service android:name=".CtsContentCaptureService"
+ android:label="CtsContentCaptureService"
+ android:permission="android.permission.BIND_CONTENT_CAPTURE_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.contentcapture.ContentCaptureService" />
+ <action android:name="android.service.contentcapture.ContentCaptureService"/>
</intent-filter>
</service>
@@ -137,10 +146,9 @@
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for the AutoFill Framework APIs."
- android:targetPackage="android.contentcaptureservice.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for the AutoFill Framework APIs."
+ android:targetPackage="android.contentcaptureservice.cts">
</instrumentation>
</manifest>
diff --git a/tests/contentcaptureservice/OutsideOfPackageActivity/AndroidManifest.xml b/tests/contentcaptureservice/OutsideOfPackageActivity/AndroidManifest.xml
index ea2fa41..164cdcf 100644
--- a/tests/contentcaptureservice/OutsideOfPackageActivity/AndroidManifest.xml
+++ b/tests/contentcaptureservice/OutsideOfPackageActivity/AndroidManifest.xml
@@ -14,31 +14,32 @@
* 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.contentcaptureservice.cts2"
- android:targetSandboxVersion="2">
+ package="android.contentcaptureservice.cts2"
+ android:targetSandboxVersion="2">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name=".OutsideOfPackageActivity"
- android:label="OutsideOfPackage"
- android:taskAffinity=".OutsideOfPackageActivity"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:label="OutsideOfPackage"
+ android:taskAffinity=".OutsideOfPackageActivity"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:exported="true">
<intent-filter>
<!-- This intent filter is not really needed by CTS, but it makes easier to launch
- this app during CTS development... -->
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ this app during CTS development... -->
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for the AutoFill Framework APIs."
- android:targetPackage="android.contentcaptureservice.cts2" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for the AutoFill Framework APIs."
+ android:targetPackage="android.contentcaptureservice.cts2">
</instrumentation>
</manifest>
diff --git a/tests/contentsuggestions/AndroidManifest.xml b/tests/contentsuggestions/AndroidManifest.xml
index 0d47cc2..7786845 100644
--- a/tests/contentsuggestions/AndroidManifest.xml
+++ b/tests/contentsuggestions/AndroidManifest.xml
@@ -14,28 +14,28 @@
* 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.contentsuggestions.cts"
- android:targetSandboxVersion="2">
+ package="android.contentsuggestions.cts"
+ android:targetSandboxVersion="2">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <service
- android:name=".CtsContentSuggestionsService"
- android:label="CtsContentSuggestionsService"
- android:permission="android.permission.BIND_CONTENT_SUGGESTIONS_SERVICE">
+ <service android:name=".CtsContentSuggestionsService"
+ android:label="CtsContentSuggestionsService"
+ android:permission="android.permission.BIND_CONTENT_SUGGESTIONS_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.contentsuggestions.ContentSuggestionsService" />
+ <action android:name="android.service.contentsuggestions.ContentSuggestionsService"/>
</intent-filter>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for the ContentSuggestionsManager APIs."
- android:targetPackage="android.contentsuggestions.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for the ContentSuggestionsManager APIs."
+ android:targetPackage="android.contentsuggestions.cts">
</instrumentation>
</manifest>
diff --git a/tests/contentsuggestions/TEST_MAPPING b/tests/contentsuggestions/TEST_MAPPING
new file mode 100644
index 0000000..aaf01a4
--- /dev/null
+++ b/tests/contentsuggestions/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsContentSuggestionsTestCases"
+ }
+ ]
+}
diff --git a/tests/contentsuggestions/src/android/contentsuggestions/cts/ContentSuggestionsManagerTest.java b/tests/contentsuggestions/src/android/contentsuggestions/cts/ContentSuggestionsManagerTest.java
index 31b595a..c927c63 100644
--- a/tests/contentsuggestions/src/android/contentsuggestions/cts/ContentSuggestionsManagerTest.java
+++ b/tests/contentsuggestions/src/android/contentsuggestions/cts/ContentSuggestionsManagerTest.java
@@ -19,7 +19,7 @@
import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
-
+import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.any;
@@ -32,6 +32,7 @@
import android.app.contentsuggestions.ContentSuggestionsManager;
import android.app.contentsuggestions.SelectionsRequest;
import android.content.Context;
+import android.graphics.Bitmap;
import android.os.Bundle;
import android.util.Log;
@@ -48,6 +49,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -121,6 +124,26 @@
}
@Test
+ public void managerForwards_provideContextBitmap() {
+ int taskId = -1; // Explicit bitmap is provided; so task id is absent.
+
+ Bitmap expectedBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
+ mManager.provideContextImage(expectedBitmap, new Bundle());
+ ArgumentCaptor<Bundle> bundleArg = ArgumentCaptor.forClass(Bundle.class);
+ ArgumentCaptor<Bitmap> bitmapArg = ArgumentCaptor.forClass(Bitmap.class);
+ verifyService().onProcessContextImage(eq(taskId), bitmapArg.capture(),
+ bundleArg.capture());
+ Bitmap actualBitmap = bundleArg.getValue().getParcelable(
+ ContentSuggestionsManager.EXTRA_BITMAP);
+
+ // Both the Bundle bitmap and the explicit bitmap should match the provided one.
+ assertThat(actualBitmap.getWidth()).isEqualTo(expectedBitmap.getWidth());
+ assertThat(actualBitmap.getHeight()).isEqualTo(expectedBitmap.getHeight());
+ assertThat(bitmapArg.getValue().getWidth()).isEqualTo(expectedBitmap.getWidth());
+ assertThat(bitmapArg.getValue().getHeight()).isEqualTo(expectedBitmap.getHeight());
+ }
+
+ @Test
public void managerForwards_suggestContentSelections() {
SelectionsRequest request = new SelectionsRequest.Builder(1).build();
ContentSuggestionsManager.SelectionsCallback callback = (statusCode, selections) -> {};
diff --git a/tests/controls/AndroidManifest.xml b/tests/controls/AndroidManifest.xml
index 4ce024e..0862e62 100644
--- a/tests/controls/AndroidManifest.xml
+++ b/tests/controls/AndroidManifest.xml
@@ -15,21 +15,21 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.controls.cts">
+ package="android.controls.cts">
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="CtsControlsDeviceActivity" >
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="CtsControlsDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.controls.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.controls.cts">
</instrumentation>
</manifest>
diff --git a/tests/core/runner-axt/src/com/android/cts/runner/CtsTestRunListener.java b/tests/core/runner-axt/src/com/android/cts/runner/CtsTestRunListener.java
index db36213..0822ca2 100644
--- a/tests/core/runner-axt/src/com/android/cts/runner/CtsTestRunListener.java
+++ b/tests/core/runner-axt/src/com/android/cts/runner/CtsTestRunListener.java
@@ -41,7 +41,6 @@
import java.net.Authenticator;
import java.net.CookieHandler;
import java.net.ResponseCache;
-import java.text.DateFormat;
import java.util.Locale;
import java.util.Properties;
import java.util.TimeZone;
@@ -187,23 +186,80 @@
}
}
- // http://code.google.com/p/vogar/source/browse/trunk/src/vogar/target/TestEnvironment.java
- static class TestEnvironment {
- private static final Field sDateFormatIs24HourField;
- static {
+ private interface TestEnvironmentResetter {
+ Boolean getDateFormatIs24Hour();
+ void setDateFormatIs24Hour(Boolean value);
+ Properties createDefaultProperties();
+ }
+
+ private static class AndroidTestEnvironmentResetter implements TestEnvironmentResetter {
+ private final Field mDateFormatIs24HourField;
+
+ AndroidTestEnvironmentResetter() {
try {
Class<?> dateFormatClass = Class.forName("java.text.DateFormat");
- sDateFormatIs24HourField = dateFormatClass.getDeclaredField("is24Hour");
+ mDateFormatIs24HourField = dateFormatClass.getDeclaredField("is24Hour");
} catch (ReflectiveOperationException e) {
throw new AssertionError("Missing DateFormat.is24Hour", e);
}
}
+ @Override
+ public Boolean getDateFormatIs24Hour() {
+ try {
+ return (Boolean) mDateFormatIs24HourField.get(null);
+ } catch (ReflectiveOperationException e) {
+ throw new AssertionError("Unable to get java.text.DateFormat.is24Hour", e);
+ }
+ }
+
+ @Override
+ public void setDateFormatIs24Hour(Boolean value) {
+ try {
+ mDateFormatIs24HourField.set(null, value);
+ } catch (ReflectiveOperationException e) {
+ throw new AssertionError("Unable to set java.text.DateFormat.is24Hour", e);
+ }
+ }
+
+ @Override
+ public Properties createDefaultProperties() {
+ return new Properties();
+ }
+ }
+
+ private static class StubTestEnvironmentResetter implements TestEnvironmentResetter {
+ @Override
+ public Boolean getDateFormatIs24Hour() {
+ return false;
+ }
+
+ @Override
+ public void setDateFormatIs24Hour(Boolean value) {
+ }
+
+ @Override
+ public Properties createDefaultProperties() {
+ return System.getProperties();
+ }
+ }
+
+ // http://code.google.com/p/vogar/source/browse/trunk/src/vogar/target/TestEnvironment.java
+ static class TestEnvironment {
+ private final static TestEnvironmentResetter sTestEnvironmentResetter;
+ static {
+ if (System.getProperty("java.vendor").toLowerCase().contains("android")) {
+ sTestEnvironmentResetter = new AndroidTestEnvironmentResetter();
+ } else {
+ sTestEnvironmentResetter = new StubTestEnvironmentResetter();
+ }
+ }
+
private final Locale mDefaultLocale;
private final TimeZone mDefaultTimeZone;
private final HostnameVerifier mHostnameVerifier;
private final SSLSocketFactory mSslSocketFactory;
- private final Properties mProperties = new Properties();
+ private final Properties mProperties;
private final Boolean mDefaultIs24Hour;
TestEnvironment(Context context) {
@@ -212,6 +268,7 @@
mHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
mSslSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
+ mProperties = sTestEnvironmentResetter.createDefaultProperties();
mProperties.setProperty("user.home", "");
mProperties.setProperty("java.io.tmpdir", context.getCacheDir().getAbsolutePath());
// The CDD mandates that devices that support WiFi are the only ones that will have
@@ -219,7 +276,7 @@
PackageManager pm = context.getPackageManager();
mProperties.setProperty("android.cts.device.multicast",
Boolean.toString(pm.hasSystemFeature(PackageManager.FEATURE_WIFI)));
- mDefaultIs24Hour = getDateFormatIs24Hour();
+ mDefaultIs24Hour = sTestEnvironmentResetter.getDateFormatIs24Hour();
// There are tests in libcore that should be disabled for low ram devices. They can't
// access ActivityManager to call isLowRamDevice, but can read system properties.
@@ -239,24 +296,7 @@
ResponseCache.setDefault(null);
HttpsURLConnection.setDefaultHostnameVerifier(mHostnameVerifier);
HttpsURLConnection.setDefaultSSLSocketFactory(mSslSocketFactory);
- setDateFormatIs24Hour(mDefaultIs24Hour);
- }
-
- private static Boolean getDateFormatIs24Hour() {
- try {
- return (Boolean) sDateFormatIs24HourField.get(null);
- } catch (ReflectiveOperationException e) {
- throw new AssertionError("Unable to get java.text.DateFormat.is24Hour", e);
- }
- }
-
- private static void setDateFormatIs24Hour(Boolean value) {
- try {
- sDateFormatIs24HourField.set(null, value);
- } catch (ReflectiveOperationException e) {
- throw new AssertionError("Unable to set java.text.DateFormat.is24Hour", e);
- }
+ sTestEnvironmentResetter.setDateFormatIs24Hour(mDefaultIs24Hour);
}
}
-
}
diff --git a/tests/fragment/AndroidManifest.xml b/tests/fragment/AndroidManifest.xml
index 447f9a8..9a16a60 100644
--- a/tests/fragment/AndroidManifest.xml
+++ b/tests/fragment/AndroidManifest.xml
@@ -13,29 +13,31 @@
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.fragment.cts"
- android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.fragment.cts"
+ android:targetSandboxVersion="2">
+
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name=".FragmentTestActivity">
+ <activity android:name=".FragmentTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".LoaderActivity"/>
- <activity android:name=".NewIntentActivity" android:launchMode="singleInstance" />
+ <activity android:name=".NewIntentActivity"
+ android:launchMode="singleInstance"/>
<activity android:name=".ConfigOnStopActivity"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.fragment.cts"
- android:label="CTS tests of android.app Fragments" />
+ android:targetPackage="android.fragment.cts"
+ android:label="CTS tests of android.app Fragments"/>
</manifest>
-
diff --git a/tests/framework/base/windowmanager/AndroidManifest.xml b/tests/framework/base/windowmanager/AndroidManifest.xml
index aabcc6b..b5be929 100644
--- a/tests/framework/base/windowmanager/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/AndroidManifest.xml
@@ -16,291 +16,258 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
- package="android.server.wm.cts"
- android:targetSandboxVersion="2">
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+ package="android.server.wm.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.READ_LOGS" />
- <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.READ_LOGS"/>
+ <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.STOP_APP_SWITCHES" />
- <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>
+ <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT"/>
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<application android:label="CtsWindowManagerDeviceTestCases"
- android:requestLegacyExternalStorage="true">
+ android:requestLegacyExternalStorage="true">
<uses-library android:name="android.test.runner"/>
- <activity
- android:name="android.server.wm.AspectRatioTests$MaxAspectRatioActivity"
- android:label="MaxAspectRatioActivity"
- android:maxAspectRatio="1.0"
- android:resizeableActivity="false" />
+ <activity android:name="android.server.wm.AspectRatioTests$MaxAspectRatioActivity"
+ android:label="MaxAspectRatioActivity"
+ android:maxAspectRatio="1.0"
+ android:resizeableActivity="false"/>
- <activity
- android:name="android.server.wm.AspectRatioTests$MetaDataMaxAspectRatioActivity"
- android:label="MetaDataMaxAspectRatioActivity"
- android:resizeableActivity="false">
- <meta-data
- android:name="android.max_aspect"
- android:value="1.0" />
+ <activity android:name="android.server.wm.AspectRatioTests$MetaDataMaxAspectRatioActivity"
+ android:label="MetaDataMaxAspectRatioActivity"
+ android:resizeableActivity="false">
+ <meta-data android:name="android.max_aspect"
+ android:value="1.0"/>
</activity>
- <activity
- android:name="android.server.wm.AspectRatioTests$MaxAspectRatioResizeableActivity"
- android:label="MaxAspectRatioResizeableActivity"
- android:maxAspectRatio="1.0"
- android:resizeableActivity="true" />
+ <activity android:name="android.server.wm.AspectRatioTests$MaxAspectRatioResizeableActivity"
+ android:label="MaxAspectRatioResizeableActivity"
+ android:maxAspectRatio="1.0"
+ android:resizeableActivity="true"/>
- <activity
- android:name="android.server.wm.AspectRatioTests$MaxAspectRatioUnsetActivity"
- android:label="MaxAspectRatioUnsetActivity"
- android:resizeableActivity="false" />
+ <activity android:name="android.server.wm.AspectRatioTests$MaxAspectRatioUnsetActivity"
+ android:label="MaxAspectRatioUnsetActivity"
+ android:resizeableActivity="false"/>
- <activity
- android:name="android.server.wm.AspectRatioTests$MinAspectRatioActivity"
- android:label="MinAspectRatioActivity"
- android:minWidth="1dp"
- android:minAspectRatio="3.0"
- android:resizeableActivity="false" />
+ <activity android:name="android.server.wm.AspectRatioTests$MinAspectRatioActivity"
+ android:label="MinAspectRatioActivity"
+ android:minWidth="1dp"
+ android:minAspectRatio="3.0"
+ android:resizeableActivity="false"/>
- <activity
- android:name="android.server.wm.AspectRatioTests$MinAspectRatioResizeableActivity"
- android:label="MinAspectRatioResizeableActivity"
- android:minWidth="1dp"
- android:minAspectRatio="3.0"
- android:resizeableActivity="true" />
+ <activity android:name="android.server.wm.AspectRatioTests$MinAspectRatioResizeableActivity"
+ android:label="MinAspectRatioResizeableActivity"
+ android:minWidth="1dp"
+ android:minAspectRatio="3.0"
+ android:resizeableActivity="true"/>
- <activity
- android:name="android.server.wm.AspectRatioTests$MinAspectRatioUnsetActivity"
- android:label="MinAspectRatioUnsetActivity"
- android:resizeableActivity="false" />
+ <activity android:name="android.server.wm.AspectRatioTests$MinAspectRatioUnsetActivity"
+ android:label="MinAspectRatioUnsetActivity"
+ android:resizeableActivity="false"/>
- <activity
- android:name="android.server.wm.AspectRatioTests$MinAspectRatioLandscapeActivity"
- android:label="MinAspectRatioLandscapeActivity"
- android:minWidth="1dp"
- android:minAspectRatio="3.0"
- android:resizeableActivity="false"
- android:screenOrientation="landscape" />
+ <activity android:name="android.server.wm.AspectRatioTests$MinAspectRatioLandscapeActivity"
+ android:label="MinAspectRatioLandscapeActivity"
+ android:minWidth="1dp"
+ android:minAspectRatio="3.0"
+ android:resizeableActivity="false"
+ android:screenOrientation="landscape"/>
- <activity
- android:name="android.server.wm.AspectRatioTests$MinAspectRatioPortraitActivity"
- android:label="MinAspectRatioPortraitActivity"
- android:minWidth="1dp"
- android:minAspectRatio="3.0"
- android:resizeableActivity="false"
- android:screenOrientation="portrait" />
+ <activity android:name="android.server.wm.AspectRatioTests$MinAspectRatioPortraitActivity"
+ android:label="MinAspectRatioPortraitActivity"
+ android:minWidth="1dp"
+ android:minAspectRatio="3.0"
+ android:resizeableActivity="false"
+ android:screenOrientation="portrait"/>
<activity android:name="android.server.wm.ActivityManagerTestBase$SideActivity"
- android:resizeableActivity="true"
- android:taskAffinity="nobody.but.SideActivity"/>
+ android:resizeableActivity="true"
+ android:taskAffinity="nobody.but.SideActivity"/>
<activity android:name="android.server.wm.ActivityManagerTestBase$ConfigChangeHandlingActivity"
- android:resizeableActivity="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen" />
+ android:resizeableActivity="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"/>
- <activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$FirstActivity" />
+ <activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$FirstActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$SecondActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$ThirdActivity"/>
- <activity
- android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$TranslucentActivity"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+ <activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$TranslucentActivity"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
- <activity
- android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$SecondTranslucentActivity"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+ <activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$SecondTranslucentActivity"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$CallbackTrackingActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$SecondCallbackTrackingActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$TranslucentCallbackTrackingActivity"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
- <activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$ShowWhenLockedCallbackTrackingActivity" />
+ <activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$ShowWhenLockedCallbackTrackingActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$SecondProcessCallbackTrackingActivity"
- android:process=":SecondProcess"
- android:exported="true"/>
+ android:process=":SecondProcess"
+ android:exported="true"/>
<provider android:name="android.server.wm.lifecycle.LifecycleLog"
- android:authorities="android.server.wm.lifecycle.logprovider"
- android:exported="true" />
+ android:authorities="android.server.wm.lifecycle.logprovider"
+ android:exported="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$LaunchForResultActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$ResultActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$SingleTopActivity"
- android:launchMode="singleTop" />
+ android:launchMode="singleTop"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$ConfigChangeHandlingActivity"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density" />
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$PipActivity"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:supportsPictureInPicture="true"/>
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:supportsPictureInPicture="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$AlwaysFocusablePipActivity"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- androidprv:alwaysFocusable="true"
- android:exported="true"/>
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ androidprv:alwaysFocusable="true"
+ android:exported="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$SlowActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$NoDisplayActivity"
- android:theme="@android:style/Theme.NoDisplay" />
+ android:theme="@android:style/Theme.NoDisplay"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$DifferentAffinityActivity"
- android:taskAffinity="nobody.but.DifferentAffinityActivity" />
+ android:taskAffinity="nobody.but.DifferentAffinityActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$TransitionSourceActivity"
- android:theme="@style/window_activity_transitions" />
+ android:theme="@style/window_activity_transitions"/>
<activity android:name="android.server.wm.lifecycle.ActivityLifecycleClientTestBase$TransitionDestinationActivity"
- android:theme="@style/window_activity_transitions" />
+ android:theme="@style/window_activity_transitions"/>
<activity android:name="android.server.wm.MultiDisplayActivityLaunchTests$ImmediateLaunchTestActivity"
- android:allowEmbedded="true" />
+ android:allowEmbedded="true"/>
<activity android:name="android.server.wm.MultiDisplaySystemDecorationTests$ImeTestActivity"
- android:resizeableActivity="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen" />
- <activity android:name="android.server.wm.MultiDisplaySystemDecorationTests$ImeTestActivity2" />
- <activity android:name="android.server.wm.MultiDisplaySystemDecorationTests$ImeTestActivityWithBrokenContextWrapper" />
+ android:resizeableActivity="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"/>
+ <activity android:name="android.server.wm.MultiDisplaySystemDecorationTests$ImeTestActivity2"/>
+ <activity android:name="android.server.wm.MultiDisplaySystemDecorationTests$ImeTestActivityWithBrokenContextWrapper"/>
- <activity android:name="android.server.wm.MultiDisplayClientTests$ClientTestActivity" />
+ <activity android:name="android.server.wm.MultiDisplayClientTests$ClientTestActivity"/>
<activity android:name="android.server.wm.MultiDisplayClientTests$NoRelaunchActivity"
- android:resizeableActivity="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
- />
+ android:resizeableActivity="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"/>
- <activity android:name="android.server.wm.KeyguardLockedTests$ShowImeAfterLockscreenActivity" />
+ <activity android:name="android.server.wm.KeyguardLockedTests$ShowImeAfterLockscreenActivity"/>
- <activity android:name="android.server.wm.KeyguardLockedTests$ShowWhenLockedImeActivity" />
+ <activity android:name="android.server.wm.KeyguardLockedTests$ShowWhenLockedImeActivity"/>
<activity android:name="android.server.wm.lifecycle.ActivityStarterTests$StandardActivity"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityStarterTests$SecondStandardActivity"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityStarterTests$StandardWithSingleTopActivity"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityStarterTests$SingleTopActivity"
- android:launchMode="singleTop"
- android:exported="true" />
+ android:launchMode="singleTop"
+ android:exported="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityStarterTests$SingleInstanceActivity"
- android:launchMode="singleInstance"
- android:exported="true" />
+ android:launchMode="singleInstance"
+ android:exported="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityStarterTests$SingleTaskActivity"
- android:launchMode="singleTask"
- android:exported="true" />
+ android:launchMode="singleTask"
+ android:exported="true"/>
<activity android:name="android.server.wm.lifecycle.ActivityStarterTests$TestLaunchingActivity"
- android:taskAffinity="nobody.but.LaunchingActivity"
- android:exported="true" />
+ android:taskAffinity="nobody.but.LaunchingActivity"
+ android:exported="true"/>
- <activity
- android:name="android.server.wm.lifecycle.ActivityStarterTests$LaunchingAndFinishActivity"
- android:taskAffinity="nobody.but.LaunchingActivity"
- android:exported="true"/>
+ <activity android:name="android.server.wm.lifecycle.ActivityStarterTests$LaunchingAndFinishActivity"
+ android:taskAffinity="nobody.but.LaunchingActivity"
+ android:exported="true"/>
<activity android:name="android.server.wm.ActivityViewTest$ActivityViewTestActivity"
- android:configChanges="keyboardHidden"
- android:exported="true"/>
+ android:configChanges="keyboardHidden"
+ android:exported="true"/>
- <provider
- android:name="android.server.wm.TestJournalProvider"
- android:authorities="android.server.wm.testjournalprovider"
- android:exported="true" />
+ <provider android:name="android.server.wm.TestJournalProvider"
+ android:authorities="android.server.wm.testjournalprovider"
+ android:exported="true"/>
<!--intent tests-->
<activity android:name="android.server.wm.intent.Activities$RegularActivity"/>
- <activity
- android:name="android.server.wm.intent.Activities$SingleTopActivity"
- android:launchMode="singleTop"/>
- <activity
- android:name="android.server.wm.intent.Activities$SingleInstanceActivity"
- android:launchMode="singleInstance"/>
- <activity
- android:name="android.server.wm.intent.Activities$SingleInstanceActivity2"
- android:launchMode="singleInstance"
- android:taskAffinity=".t1"/>
- <activity
- android:name="android.server.wm.intent.Activities$SingleTaskActivity"
- android:launchMode="singleTask"/>
- <activity
- android:name="android.server.wm.intent.Activities$SingleTaskActivity2"
- android:launchMode="singleTask"
- android:taskAffinity=".t1"/>
- <activity
- android:name="android.server.wm.intent.Activities$TaskAffinity1Activity"
- android:allowTaskReparenting="true"
- android:launchMode="standard"
- android:taskAffinity=".t1"/>
- <activity
- android:name="android.server.wm.intent.Activities$TaskAffinity1Activity2"
- android:allowTaskReparenting="true"
- android:launchMode="standard"
- android:taskAffinity=".t1"/>
- <activity
- android:name="android.server.wm.intent.Activities$TaskAffinity1RelinquishTaskIdentityActivity"
- android:relinquishTaskIdentity="true"
- android:taskAffinity=".t1"/>
- <activity
- android:name="android.server.wm.intent.Activities$TaskAffinity2Activity"
- android:allowTaskReparenting="true"
- android:launchMode="standard"
- android:taskAffinity=".t2"/>
- <activity
- android:name="android.server.wm.intent.Activities$TaskAffinity3Activity"
- android:allowTaskReparenting="true"
- android:launchMode="standard"
- android:taskAffinity=".t3"/>
- <activity
- android:name="android.server.wm.intent.Activities$ClearTaskOnLaunchActivity"
- android:allowTaskReparenting="true"
- android:clearTaskOnLaunch="true"
- android:launchMode="standard"
- android:taskAffinity=".t2"/>
- <activity
- android:name="android.server.wm.intent.Activities$DocumentLaunchIntoActivity"
- android:documentLaunchMode="intoExisting"/>
- <activity
- android:name="android.server.wm.intent.Activities$DocumentLaunchAlwaysActivity"
- android:documentLaunchMode="always"/>
- <activity
- android:name="android.server.wm.intent.Activities$DocumentLaunchNeverActivity"
- android:documentLaunchMode="never"/>
- <activity
- android:name="android.server.wm.intent.Activities$NoHistoryActivity"
- android:noHistory="true"/>
- <activity
- android:name="android.server.wm.intent.Activities$LauncherActivity"
- android:documentLaunchMode="always"
- android:launchMode="singleInstance"/>
- <activity
- android:name="android.server.wm.intent.Activities$RelinquishTaskIdentityActivity"
- android:relinquishTaskIdentity="true"/>
+ <activity android:name="android.server.wm.intent.Activities$SingleTopActivity"
+ android:launchMode="singleTop"/>
+ <activity android:name="android.server.wm.intent.Activities$SingleInstanceActivity"
+ android:launchMode="singleInstance"/>
+ <activity android:name="android.server.wm.intent.Activities$SingleInstanceActivity2"
+ android:launchMode="singleInstance"
+ android:taskAffinity=".t1"/>
+ <activity android:name="android.server.wm.intent.Activities$SingleTaskActivity"
+ android:launchMode="singleTask"/>
+ <activity android:name="android.server.wm.intent.Activities$SingleTaskActivity2"
+ android:launchMode="singleTask"
+ android:taskAffinity=".t1"/>
+ <activity android:name="android.server.wm.intent.Activities$TaskAffinity1Activity"
+ android:allowTaskReparenting="true"
+ android:launchMode="standard"
+ android:taskAffinity=".t1"/>
+ <activity android:name="android.server.wm.intent.Activities$TaskAffinity1Activity2"
+ android:allowTaskReparenting="true"
+ android:launchMode="standard"
+ android:taskAffinity=".t1"/>
+ <activity android:name="android.server.wm.intent.Activities$TaskAffinity1RelinquishTaskIdentityActivity"
+ android:relinquishTaskIdentity="true"
+ android:taskAffinity=".t1"/>
+ <activity android:name="android.server.wm.intent.Activities$TaskAffinity2Activity"
+ android:allowTaskReparenting="true"
+ android:launchMode="standard"
+ android:taskAffinity=".t2"/>
+ <activity android:name="android.server.wm.intent.Activities$TaskAffinity3Activity"
+ android:allowTaskReparenting="true"
+ android:launchMode="standard"
+ android:taskAffinity=".t3"/>
+ <activity android:name="android.server.wm.intent.Activities$ClearTaskOnLaunchActivity"
+ android:allowTaskReparenting="true"
+ android:clearTaskOnLaunch="true"
+ android:launchMode="standard"
+ android:taskAffinity=".t2"/>
+ <activity android:name="android.server.wm.intent.Activities$DocumentLaunchIntoActivity"
+ android:documentLaunchMode="intoExisting"/>
+ <activity android:name="android.server.wm.intent.Activities$DocumentLaunchAlwaysActivity"
+ android:documentLaunchMode="always"/>
+ <activity android:name="android.server.wm.intent.Activities$DocumentLaunchNeverActivity"
+ android:documentLaunchMode="never"/>
+ <activity android:name="android.server.wm.intent.Activities$NoHistoryActivity"
+ android:noHistory="true"/>
+ <activity android:name="android.server.wm.intent.Activities$LauncherActivity"
+ android:documentLaunchMode="always"
+ android:launchMode="singleInstance"/>
+ <activity android:name="android.server.wm.intent.Activities$RelinquishTaskIdentityActivity"
+ android:relinquishTaskIdentity="true"/>
- <service
- android:name="android.server.wm.TestLogService"
- android:enabled="true"
- android:exported="true">
+ <service android:name="android.server.wm.TestLogService"
+ android:enabled="true"
+ android:exported="true">
</service>
<activity android:name="android.server.wm.AlertWindowsAppOpsTestsActivity"/>
@@ -313,119 +280,121 @@
android:showWhenLocked="true"/>
<activity android:name="android.server.wm.WindowInsetsAnimationSynchronicityTests$TestActivity"
- android:turnScreenOn="true"
- android:showWhenLocked="true"/>
- <service
- android:name="android.server.wm.WindowInsetsAnimationSynchronicityTests$SimpleIme"
- android:label="Simple IME"
- android:permission="android.permission.BIND_INPUT_METHOD">
+ android:turnScreenOn="true"
+ android:showWhenLocked="true"/>
+ <service android:name="android.server.wm.WindowInsetsAnimationSynchronicityTests$SimpleIme"
+ android:label="Simple IME"
+ android:permission="android.permission.BIND_INPUT_METHOD"
+ android:exported="true">
<intent-filter>
- <action android:name="android.view.InputMethod" />
+ <action android:name="android.view.InputMethod"/>
</intent-filter>
- <meta-data
- android:name="android.view.im"
- android:resource="@xml/simple_method" />
+ <meta-data android:name="android.view.im"
+ android:resource="@xml/simple_method"/>
</service>
<activity android:name="android.server.wm.KeyEventActivity"
- android:exported="true"
- android:configChanges="orientation|screenLayout"
- android:showWhenLocked="true"
- />
+ android:exported="true"
+ android:configChanges="orientation|screenLayout"
+ android:showWhenLocked="true"/>
<activity android:name="android.server.wm.WindowInsetsPolicyTest$TestActivity"
- android:turnScreenOn="true"
- android:showWhenLocked="true"/>
+ android:turnScreenOn="true"
+ android:showWhenLocked="true"/>
<activity android:name="android.server.wm.WindowInsetsPolicyTest$FullscreenTestActivity"/>
<activity android:name="android.server.wm.WindowInsetsPolicyTest$FullscreenWmFlagsTestActivity"/>
<activity android:name="android.server.wm.WindowInsetsPolicyTest$ImmersiveFullscreenTestActivity"
- android:documentLaunchMode="always"
- android:theme="@style/no_animation" />
+ android:documentLaunchMode="always"
+ android:theme="@style/no_animation"/>
<activity android:name="android.server.wm.LayoutTests$TestActivity"
- android:theme="@style/no_animation" />
+ android:theme="@style/no_animation"/>
<activity android:name="android.server.wm.LocationOnScreenTests$TestActivity"
- android:theme="@style/no_starting_window" />
- <activity android:name="android.server.wm.LocationInWindowTests$TestActivity" />
+ android:theme="@style/no_starting_window"/>
+ <activity android:name="android.server.wm.LocationInWindowTests$TestActivity"/>
<activity android:name="android.server.wm.EnsureBarContrastTest$TestActivity"
- android:theme="@style/no_starting_window" />
- <activity android:name="android.server.wm.WindowFocusTests$PrimaryActivity" />
+ android:theme="@style/no_starting_window"/>
+ <activity android:name="android.server.wm.WindowFocusTests$PrimaryActivity"/>
<activity android:name="android.server.wm.WindowFocusTests$SecondaryActivity"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density" />
- <activity android:name="android.server.wm.WindowFocusTests$LosingFocusActivity" />
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"/>
+ <activity android:name="android.server.wm.WindowFocusTests$LosingFocusActivity"/>
+ <activity android:name="android.server.wm.WindowFocusTests$AutoEngagePointerCaptureActivity" />
<activity android:name="android.server.wm.WindowMetricsTests$MetricsActivity"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name="android.app.Activity"/>
- <activity android:name="android.server.wm.WindowInsetsLayoutTests$TestActivity" />
- <activity android:name="android.server.wm.WindowInsetsControllerTests$TestActivity" />
- <activity android:name="android.server.wm.WindowInsetsControllerTests$TestHideOnCreateActivity" />
- <activity android:name="android.server.wm.WindowInsetsControllerTests$TestShowOnCreateActivity" />
+ <activity android:name="android.server.wm.WindowInsetsLayoutTests$TestActivity"/>
+ <activity android:name="android.server.wm.WindowInsetsControllerTests$TestActivity"/>
+ <activity android:name="android.server.wm.WindowInsetsControllerTests$TestHideOnCreateActivity"/>
+ <activity android:name="android.server.wm.WindowInsetsControllerTests$TestShowOnCreateActivity"/>
<activity android:name="android.server.wm.DragDropTest$DragDropActivity"
- android:screenOrientation="locked"
- android:turnScreenOn="true"
- android:showWhenLocked="true"
- android:label="DragDropActivity">
+ android:screenOrientation="locked"
+ android:turnScreenOn="true"
+ android:showWhenLocked="true"
+ android:label="DragDropActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity
- android:name="android.server.wm.DecorInsetTestsBase$TestActivity"
- android:label="DecorInsetTestsBase.TestActivity"
- android:exported="true" />
+ <activity android:name="android.server.wm.DecorInsetTestsBase$TestActivity"
+ android:label="DecorInsetTestsBase.TestActivity"
+ android:exported="true"/>
<activity android:name="android.server.wm.WindowCtsActivity"
- android:theme="@android:style/Theme.Material.NoActionBar"
- android:screenOrientation="locked"
- android:turnScreenOn="true"
- android:showWhenLocked="true"
- android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
- android:label="WindowCtsActivity">
+ android:theme="@android:style/Theme.Material.NoActionBar"
+ android:screenOrientation="locked"
+ android:turnScreenOn="true"
+ android:showWhenLocked="true"
+ android:label="WindowCtsActivity"
+ android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.server.wm.SurfaceViewCtsActivity"
- android:screenOrientation="locked"
- android:turnScreenOn="true"
- android:showWhenLocked="true"
- android:label="SurfaceViewCtsActivity">
+ android:screenOrientation="locked"
+ android:turnScreenOn="true"
+ android:showWhenLocked="true"
+ android:label="SurfaceViewCtsActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.surfacevalidator.CapturedActivity"
- android:screenOrientation="locked"
- android:theme="@style/WhiteBackgroundTheme">
+ android:screenOrientation="locked"
+ android:theme="@style/WhiteBackgroundTheme"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.server.wm.WindowInputTests$TestActivity" />
<service android:name="android.view.cts.surfacevalidator.LocalMediaProjectionService"
- android:foregroundServiceType="mediaProjection"
- android:enabled="true">
+ android:foregroundServiceType="mediaProjection"
+ android:enabled="true">
</service>
<activity android:name="android.server.wm.StartActivityAsUserActivity"
- android:directBootAware="true"/>
+ android:directBootAware="true"/>
<activity android:name="android.server.wm.WindowInsetsAnimationTestBase$TestActivity"
- android:theme="@android:style/Theme.Material.NoActionBar" />
+ android:theme="@android:style/Theme.Material.NoActionBar"/>
<activity android:name="android.server.wm.ForceRelayoutTestBase$TestActivity"
- android:exported="true" />
+ android:exported="true"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.server.wm.cts"
- android:label="CTS tests of WindowManager">
+ android:targetPackage="android.server.wm.cts"
+ android:label="CTS tests of WindowManager">
</instrumentation>
</manifest>
diff --git a/tests/framework/base/windowmanager/app/AndroidManifest.xml b/tests/framework/base/windowmanager/app/AndroidManifest.xml
index e17658a..9480435 100755
--- a/tests/framework/base/windowmanager/app/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/app/AndroidManifest.xml
@@ -16,334 +16,277 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
- package="android.server.wm.app">
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+ package="android.server.wm.app">
<!-- virtual display test permissions -->
- <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION" />
+ <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION"/>
<application>
<activity android:name=".TestActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:exported="true"
- />
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:exported="true"/>
<activity android:name=".TestActivityWithSameAffinity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:exported="true"
- android:taskAffinity="nobody.but.PipActivitySameAffinity"
- />
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:exported="true"
+ android:taskAffinity="nobody.but.PipActivitySameAffinity"/>
<activity android:name=".TranslucentTestActivity"
- android:resizeableActivity="true"
- android:supportsPictureInPicture="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:theme="@style/Theme.Transparent"
- android:exported="true"
- />
+ android:resizeableActivity="true"
+ android:supportsPictureInPicture="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:theme="@style/Theme.Transparent"
+ android:exported="true"/>
<activity android:name=".VrTestActivity"
- android:resizeableActivity="true"
- android:exported="true"
- />
+ android:resizeableActivity="true"
+ android:exported="true"/>
<activity-alias android:name=".AliasTestActivity"
- android:exported="true"
- android:targetActivity=".TestActivity"
- />
+ android:exported="true"
+ android:targetActivity=".TestActivity"/>
<activity android:name=".ResumeWhilePausingActivity"
- android:allowEmbedded="true"
- android:resumeWhilePausing="true"
- android:taskAffinity=""
- android:exported="true"
- />
+ android:allowEmbedded="true"
+ android:resumeWhilePausing="true"
+ android:taskAffinity=""
+ android:exported="true"/>
<activity android:name=".ResizeableActivity"
- android:resizeableActivity="true"
- android:allowEmbedded="true"
- android:exported="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
- />
+ android:resizeableActivity="true"
+ android:allowEmbedded="true"
+ android:exported="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"/>
<activity android:name=".NonResizeableActivity"
- android:resizeableActivity="false"
- android:exported="true"
- />
+ android:resizeableActivity="false"
+ android:exported="true"/>
<activity android:name=".DockedActivity"
- android:resizeableActivity="true"
- android:exported="true"
- android:taskAffinity="nobody.but.DockedActivity"
- />
+ android:resizeableActivity="true"
+ android:exported="true"
+ android:taskAffinity="nobody.but.DockedActivity"/>
<activity android:name=".TranslucentActivity"
- android:theme="@android:style/Theme.Translucent.NoTitleBar"
- android:resizeableActivity="true"
- android:taskAffinity="nobody.but.TranslucentActivity"
- android:exported="true"
- />
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"
+ android:resizeableActivity="true"
+ android:taskAffinity="nobody.but.TranslucentActivity"
+ android:exported="true"/>
<activity android:name=".DialogWhenLargeActivity"
- android:exported="true"
- android:theme="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge"
- />
+ android:exported="true"
+ android:theme="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge"/>
<activity android:name=".NoRelaunchActivity"
- android:resizeableActivity="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|fontScale|colorMode|density|touchscreen"
- android:exported="true"
- android:taskAffinity="nobody.but.NoRelaunchActivity"
- />
+ android:resizeableActivity="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|fontScale|colorMode|density|touchscreen"
+ android:exported="true"
+ android:taskAffinity="nobody.but.NoRelaunchActivity"/>
<activity android:name=".SlowCreateActivity"
- android:resizeableActivity="true"
- android:exported="true"
- />
+ android:resizeableActivity="true"
+ android:exported="true"/>
<activity android:name=".LaunchingActivity"
- android:resizeableActivity="true"
- android:exported="true"
- android:taskAffinity="nobody.but.LaunchingActivity"
- />
+ android:resizeableActivity="true"
+ android:exported="true"
+ android:taskAffinity="nobody.but.LaunchingActivity"/>
<!--
- * This activity should have same affinity as LaunchingActivity, because we're using it to
- * check activities being launched into the same task.
- -->
+ * This activity should have same affinity as LaunchingActivity, because we're using it to
+ * check activities being launched into the same task.
+ -->
<activity android:name=".AltLaunchingActivity"
- android:resizeableActivity="true"
- android:exported="true"
- android:taskAffinity="nobody.but.LaunchingActivity"
- />
+ android:resizeableActivity="true"
+ android:exported="true"
+ android:taskAffinity="nobody.but.LaunchingActivity"/>
<activity android:name=".PipActivity"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true"
- android:taskAffinity="nobody.but.PipActivity"
- />
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true"
+ android:taskAffinity="nobody.but.PipActivity"/>
<activity android:name=".PipActivity2"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true"
- android:taskAffinity="nobody.but.PipActivity2"
- />
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true"
+ android:taskAffinity="nobody.but.PipActivity2"/>
<activity android:name=".PipOnStopActivity"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true"
- android:taskAffinity="nobody.but.PipOnStopActivity"
- />
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true"
+ android:taskAffinity="nobody.but.PipOnStopActivity"/>
<activity android:name=".PipActivityWithSameAffinity"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true"
- android:taskAffinity="nobody.but.PipActivitySameAffinity"
- />
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true"
+ android:taskAffinity="nobody.but.PipActivitySameAffinity"/>
<activity android:name=".AlwaysFocusablePipActivity"
- android:theme="@style/Theme.Transparent"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- androidprv:alwaysFocusable="true"
- android:exported="true"
- android:taskAffinity="nobody.but.AlwaysFocusablePipActivity"
- />
+ android:theme="@style/Theme.Transparent"
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ androidprv:alwaysFocusable="true"
+ android:exported="true"
+ android:taskAffinity="nobody.but.AlwaysFocusablePipActivity"/>
<activity android:name=".LaunchIntoPinnedStackPipActivity"
- android:resizeableActivity="false"
- androidprv:alwaysFocusable="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true"
- />
+ android:resizeableActivity="false"
+ androidprv:alwaysFocusable="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true"/>
<activity android:name=".LaunchPipOnPipActivity"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- android:taskAffinity="nobody.but.LaunchPipOnPipActivity"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true"
- />
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ android:taskAffinity="nobody.but.LaunchPipOnPipActivity"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true"/>
<activity android:name=".LaunchEnterPipActivity"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- androidprv:alwaysFocusable="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true"
- />
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ androidprv:alwaysFocusable="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true"/>
<activity android:name=".PipActivityWithMinimalSize"
- android:resizeableActivity="false"
- android:supportsPictureInPicture="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true"
- android:taskAffinity="nobody.but.PipActivity">
+ android:resizeableActivity="false"
+ android:supportsPictureInPicture="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true"
+ android:taskAffinity="nobody.but.PipActivity">
<layout android:minWidth="100dp"
- android:minHeight="80dp"
- />
+ android:minHeight="80dp"/>
</activity>
<activity android:name=".FreeformActivity"
- android:resizeableActivity="true"
- android:taskAffinity="nobody.but.FreeformActivity"
- android:exported="true"
- />
+ android:resizeableActivity="true"
+ android:taskAffinity="nobody.but.FreeformActivity"
+ android:exported="true"/>
<activity android:name=".TopLeftLayoutActivity"
- android:resizeableActivity="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true">
+ android:resizeableActivity="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true">
<layout android:defaultWidth="240dp"
- android:defaultHeight="160dp"
- android:gravity="top|left"
- android:minWidth="100dp"
- android:minHeight="80dp"
- />
+ android:defaultHeight="160dp"
+ android:gravity="top|left"
+ android:minWidth="100dp"
+ android:minHeight="80dp"/>
</activity>
<activity android:name=".TopRightLayoutActivity"
- android:resizeableActivity="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true">
+ android:resizeableActivity="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true">
<layout android:defaultWidth="50%"
- android:defaultHeight="70%"
- android:gravity="top|right"
- android:minWidth="50dp"
- android:minHeight="80dp"
- />
+ android:defaultHeight="70%"
+ android:gravity="top|right"
+ android:minWidth="50dp"
+ android:minHeight="80dp"/>
</activity>
<activity android:name=".BottomLeftLayoutActivity"
- android:resizeableActivity="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true">
+ android:resizeableActivity="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true">
<layout android:defaultWidth="50%"
- android:defaultHeight="70%"
- android:gravity="bottom|left"
- android:minWidth="50dp"
- android:minHeight="80dp"
- />
+ android:defaultHeight="70%"
+ android:gravity="bottom|left"
+ android:minWidth="50dp"
+ android:minHeight="80dp"/>
</activity>
<activity android:name=".BottomRightLayoutActivity"
- android:resizeableActivity="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- android:exported="true">
+ android:resizeableActivity="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true">
<layout android:defaultWidth="240dp"
- android:defaultHeight="160dp"
- android:gravity="bottom|right"
- android:minWidth="100dp"
- android:minHeight="80dp"
- />
+ android:defaultHeight="160dp"
+ android:gravity="bottom|right"
+ android:minWidth="100dp"
+ android:minHeight="80dp"/>
</activity>
<activity android:name=".TurnScreenOnActivity"
- android:exported="true"
- />
+ android:exported="true"/>
<activity android:name=".TurnScreenOnDismissKeyguardActivity"
- android:exported="true"
- />
+ android:exported="true"/>
<activity android:name=".SingleTaskActivity"
- android:exported="true"
- android:launchMode="singleTask"
- />
+ android:exported="true"
+ android:launchMode="singleTask"/>
<activity android:name=".SingleInstanceActivity"
- android:exported="true"
- android:launchMode="singleInstance"
- />
+ android:exported="true"
+ android:launchMode="singleInstance"/>
<activity android:name=".TrampolineActivity"
- android:exported="true"
- android:theme="@android:style/Theme.NoDisplay"
- />
+ android:exported="true"
+ android:theme="@android:style/Theme.NoDisplay"/>
<activity android:name=".BroadcastReceiverActivity"
- android:resizeableActivity="true"
- android:exported="true"
- />
+ android:resizeableActivity="true"
+ android:exported="true"/>
<activity-alias android:enabled="true"
- android:exported="true"
- android:name=".EntryPointAliasActivity"
- android:targetActivity=".TrampolineActivity" >
+ android:exported="true"
+ android:name=".EntryPointAliasActivity"
+ android:targetActivity=".TrampolineActivity">
</activity-alias>
<activity android:name=".BottomActivity"
- android:exported="true"
- android:theme="@style/NoPreview"
- />
+ android:exported="true"
+ android:theme="@style/NoPreview"/>
<activity android:name=".TopActivity"
- android:process=".top_process"
- android:exported="true"
- android:theme="@style/NoPreview"
- />
+ android:process=".top_process"
+ android:exported="true"
+ android:theme="@style/NoPreview"/>
<activity android:name=".UnresponsiveActivity"
- android:process=".unresponsive_activity_process"
- android:exported="true"
- android:theme="@style/NoPreview"
- />
+ android:process=".unresponsive_activity_process"
+ android:exported="true"
+ android:theme="@style/NoPreview"/>
<activity android:name=".TranslucentTopActivity"
- android:process=".top_process"
- android:exported="true"
- android:theme="@style/TranslucentTheme"
- />
+ android:process=".top_process"
+ android:exported="true"
+ android:theme="@style/TranslucentTheme"/>
<!-- An animation test with an explicitly opaque theme, overriding device defaults, as the
- animation background being tested is not used in translucent activities. -->
+ animation background being tested is not used in translucent activities. -->
<activity android:name=".AnimationTestActivity"
- android:theme="@style/OpaqueTheme"
- android:exported="true"
- />
+ android:theme="@style/OpaqueTheme"
+ android:exported="true"/>
<activity android:name=".VirtualDisplayActivity"
- android:resizeableActivity="true"
- android:exported="true"
- android:taskAffinity="nobody.but.VirtualDisplayActivity"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden"
- />
+ android:resizeableActivity="true"
+ android:exported="true"
+ android:taskAffinity="nobody.but.VirtualDisplayActivity"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden"/>
<activity android:name=".ShowWhenLockedActivity"
- android:exported="true"
- />
+ android:exported="true"/>
<activity android:name=".ShowWhenLockedWithDialogActivity"
- android:exported="true"
- />
+ android:exported="true"/>
<activity android:name=".ShowWhenLockedDialogActivity"
- android:exported="true"
- android:theme="@android:style/Theme.Material.Dialog"
- />
+ android:exported="true"
+ android:theme="@android:style/Theme.Material.Dialog"/>
<activity android:name=".ShowWhenLockedTranslucentActivity"
- android:exported="true"
- android:theme="@android:style/Theme.Translucent"
- />
+ android:exported="true"
+ android:theme="@android:style/Theme.Translucent"/>
<activity android:name=".DismissKeyguardActivity"
- android:exported="true"
- />
+ android:exported="true"/>
<activity android:name=".DismissKeyguardMethodActivity"
- android:exported="true"
- />
+ android:exported="true"/>
<activity android:name=".WallpaperActivity"
- android:exported="true"
- android:theme="@style/WallpaperTheme"
- />
+ android:exported="true"
+ android:theme="@style/WallpaperTheme"/>
<activity android:name=".InputMethodTestActivity"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name=".KeyguardLockActivity"
- android:exported="true"
- />
+ android:exported="true"/>
<activity android:name=".LogConfigurationActivity"
- android:exported="true"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
- />
+ android:exported="true"
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"/>
<activity android:name=".PortraitOrientationActivity"
- android:exported="true"
- android:screenOrientation="portrait"
- android:documentLaunchMode="always"
- />
+ android:exported="true"
+ android:screenOrientation="portrait"
+ android:documentLaunchMode="always"/>
<activity android:name=".LandscapeOrientationActivity"
- android:exported="true"
- android:screenOrientation="landscape"
- android:documentLaunchMode="always"
- />
+ android:exported="true"
+ android:screenOrientation="landscape"
+ android:documentLaunchMode="always"/>
<activity android:name=".MoveTaskToBackActivity"
- android:exported="true"
- android:launchMode="singleInstance"
- />
+ android:exported="true"
+ android:launchMode="singleInstance"/>
<activity android:name=".NightModeActivity"
- android:exported="true"
- android:configChanges="uiMode"
- />
+ android:exported="true"
+ android:configChanges="uiMode"/>
<activity android:name=".FontScaleActivity"
- android:exported="true"
- />
+ android:exported="true"/>
<activity android:name=".FontScaleNoRelaunchActivity"
- android:exported="true"
- android:configChanges="fontScale"
- />
+ android:exported="true"
+ android:configChanges="fontScale"/>
<activity android:name=".DisplayAccessCheckEmbeddingActivity"
- android:allowEmbedded="true"
- android:exported="true"/>
- <receiver
- android:name=".LaunchBroadcastReceiver"
- android:enabled="true"
- android:exported="true" >
+ android:allowEmbedded="true"
+ android:exported="true"/>
+ <receiver android:name=".LaunchBroadcastReceiver"
+ android:enabled="true"
+ android:exported="true">
<intent-filter>
<action android:name="android.server.wm.app.LAUNCH_BROADCAST_ACTION"/>
<action android:name="android.server.wm.app.ACTION_TEST_ACTIVITY_START"/>
@@ -351,168 +294,165 @@
</receiver>
<activity android:name=".AssistantActivity"
- android:exported="true"
- android:screenOrientation="locked" />
+ android:exported="true"
+ android:screenOrientation="locked"/>
<activity android:name=".TranslucentAssistantActivity"
- android:exported="true"
- android:theme="@style/Theme.Transparent" />
+ android:exported="true"
+ android:theme="@style/Theme.Transparent"/>
<activity android:name=".LaunchAssistantActivityFromSession"
- android:taskAffinity="nobody.but.LaunchAssistantActivityFromSession"
- android:exported="true" />
+ android:taskAffinity="nobody.but.LaunchAssistantActivityFromSession"
+ android:exported="true"/>
<activity android:name=".LaunchAssistantActivityIntoAssistantStack"
- android:taskAffinity="nobody.but.LaunchAssistantActivityIntoAssistantStack"
- android:exported="true" />
+ android:taskAffinity="nobody.but.LaunchAssistantActivityIntoAssistantStack"
+ android:exported="true"/>
<service android:name=".AssistantVoiceInteractionService"
- android:permission="android.permission.BIND_VOICE_INTERACTION"
- android:exported="true">
+ android:permission="android.permission.BIND_VOICE_INTERACTION"
+ android:exported="true">
<meta-data android:name="android.voice_interaction"
- android:resource="@xml/interaction_service" />
+ android:resource="@xml/interaction_service"/>
<intent-filter>
- <action android:name="android.service.voice.VoiceInteractionService" />
+ <action android:name="android.service.voice.VoiceInteractionService"/>
</intent-filter>
</service>
<service android:name=".AssistantVoiceInteractionSessionService"
- android:permission="android.permission.BIND_VOICE_INTERACTION"
- android:exported="true" />
+ android:permission="android.permission.BIND_VOICE_INTERACTION"
+ android:exported="true"/>
<activity android:name=".SplashscreenActivity"
- android:taskAffinity="nobody.but.SplashscreenActivity"
- android:theme="@style/SplashscreenTheme"
- android:exported="true" />
+ android:taskAffinity="nobody.but.SplashscreenActivity"
+ android:theme="@style/SplashscreenTheme"
+ android:exported="true"/>
<activity android:name=".NoHistoryActivity"
- android:noHistory="true"
- android:exported="true" />
+ android:noHistory="true"
+ android:exported="true"/>
<activity android:name=".ShowWhenLockedAttrActivity"
- android:showWhenLocked="true"
- android:exported="true" />
+ android:showWhenLocked="true"
+ android:exported="true"/>
<activity android:name=".ShowWhenLockedAttrRemoveAttrActivity"
- android:showWhenLocked="true"
- android:exported="true" />
+ android:showWhenLocked="true"
+ android:exported="true"/>
<activity android:name=".ShowWhenLockedAttrWithDialogActivity"
- android:showWhenLocked="true"
- android:exported="true" />
+ android:showWhenLocked="true"
+ android:exported="true"/>
<activity android:name=".InheritShowWhenLockedAddActivity"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name=".InheritShowWhenLockedAttrActivity"
- android:inheritShowWhenLocked="true"
- android:exported="true" />
+ android:inheritShowWhenLocked="true"
+ android:exported="true"/>
<activity android:name=".InheritShowWhenLockedRemoveActivity"
- android:inheritShowWhenLocked="true"
- android:exported="true" />
+ android:inheritShowWhenLocked="true"
+ android:exported="true"/>
<activity android:name=".NoInheritShowWhenLockedAttrActivity"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name=".ShowWhenLockedAttrImeActivity"
- android:showWhenLocked="true"
- android:exported="true" />
+ android:showWhenLocked="true"
+ android:exported="true"/>
<activity android:name=".ShowWhenLockedAttrRotationActivity"
- android:showWhenLocked="true"
- android:configChanges="orientation|screenSize"
- android:exported="true" />
+ android:showWhenLocked="true"
+ android:configChanges="orientation|screenSize"
+ android:exported="true"/>
<activity android:name=".ToastActivity"
- android:exported="true"/>
+ android:exported="true"/>
<activity android:name=".TurnScreenOnAttrActivity"
- android:turnScreenOn="true"
- android:exported="true" />
+ android:turnScreenOn="true"
+ android:exported="true"/>
<activity android:name=".TurnScreenOnShowOnLockActivity"
- android:showWhenLocked="true"
- android:turnScreenOn="true"
- android:exported="true" />
+ android:showWhenLocked="true"
+ android:turnScreenOn="true"
+ android:exported="true"/>
<activity android:name=".TurnScreenOnAttrRemoveAttrActivity"
- android:turnScreenOn="true"
- android:showWhenLocked="true"
- android:exported="true" />
+ android:turnScreenOn="true"
+ android:showWhenLocked="true"
+ android:exported="true"/>
<activity android:name=".TurnScreenOnSingleTaskActivity"
- android:turnScreenOn="true"
- android:showWhenLocked="true"
- android:exported="true"
- android:launchMode="singleTask" />
+ android:turnScreenOn="true"
+ android:showWhenLocked="true"
+ android:exported="true"
+ android:launchMode="singleTask"/>
<activity android:name=".TurnScreenOnAttrDismissKeyguardActivity"
- android:turnScreenOn="true"
- android:exported="true"/>
+ android:turnScreenOn="true"
+ android:exported="true"/>
<activity android:name=".TurnScreenOnWithRelayoutActivity"
- android:exported="true"/>
+ android:exported="true"/>
<activity android:name=".RecursiveActivity"
- android:exported="true"/>
+ android:exported="true"/>
<activity android:name=".LaunchTestOnDestroyActivity"
- android:exported="true"/>
+ android:exported="true"/>
<activity android:name=".ReportFullyDrawnActivity"
- android:exported="true"/>
+ android:exported="true"/>
<activity android:name=".NoDisplayActivity"
- android:exported="true"
- android:theme="@android:style/Theme.NoDisplay"/>
+ android:exported="true"
+ android:theme="@android:style/Theme.NoDisplay"/>
<activity android:name=".SingleTaskInstanceDisplayActivity"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name=".SingleTaskInstanceDisplayActivity2"
- android:exported="true" />
+ android:exported="true"/>
<activity android:name=".SingleTaskInstanceDisplayActivity3"
- android:exported="true"
- android:launchMode="singleInstance" />
+ android:exported="true"
+ android:launchMode="singleInstance"/>
- <service
- android:name=".LiveWallpaper"
- android:permission="android.permission.BIND_WALLPAPER">
+ <service android:name=".LiveWallpaper"
+ android:permission="android.permission.BIND_WALLPAPER"
+ android:exported="true">
<intent-filter>
<action android:name="android.service.wallpaper.WallpaperService">
</action>
</intent-filter>
- <meta-data
- android:name="android.service.wallpaper"
- android:resource="@xml/wallpaper">
+ <meta-data android:name="android.service.wallpaper"
+ android:resource="@xml/wallpaper">
</meta-data>
</service>
- <service
- android:name=".TestDream"
- android:exported="true"
- android:permission="android.permission.BIND_DREAM_SERVICE">
+ <service android:name=".TestDream"
+ android:exported="true"
+ android:permission="android.permission.BIND_DREAM_SERVICE">
<intent-filter>
- <action android:name="android.service.dreams.DreamService" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.service.dreams.DreamService"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
- <service
- android:name=".TestStubbornDream"
- android:exported="true"
- android:permission="android.permission.BIND_DREAM_SERVICE">
+ <service android:name=".TestStubbornDream"
+ android:exported="true"
+ android:permission="android.permission.BIND_DREAM_SERVICE">
<intent-filter>
- <action android:name="android.service.dreams.DreamService" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.service.dreams.DreamService"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
<!-- Disable home activities by default or it may disturb other tests by
- showing ResolverActivity when start home activity -->
+ showing ResolverActivity when start home activity -->
<activity-alias android:name=".HomeActivity"
- android:targetActivity=".TestActivity"
- android:enabled="false"
- android:exported="true">
+ android:targetActivity=".TestActivity"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.HOME"/>
@@ -521,9 +461,9 @@
</activity-alias>
<activity-alias android:name=".SecondaryHomeActivity"
- android:targetActivity=".TestActivity"
- android:enabled="false"
- android:exported="true">
+ android:targetActivity=".TestActivity"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.HOME"/>
@@ -533,9 +473,9 @@
</activity-alias>
<activity-alias android:name=".SingleHomeActivity"
- android:targetActivity=".SingleInstanceActivity"
- android:enabled="false"
- android:exported="true">
+ android:targetActivity=".SingleInstanceActivity"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.HOME"/>
@@ -544,9 +484,9 @@
</activity-alias>
<activity-alias android:name=".SingleSecondaryHomeActivity"
- android:targetActivity=".SingleInstanceActivity"
- android:enabled="false"
- android:exported="true">
+ android:targetActivity=".SingleInstanceActivity"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.HOME"/>
@@ -556,43 +496,36 @@
</activity-alias>
<service android:name="com.android.cts.verifier.vr.MockVrListenerService"
- android:exported="true"
- android:enabled="true"
- android:permission="android.permission.BIND_VR_LISTENER_SERVICE">
+ android:exported="true"
+ android:enabled="true"
+ android:permission="android.permission.BIND_VR_LISTENER_SERVICE">
<intent-filter>
- <action android:name="android.service.vr.VrListenerService" />
+ <action android:name="android.service.vr.VrListenerService"/>
</intent-filter>
</service>
<activity android:name=".HostActivity"
- android:exported="true">
+ android:exported="true">
<intent-filter>
- <action android:name="android.server.wm.app.HostActivity"></action>
+ <action android:name="android.server.wm.app.HostActivity"/>
</intent-filter>
</activity>
<service android:name=".RenderService"
- android:process=".render_process" />
- <activity
- android:name=".ClickableToastActivity"
- android:exported="true" />
- <activity
- android:name=".MinimalPostProcessingActivity"
- android:exported="true" />
- <activity
- android:name=".MinimalPostProcessingActivity2"
- android:exported="true"/>
- <activity
- android:name=".MinimalPostProcessingManifestActivity"
- android:preferMinimalPostProcessing="true"
- android:exported="true"/>
- <activity
- android:name=".PopupMinimalPostProcessingActivity"
- android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
- android:exported="true" />
- <activity
- android:name=".PresentationActivity"
- android:launchMode="singleTop"
- android:exported="true" />
+ android:process=".render_process"/>
+ <activity android:name=".ClickableToastActivity"
+ android:exported="true"/>
+ <activity android:name=".MinimalPostProcessingActivity"
+ android:exported="true"/>
+ <activity android:name=".MinimalPostProcessingActivity2"
+ android:exported="true"/>
+ <activity android:name=".MinimalPostProcessingManifestActivity"
+ android:preferMinimalPostProcessing="true"
+ android:exported="true"/>
+ <activity android:name=".PopupMinimalPostProcessingActivity"
+ android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
+ android:exported="true"/>
+ <activity android:name=".PresentationActivity"
+ android:launchMode="singleTop"
+ android:exported="true"/>
</application>
</manifest>
-
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppA/AndroidManifest.xml b/tests/framework/base/windowmanager/backgroundactivity/AppA/AndroidManifest.xml
index eb156b6..5b47fc0 100755
--- a/tests/framework/base/windowmanager/backgroundactivity/AppA/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppA/AndroidManifest.xml
@@ -16,37 +16,32 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.server.wm.backgroundactivity.appa">
+ package="android.server.wm.backgroundactivity.appa">
<!-- To enable the app to start activities from the background. -->
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application android:testOnly="true">
- <receiver
- android:name=".StartBackgroundActivityReceiver"
- android:exported="true"/>
- <receiver
- android:name=".SendPendingIntentReceiver"
- android:exported="true"/>
- <receiver
- android:name=".SimpleAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name=".StartBackgroundActivityReceiver"
+ android:exported="true"/>
+ <receiver android:name=".SendPendingIntentReceiver"
+ android:exported="true"/>
+ <receiver android:name=".SimpleAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <activity
- android:name=".ForegroundActivity"
- android:taskAffinity=".am_cts_bg_task_a"
- android:exported="true" />
- <activity
- android:name=".BackgroundActivity"
- android:taskAffinity=".am_cts_bg_task_b"
- android:exported="true" />
- <activity
- android:name=".SecondBackgroundActivity"
- android:exported="true" />
+ <activity android:name=".ForegroundActivity"
+ android:taskAffinity=".am_cts_bg_task_a"
+ android:exported="true"/>
+ <activity android:name=".BackgroundActivity"
+ android:taskAffinity=".am_cts_bg_task_b"
+ android:exported="true"/>
+ <activity android:name=".SecondBackgroundActivity"
+ android:exported="true"/>
</application>
</manifest>
diff --git a/tests/framework/base/windowmanager/dndsourceapp/AndroidManifest.xml b/tests/framework/base/windowmanager/dndsourceapp/AndroidManifest.xml
index c044981..bb2a1b3 100644
--- a/tests/framework/base/windowmanager/dndsourceapp/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/dndsourceapp/AndroidManifest.xml
@@ -15,11 +15,12 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.server.wm.dndsourceapp"
- android:targetSandboxVersion="2">
+ package="android.server.wm.dndsourceapp"
+ android:targetSandboxVersion="2">
<application android:label="CtsDnDSource">
<activity android:name="android.server.wm.dndsourceapp.DragSource"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout">
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@@ -27,7 +28,7 @@
</activity>
<provider android:name="android.server.wm.dndsourceapp.DragSourceContentProvider"
- android:authorities="android.server.wm.dndsource.contentprovider"
- android:grantUriPermissions="true"/>
+ android:authorities="android.server.wm.dndsource.contentprovider"
+ android:grantUriPermissions="true"/>
</application>
</manifest>
diff --git a/tests/framework/base/windowmanager/dndtargetapp/AndroidManifest.xml b/tests/framework/base/windowmanager/dndtargetapp/AndroidManifest.xml
index 7d50b70..6cdddae 100644
--- a/tests/framework/base/windowmanager/dndtargetapp/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/dndtargetapp/AndroidManifest.xml
@@ -15,11 +15,12 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.server.wm.dndtargetapp"
- android:targetSandboxVersion="2">
+ package="android.server.wm.dndtargetapp"
+ android:targetSandboxVersion="2">
<application android:label="CtsDnDTarget">
<activity android:name="android.server.wm.dndtargetapp.DropTarget"
- android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout">
+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/framework/base/windowmanager/dndtargetappsdk23/AndroidManifest.xml b/tests/framework/base/windowmanager/dndtargetappsdk23/AndroidManifest.xml
index d10a548..106415c 100644
--- a/tests/framework/base/windowmanager/dndtargetappsdk23/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/dndtargetappsdk23/AndroidManifest.xml
@@ -15,9 +15,10 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.server.wm.dndtargetappsdk23">
+ package="android.server.wm.dndtargetappsdk23">
<application android:label="CtsDnDTarget">
- <activity android:name="android.server.wm.dndtargetappsdk23.DropTarget">
+ <activity android:name="android.server.wm.dndtargetappsdk23.DropTarget"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/MinimalPostProcessingTests.java b/tests/framework/base/windowmanager/src/android/server/wm/MinimalPostProcessingTests.java
index 2abb9de..8dea6b7 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/MinimalPostProcessingTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/MinimalPostProcessingTests.java
@@ -80,13 +80,7 @@
}
@Test
- public void testNotPreferMinimalPostProcessingSimple() throws Exception {
- launchMppActivity(MPP_ACTIVITY, NOT_PREFER_MPP);
- assertDisplayRequestedMinimalPostProcessing(MPP_ACTIVITY, NOT_PREFER_MPP);
- }
-
- @Test
- public void testAttrPreferMinimalPostProcessingDefault() throws Exception {
+ public void testPreferMinimalPostProcessingDefault() throws Exception {
launchMppActivity(MPP_ACTIVITY, NOT_PREFER_MPP);
assertDisplayRequestedMinimalPostProcessing(MPP_ACTIVITY, NOT_PREFER_MPP);
}
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 c901974..9c77798 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
@@ -154,7 +154,7 @@
@Test
public void testMinimumDeviceSize() throws Exception {
- mWmState.assertDeviceDefaultDisplaySize(
+ mWmState.assertDeviceDefaultDisplaySizeForMultiWindow(
"Devices supporting picture-in-picture must be larger than the default minimum"
+ " task size");
}
@@ -1002,10 +1002,7 @@
}
@Test
- @FlakyTest(bugId=156314330)
public void testFinishPipActivityWithTaskOverlay() throws Exception {
- // Trigger PiP menu activity to properly lose focuse when going home
- launchActivity(TEST_ACTIVITY);
// Launch PiP activity
launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
waitForEnterPip(PIP_ACTIVITY);
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SplitScreenTests.java b/tests/framework/base/windowmanager/src/android/server/wm/SplitScreenTests.java
index a876088..9b50ab2 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SplitScreenTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SplitScreenTests.java
@@ -90,9 +90,12 @@
@Test
public void testMinimumDeviceSize() throws Exception {
- mWmState.assertDeviceDefaultDisplaySize(
+ mWmState.assertDeviceDefaultDisplaySizeForMultiWindow(
"Devices supporting multi-window must be larger than the default minimum"
+ " task size");
+ mWmState.assertDeviceDefaultDisplaySizeForSplitScreen(
+ "Devices supporting split-screen multi-window must be larger than the"
+ + " default minimum display size.");
}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowFocusTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowFocusTests.java
index bdb28b2..733536a 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowFocusTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowFocusTests.java
@@ -58,8 +58,6 @@
import android.view.View;
import android.view.WindowManager.LayoutParams;
-import androidx.test.filters.FlakyTest;
-
import com.android.compatibility.common.util.SystemUtil;
import org.junit.Test;
@@ -219,7 +217,6 @@
* - The window which lost top-focus can be notified about pointer-capture lost.
*/
@Test
- @FlakyTest(bugId = 135574991)
public void testPointerCapture() {
final PrimaryActivity primaryActivity = startActivity(PrimaryActivity.class,
DEFAULT_DISPLAY);
@@ -247,6 +244,31 @@
}
/**
+ * Pointer capture could be requested after activity regains focus.
+ */
+ @Test
+ public void testPointerCaptureWhenFocus() {
+ final AutoEngagePointerCaptureActivity primaryActivity =
+ startActivity(AutoEngagePointerCaptureActivity.class, DEFAULT_DISPLAY);
+
+ // Assert primary activity can have pointer capture before we have multiple focused windows.
+ primaryActivity.waitAndAssertPointerCaptureState(true /* hasCapture */);
+
+ assumeTrue(supportsMultiDisplay());
+ final SecondaryActivity secondaryActivity =
+ createManagedInvisibleDisplaySession().startActivityAndFocus();
+
+ primaryActivity.waitAndAssertWindowFocusState(false /* hasFocus */);
+ // Assert primary activity lost pointer capture when it is not top focused.
+ primaryActivity.waitAndAssertPointerCaptureState(false /* hasCapture */);
+ secondaryActivity.waitAndAssertPointerCaptureState(false /* hasCapture */);
+
+ tapOnCenterOfDisplay(DEFAULT_DISPLAY);
+ primaryActivity.waitAndAssertWindowFocusState(true /* hasFocus */);
+ primaryActivity.waitAndAssertPointerCaptureState(true /* hasCapture */);
+ }
+
+ /**
* Test if the focused window can still have focus after it is moved to another display.
*/
@Test
@@ -470,6 +492,16 @@
}
}
+ public static class AutoEngagePointerCaptureActivity extends InputTargetActivity {
+ @Override
+ public void onWindowFocusChanged(boolean hasFocus) {
+ if (hasFocus) {
+ requestPointerCapture();
+ }
+ super.onWindowFocusChanged(hasFocus);
+ }
+ }
+
private InvisibleVirtualDisplaySession createManagedInvisibleDisplaySession() {
return mObjectTracker.manage(
new InvisibleVirtualDisplaySession(getInstrumentation().getTargetContext()));
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java b/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
index 64d6376..d1b3e82 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
@@ -1062,8 +1062,18 @@
return uiModeLockedToVrHeadset;
}
+ /** Returns true if the default display supports split screen multi-window. */
protected boolean supportsSplitScreenMultiWindow() {
- return ActivityTaskManager.supportsSplitScreenMultiWindow(mContext);
+ Display defaultDisplay = mDm.getDisplay(DEFAULT_DISPLAY);
+ return supportsSplitScreenMultiWindow(mContext.createDisplayContext(defaultDisplay));
+ }
+
+ /**
+ * Returns true if the display associated with the supplied {@code context} supports split
+ * screen multi-window.
+ */
+ protected boolean supportsSplitScreenMultiWindow(Context context) {
+ return ActivityTaskManager.supportsSplitScreenMultiWindow(context);
}
protected boolean hasHomeScreen() {
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerState.java b/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerState.java
index f362c23..d767571 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerState.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerState.java
@@ -37,6 +37,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import android.app.ActivityTaskManager;
import android.content.ComponentName;
import android.content.res.Configuration;
import android.graphics.Rect;
@@ -242,12 +243,7 @@
return TYPE_NAVIGATION_BAR == navState.getType();
}
- /** Enable/disable the mFocusedWindow check during the computeState.*/
- void setSanityCheckWithFocusedWindow(boolean sanityCheckFocusedWindow) {
- mSanityCheckFocusedWindow = sanityCheckFocusedWindow;
- }
-
- /**
+/**
* For a given WindowContainer, traverse down the hierarchy and add all children of type
* {@code T} to {@code outChildren}.
*/
@@ -288,6 +284,11 @@
}
}
+ /** Enable/disable the mFocusedWindow check during the computeState.*/
+ void setSanityCheckWithFocusedWindow(boolean sanityCheckFocusedWindow) {
+ mSanityCheckFocusedWindow = sanityCheckFocusedWindow;
+ }
+
public void computeState() {
// It is possible the system is in the middle of transition to the right state when we get
// the dump. We try a few times to get the information we need before giving up.
@@ -1037,7 +1038,7 @@
private String mAppTransitionState;
DisplayContent(DisplayContentProto proto) {
- super(proto.windowContainer);
+ super(proto.rootDisplayArea.windowContainer);
mId = proto.id;
mFocusedRootTaskId = proto.focusedRootTaskId;
mSingleTaskInstance = proto.singleTaskInstance;
@@ -1079,6 +1080,10 @@
}
+ public String getName() {
+ return mName;
+ }
+
private void addRootTasks() {
// TODO(b/149338177): figure out how CTS tests deal with organizer. For now,
// don't treat them as regular stacks
@@ -1125,10 +1130,6 @@
return mStableBounds;
}
- String getName() {
- return mName;
- }
-
int getFlags() {
return mFlags;
}
@@ -1473,6 +1474,8 @@
static abstract class WindowContainer extends ConfigurationContainer {
+ protected String mName;
+ protected final String mAppToken;
protected boolean mFullscreen;
protected Rect mBounds;
protected int mOrientation;
@@ -1482,6 +1485,9 @@
WindowContainer(WindowContainerProto proto) {
super(proto.configurationContainer);
+ IdentifierProto identifierProto = proto.identifier;
+ mName = identifierProto.title;
+ mAppToken = Integer.toHexString(identifierProto.hashCode);
mOrientation = proto.orientation;
for (int i = 0; i < proto.children.length; i++) {
final WindowContainer child = getWindowContainer(proto.children[i], this);
@@ -1492,6 +1498,15 @@
mVisible = proto.visible;
}
+ @NonNull
+ public String getName() {
+ return mName;
+ }
+
+ String getToken() {
+ return mAppToken;
+ }
+
Rect getBounds() {
return mBounds;
}
@@ -1516,8 +1531,6 @@
private static final int WINDOW_TYPE_EXITING = 2;
private static final int WINDOW_TYPE_DEBUGGER = 3;
- private String mName;
- private final String mAppToken;
private final int mWindowType;
private int mType = 0;
private int mDisplayId;
@@ -1535,9 +1548,6 @@
WindowState(WindowStateProto proto) {
super(proto.windowContainer);
- IdentifierProto identifierProto = proto.identifier;
- mName = identifierProto.title;
- mAppToken = Integer.toHexString(identifierProto.hashCode);
mDisplayId = proto.displayId;
mStackId = proto.stackId;
if (proto.attributes != null) {
@@ -1577,15 +1587,6 @@
collectDescendantsOfType(WindowState.class, this, mSubWindows);
}
- @NonNull
- public String getName() {
- return mName;
- }
-
- String getToken() {
- return mAppToken;
- }
-
boolean isStartingWindow() {
return mWindowType == WINDOW_TYPE_STARTING;
}
@@ -1675,4 +1676,9 @@
int defaultMinimalTaskSize(int displayId) {
return dpToPx(DEFAULT_RESIZABLE_TASK_SIZE_DP, getDisplay(displayId).getDpi());
}
+
+ int defaultMinimalDisplaySizeForSplitScreen(int displayId) {
+ return dpToPx(ActivityTaskManager.DEFAULT_MINIMAL_SPLIT_SCREEN_DISPLAY_SIZE_DP,
+ getDisplay(displayId).getDpi());
+ }
}
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerStateHelper.java b/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerStateHelper.java
index 1a77ba4..a042aa7 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerStateHelper.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerStateHelper.java
@@ -129,7 +129,7 @@
});
}
- void waitForHomeActivityVisible() {
+ public void waitForHomeActivityVisible() {
ComponentName homeActivity = getHomeActivityName();
// Sometimes this function is called before we know what Home Activity is
if (homeActivity == null) {
@@ -582,7 +582,7 @@
visible, isWindowSurfaceShown(windowName));
}
- void assertHomeActivityVisible(boolean visible) {
+ public void assertHomeActivityVisible(boolean visible) {
final ComponentName homeActivity = getHomeActivityName();
assertNotNull(homeActivity);
assertVisibility(homeActivity, visible);
@@ -591,7 +591,7 @@
/**
* Asserts that the device default display minimim width is larger than the minimum task width.
*/
- void assertDeviceDefaultDisplaySize(String errorMessage) {
+ void assertDeviceDefaultDisplaySizeForMultiWindow(String errorMessage) {
computeState();
final int minTaskSizePx = defaultMinimalTaskSize(DEFAULT_DISPLAY);
final WindowManagerState.DisplayContent display = getDisplay(DEFAULT_DISPLAY);
@@ -601,6 +601,20 @@
}
}
+ /**
+ * Asserts that the device default display minimum width is not smaller than the minimum width
+ * for split-screen required by CDD.
+ */
+ void assertDeviceDefaultDisplaySizeForSplitScreen(String errorMessage) {
+ computeState();
+ final int minDisplaySizePx = defaultMinimalDisplaySizeForSplitScreen(DEFAULT_DISPLAY);
+ final WindowManagerState.DisplayContent display = getDisplay(DEFAULT_DISPLAY);
+ final Rect displayRect = display.getDisplayRect();
+ if (Math.max(displayRect.width(), displayRect.height()) < minDisplaySizePx) {
+ fail(errorMessage);
+ }
+ }
+
public void assertKeyguardShowingAndOccluded() {
assertTrue("Keyguard is showing",
getKeyguardControllerState().keyguardShowing);
diff --git a/tests/inputmethod/AndroidManifest.xml b/tests/inputmethod/AndroidManifest.xml
index 3c754de..0c9371c 100644
--- a/tests/inputmethod/AndroidManifest.xml
+++ b/tests/inputmethod/AndroidManifest.xml
@@ -16,65 +16,62 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.view.inputmethod.cts"
- android:targetSandboxVersion="2">
+ package="android.view.inputmethod.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
- <application
- android:label="CtsInputMethodTestCases"
- android:multiArch="true"
- android:supportsRtl="true">
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+ <application android:label="CtsInputMethodTestCases"
+ android:multiArch="true"
+ android:supportsRtl="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name="android.view.inputmethod.cts.InputMethodCtsActivity"
- android:label="InputMethodCtsActivity">
+ <activity android:name="android.view.inputmethod.cts.InputMethodCtsActivity"
+ android:label="InputMethodCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity
- android:name="android.view.inputmethod.cts.util.TestActivity"
- android:label="TestActivity">
+ <activity android:name="android.view.inputmethod.cts.util.TestActivity"
+ android:label="TestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity
- android:name="android.view.inputmethod.cts.util.StateInitializeActivity"
- android:label="StateInitializeActivity">
+ <activity android:name="android.view.inputmethod.cts.util.StateInitializeActivity"
+ android:label="StateInitializeActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<!--
- In order to test window-focus-stealing from other process, let this service run in a
- separate process. -->
+ In order to test window-focus-stealing from other process, let this service run in a
+ separate process. -->
<service android:name="android.view.inputmethod.cts.util.WindowFocusStealerService"
- android:process=":focusstealer"
- android:exported="false">
+ android:process=":focusstealer"
+ android:exported="false">
</service>
<service android:name="android.view.inputmethod.cts.util.WindowFocusHandleService"
- android:exported="false">
+ android:exported="false">
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests of android.view.inputmethod"
- android:targetPackage="android.view.inputmethod.cts">
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests of android.view.inputmethod"
+ android:targetPackage="android.view.inputmethod.cts">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/inputmethod/mockime/AndroidManifest.xml b/tests/inputmethod/mockime/AndroidManifest.xml
index 83d8f3f..5978c17 100644
--- a/tests/inputmethod/mockime/AndroidManifest.xml
+++ b/tests/inputmethod/mockime/AndroidManifest.xml
@@ -16,31 +16,29 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.mockime">
+ package="com.android.cts.mockime">
- <application
- android:multiArch="true"
- android:supportsRtl="true">
+ <application android:multiArch="true"
+ android:supportsRtl="true">
- <meta-data android:name="instantapps.clients.allowed" android:value="true" />
+ <meta-data android:name="instantapps.clients.allowed"
+ android:value="true"/>
- <service
- android:name="com.android.cts.mockime.MockIme"
- android:label="Mock IME"
- android:permission="android.permission.BIND_INPUT_METHOD">
+ <service android:name="com.android.cts.mockime.MockIme"
+ android:label="Mock IME"
+ android:permission="android.permission.BIND_INPUT_METHOD"
+ android:exported="true">
<intent-filter>
- <action android:name="android.view.InputMethod" />
+ <action android:name="android.view.InputMethod"/>
</intent-filter>
- <meta-data
- android:name="android.view.im"
- android:resource="@xml/method" />
+ <meta-data android:name="android.view.im"
+ android:resource="@xml/method"/>
</service>
- <provider
- android:authorities="com.android.cts.mockime.provider"
- android:name="com.android.cts.mockime.SettingsProvider"
- android:exported="true"
- android:visibleToInstantApps="true">
+ <provider android:authorities="com.android.cts.mockime.provider"
+ android:name="com.android.cts.mockime.SettingsProvider"
+ android:exported="true"
+ android:visibleToInstantApps="true">
</provider>
</application>
diff --git a/tests/leanbackjank/TEST_MAPPING b/tests/leanbackjank/TEST_MAPPING
new file mode 100644
index 0000000..64160c8
--- /dev/null
+++ b/tests/leanbackjank/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsLeanbackJankTestCases"
+ }
+ ]
+}
diff --git a/tests/leanbackjank/app/AndroidManifest.xml b/tests/leanbackjank/app/AndroidManifest.xml
index 815b8cd..07f2bce 100644
--- a/tests/leanbackjank/app/AndroidManifest.xml
+++ b/tests/leanbackjank/app/AndroidManifest.xml
@@ -16,44 +16,41 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="android.leanbackjank.app"
- android:versionCode="1"
- android:versionName="1.1" >
+ xmlns:tools="http://schemas.android.com/tools"
+ package="android.leanbackjank.app"
+ android:versionCode="1"
+ android:versionName="1.1">
- <uses-sdk
- android:minSdkVersion="21"
- android:targetSdkVersion="23" />
+ <uses-sdk android:minSdkVersion="21"
+ android:targetSdkVersion="23"/>
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
- <uses-feature
- android:name="android.hardware.touchscreen"
- android:required="false" />
+ <uses-feature android:name="android.hardware.touchscreen"
+ android:required="false"/>
<uses-feature android:name="android.software.leanback"
- android:required="true" />
+ android:required="true"/>
- <application
- android:allowBackup="false"
- android:icon="@drawable/videos_by_google_banner"
- android:label="@string/app_name"
- android:logo="@drawable/videos_by_google_banner"
- android:theme="@style/Theme.Example.Leanback"
- tools:replace="android:appComponentFactory"
- android:appComponentFactory="android.support.v4.app.CoreComponentFactory" >
- <uses-library android:name="android.test.runner" />
+ <application android:allowBackup="false"
+ android:icon="@drawable/videos_by_google_banner"
+ android:label="@string/app_name"
+ android:logo="@drawable/videos_by_google_banner"
+ android:theme="@style/Theme.Example.Leanback"
+ tools:replace="android:appComponentFactory"
+ android:appComponentFactory="android.support.v4.app.CoreComponentFactory">
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name=".ui.MainActivity"
- android:icon="@drawable/videos_by_google_banner"
- android:label="@string/app_name"
- android:logo="@drawable/videos_by_google_banner"
- android:screenOrientation="landscape" >
+ <activity android:name=".ui.MainActivity"
+ android:icon="@drawable/videos_by_google_banner"
+ android:label="@string/app_name"
+ android:logo="@drawable/videos_by_google_banner"
+ android:screenOrientation="landscape"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/libcore/jsr166/TEST_MAPPING b/tests/libcore/jsr166/TEST_MAPPING
new file mode 100644
index 0000000..7657d68
--- /dev/null
+++ b/tests/libcore/jsr166/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsLibcoreJsr166TestCases"
+ }
+ ]
+}
diff --git a/tests/libcore/wycheproof/TEST_MAPPING b/tests/libcore/wycheproof/TEST_MAPPING
new file mode 100644
index 0000000..7993ad6
--- /dev/null
+++ b/tests/libcore/wycheproof/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsLibcoreWycheproofConscryptTestCases"
+ }
+ ]
+}
diff --git a/tests/location/OWNERS b/tests/location/OWNERS
index 61eb794..90fdb22 100644
--- a/tests/location/OWNERS
+++ b/tests/location/OWNERS
@@ -1,7 +1,7 @@
# Bug component: 32850
+sooniln@google.com
dnchrist@google.com
sashakuznetsov@google.com
-sooniln@google.com
weiwa@google.com
wyattriley@google.com
yuhany@google.com
diff --git a/tests/location/common/src/android/location/cts/common/ProximityPendingIntentCapture.java b/tests/location/common/src/android/location/cts/common/ProximityPendingIntentCapture.java
index 75e4e39..9966c41 100644
--- a/tests/location/common/src/android/location/cts/common/ProximityPendingIntentCapture.java
+++ b/tests/location/common/src/android/location/cts/common/ProximityPendingIntentCapture.java
@@ -28,7 +28,9 @@
mLocationManager = context.getSystemService(LocationManager.class);
mPendingIntent = PendingIntent.getBroadcast(context, sRequestCode.getAndIncrement(),
- new Intent(ACTION).setPackage(context.getPackageName()),
+ new Intent(ACTION)
+ .setPackage(context.getPackageName())
+ .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
PendingIntent.FLAG_CANCEL_CURRENT);
mProximityChanges = new LinkedBlockingQueue<>();
diff --git a/tests/location/location_coarse/src/android/location/cts/coarse/LocationManagerCoarseTest.java b/tests/location/location_coarse/src/android/location/cts/coarse/LocationManagerCoarseTest.java
index 05b80b9..6919af5 100644
--- a/tests/location/location_coarse/src/android/location/cts/coarse/LocationManagerCoarseTest.java
+++ b/tests/location/location_coarse/src/android/location/cts/coarse/LocationManagerCoarseTest.java
@@ -19,11 +19,14 @@
import static android.location.LocationManager.GPS_PROVIDER;
import static android.location.LocationManager.NETWORK_PROVIDER;
import static android.location.LocationManager.PASSIVE_PROVIDER;
+import static android.provider.Settings.Secure.LOCATION_COARSE_ACCURACY_M;
import static androidx.test.ext.truth.location.LocationSubject.assertThat;
import static com.android.compatibility.common.util.LocationUtils.createLocation;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
@@ -38,9 +41,12 @@
import android.location.LocationManager;
import android.location.cts.common.LocationListenerCapture;
import android.location.cts.common.LocationPendingIntentCapture;
+import android.location.cts.common.ProximityPendingIntentCapture;
+import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
import android.platform.test.annotations.AppModeFull;
+import android.provider.Settings;
import android.util.Log;
import androidx.test.core.app.ApplicationProvider;
@@ -65,8 +71,7 @@
private static final long TIMEOUT_MS = 5000;
- // 2000m is the default grid size used by location fudger
- private static final float MAX_COARSE_FUDGE_DISTANCE_M = 2500f;
+ private static final float MIN_COARSE_FUDGE_DISTANCE_M = 2000f;
private static final String TEST_PROVIDER = "test_provider";
@@ -74,6 +79,8 @@
private Context mContext;
private LocationManager mManager;
+ private float mMaxCoarseFudgeDistanceM;
+
@Before
public void setUp() throws Exception {
LocationUtils.registerMockLocationProvider(InstrumentationRegistry.getInstrumentation(),
@@ -86,6 +93,13 @@
mContext = ApplicationProvider.getApplicationContext();
mManager = mContext.getSystemService(LocationManager.class);
+ float coarseLocationAccuracyM = Settings.Secure.getFloat(
+ mContext.getContentResolver(),
+ LOCATION_COARSE_ACCURACY_M,
+ MIN_COARSE_FUDGE_DISTANCE_M);
+ mMaxCoarseFudgeDistanceM = (float) Math.sqrt(
+ 2 * coarseLocationAccuracyM * coarseLocationAccuracyM);
+
assertNotNull(mManager);
for (String provider : mManager.getAllProviders()) {
@@ -116,11 +130,20 @@
}
@Test
+ public void testMinCoarseLocationDistance() {
+ assertThat(Settings.Secure.getFloat(
+ mContext.getContentResolver(),
+ LOCATION_COARSE_ACCURACY_M,
+ MIN_COARSE_FUDGE_DISTANCE_M)).isAtLeast(MIN_COARSE_FUDGE_DISTANCE_M);
+ }
+
+ @Test
public void testGetLastKnownLocation() {
Location loc = createLocation(TEST_PROVIDER, mRandom);
mManager.setTestProviderLocation(TEST_PROVIDER, loc);
- assertThat(mManager.getLastKnownLocation(TEST_PROVIDER)).isNearby(loc, MAX_COARSE_FUDGE_DISTANCE_M);
+ assertThat(mManager.getLastKnownLocation(TEST_PROVIDER)).isNearby(loc,
+ mMaxCoarseFudgeDistanceM);
}
@Test
@@ -137,28 +160,32 @@
@Test
public void testRequestLocationUpdates() throws Exception {
Location loc = createLocation(TEST_PROVIDER, mRandom);
- Bundle extras = new Bundle();
- extras.putParcelable(Location.EXTRA_NO_GPS_LOCATION, new Location(loc));
- loc.setExtras(extras);
+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+ Bundle extras = new Bundle();
+ extras.putParcelable(Location.EXTRA_NO_GPS_LOCATION, new Location(loc));
+ loc.setExtras(extras);
+ }
try (LocationListenerCapture capture = new LocationListenerCapture(mContext)) {
- mManager.requestLocationUpdates(TEST_PROVIDER, 0, 0, directExecutor(), capture);
+ mManager.requestLocationUpdates(TEST_PROVIDER, 0, 0, Runnable::run, capture);
mManager.setTestProviderLocation(TEST_PROVIDER, loc);
- assertThat(capture.getNextLocation(TIMEOUT_MS)).isNearby(loc, MAX_COARSE_FUDGE_DISTANCE_M);
+ assertThat(capture.getNextLocation(TIMEOUT_MS)).isNearby(loc, mMaxCoarseFudgeDistanceM);
}
}
@Test
public void testRequestLocationUpdates_PendingIntent() throws Exception {
Location loc = createLocation(TEST_PROVIDER, mRandom);
- Bundle extras = new Bundle();
- extras.putParcelable(Location.EXTRA_NO_GPS_LOCATION, new Location(loc));
- loc.setExtras(extras);
+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+ Bundle extras = new Bundle();
+ extras.putParcelable(Location.EXTRA_NO_GPS_LOCATION, new Location(loc));
+ loc.setExtras(extras);
+ }
try (LocationPendingIntentCapture capture = new LocationPendingIntentCapture(mContext)) {
mManager.requestLocationUpdates(TEST_PROVIDER, 0, 0, capture.getPendingIntent());
mManager.setTestProviderLocation(TEST_PROVIDER, loc);
- assertThat(capture.getNextLocation(TIMEOUT_MS)).isNearby(loc, MAX_COARSE_FUDGE_DISTANCE_M);
+ assertThat(capture.getNextLocation(TIMEOUT_MS)).isNearby(loc, mMaxCoarseFudgeDistanceM);
}
}
@@ -206,6 +233,18 @@
mManager.sendExtraCommand(TEST_PROVIDER, "command", null);
}
+ @Test
+ public void testAddProximityAlert() {
+ try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
+ try {
+ mManager.addProximityAlert(0, 0, 100, -1, capture.getPendingIntent());
+ fail("addProximityAlert() should fail with only ACCESS_COARSE_LOCATION");
+ } catch (SecurityException e) {
+ // pass
+ }
+ }
+ }
+
// TODO: this test should probably not be in the location module
@Test
public void testGnssProvidedClock() throws Exception {
@@ -240,10 +279,6 @@
assertTrue(System.currentTimeMillis() - clockms < 1000);
}
- private static Executor directExecutor() {
- return Runnable::run;
- }
-
private boolean hasGpsFeature() {
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LOCATION_GPS);
}
diff --git a/tests/location/location_fine/src/android/location/cts/fine/GeofencingTest.java b/tests/location/location_fine/src/android/location/cts/fine/GeofencingTest.java
new file mode 100644
index 0000000..92580c9
--- /dev/null
+++ b/tests/location/location_fine/src/android/location/cts/fine/GeofencingTest.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2008 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.location.cts.fine;
+
+import static android.location.LocationManager.FUSED_PROVIDER;
+import static android.location.LocationManager.PROVIDERS_CHANGED_ACTION;
+
+import static com.android.compatibility.common.util.LocationUtils.createLocation;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.fail;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.Criteria;
+import android.location.LocationManager;
+import android.location.cts.common.ProximityPendingIntentCapture;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.util.Log;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.LocationUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Objects;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class GeofencingTest {
+
+ private static final String TAG = "GeofenceManagerTest";
+
+ private static final long TIMEOUT_MS = 5000;
+ private static final long FAILURE_TIMEOUT_MS = 200;
+
+ private static final String TEST_PROVIDER = "test_provider";
+
+ private Context mContext;
+ private LocationManager mManager;
+
+ @Before
+ public void setUp() throws Exception {
+ LocationUtils.registerMockLocationProvider(InstrumentationRegistry.getInstrumentation(),
+ true);
+
+ long seed = System.currentTimeMillis();
+ Log.i(TAG, "location random seed: " + seed);
+
+ mContext = ApplicationProvider.getApplicationContext();
+ mManager = Objects.requireNonNull(mContext.getSystemService(LocationManager.class));
+
+ for (String provider : mManager.getAllProviders()) {
+ mManager.removeTestProvider(provider);
+ }
+
+ mManager.addTestProvider(TEST_PROVIDER,
+ true,
+ false,
+ true,
+ false,
+ false,
+ false,
+ false,
+ Criteria.POWER_MEDIUM,
+ Criteria.ACCURACY_FINE);
+ mManager.setTestProviderEnabled(TEST_PROVIDER, true);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (mManager != null) {
+ for (String provider : mManager.getAllProviders()) {
+ mManager.removeTestProvider(provider);
+ }
+ }
+
+ LocationUtils.registerMockLocationProvider(InstrumentationRegistry.getInstrumentation(),
+ false);
+ }
+
+ @Test
+ public void testAddProximityAlert() throws Exception {
+ mManager.addTestProvider(FUSED_PROVIDER,
+ true,
+ false,
+ true,
+ false,
+ false,
+ false,
+ false,
+ Criteria.POWER_MEDIUM,
+ Criteria.ACCURACY_FINE);
+ mManager.setTestProviderEnabled(FUSED_PROVIDER, true);
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 30, 30, 10));
+
+ try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
+ mManager.addProximityAlert(0, 0, 1000, -1, capture.getPendingIntent());
+
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 0, 0, 10));
+ assertThat(capture.getNextProximityChange(TIMEOUT_MS)).isEqualTo(Boolean.TRUE);
+
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 30, 30, 10));
+ assertThat(capture.getNextProximityChange(TIMEOUT_MS)).isEqualTo(Boolean.FALSE);
+ }
+
+ try {
+ mManager.addProximityAlert(0, 0, 1000, -1, null);
+ fail("Should throw IllegalArgumentException if pending intent is null!");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+
+ try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
+ try {
+ mManager.addProximityAlert(0, 0, 0, -1, capture.getPendingIntent());
+ fail("Should throw IllegalArgumentException if radius == 0!");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+
+ try {
+ mManager.addProximityAlert(0, 0, -1, -1, capture.getPendingIntent());
+ fail("Should throw IllegalArgumentException if radius < 0!");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+
+ try {
+ mManager.addProximityAlert(1000, 1000, 1000, -1, capture.getPendingIntent());
+ fail("Should throw IllegalArgumentException if lat/lon are illegal!");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+ }
+
+ @Test
+ public void testRemoveProximityAlert() throws Exception {
+ mManager.addTestProvider(FUSED_PROVIDER,
+ true,
+ false,
+ true,
+ false,
+ false,
+ false,
+ false,
+ Criteria.POWER_MEDIUM,
+ Criteria.ACCURACY_FINE);
+ mManager.setTestProviderEnabled(FUSED_PROVIDER, true);
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 30, 30, 10));
+
+ try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
+ mManager.addProximityAlert(0, 0, 1000, -1, capture.getPendingIntent());
+ mManager.removeProximityAlert(capture.getPendingIntent());
+
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 0, 0, 10));
+ assertThat(capture.getNextProximityChange(FAILURE_TIMEOUT_MS)).isNull();
+ }
+
+ try {
+ mManager.removeProximityAlert(null);
+ fail("Should throw IllegalArgumentException if pending intent is null!");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testAddProximityAlert_StartProximate() throws Exception {
+ mManager.addTestProvider(FUSED_PROVIDER,
+ true,
+ false,
+ true,
+ false,
+ false,
+ false,
+ false,
+ Criteria.POWER_MEDIUM,
+ Criteria.ACCURACY_FINE);
+ mManager.setTestProviderEnabled(FUSED_PROVIDER, true);
+ mManager.setTestProviderLocation(FUSED_PROVIDER, createLocation(FUSED_PROVIDER, 0, 0, 10));
+
+ try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
+ mManager.addProximityAlert(0, 0, 1000, -1, capture.getPendingIntent());
+ assertThat(capture.getNextProximityChange(TIMEOUT_MS)).isEqualTo(Boolean.TRUE);
+ }
+ }
+
+ @Test
+ public void testAddProximityAlert_Multiple() throws Exception {
+ mManager.addTestProvider(FUSED_PROVIDER,
+ true,
+ false,
+ true,
+ false,
+ false,
+ false,
+ false,
+ Criteria.POWER_MEDIUM,
+ Criteria.ACCURACY_FINE);
+ mManager.setTestProviderEnabled(FUSED_PROVIDER, true);
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 30, 30, 10));
+
+ ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext);
+ try {
+ mManager.addProximityAlert(0, 0, 1000, -1, capture.getPendingIntent());
+ mManager.addProximityAlert(30, 30, 1000, -1, capture.getPendingIntent());
+
+ assertThat(capture.getNextProximityChange(TIMEOUT_MS)).isEqualTo(Boolean.TRUE);
+
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 0, 0, 10));
+ Boolean first = capture.getNextProximityChange(TIMEOUT_MS);
+ assertThat(first).isNotNull();
+ Boolean second = capture.getNextProximityChange(TIMEOUT_MS);
+ assertThat(second).isNotNull();
+ assertThat(first).isNotEqualTo(second);
+ } finally {
+ capture.close();
+ }
+
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 30, 30, 10));
+ assertThat(capture.getNextProximityChange(FAILURE_TIMEOUT_MS)).isNull();
+ }
+
+ @Test
+ public void testAddProximityAlert_Expires() throws Exception {
+ mManager.addTestProvider(FUSED_PROVIDER,
+ true,
+ false,
+ true,
+ false,
+ false,
+ false,
+ false,
+ Criteria.POWER_MEDIUM,
+ Criteria.ACCURACY_FINE);
+ mManager.setTestProviderEnabled(FUSED_PROVIDER, true);
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 30, 30, 10));
+
+ try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
+ mManager.addProximityAlert(0, 0, 1000, 1, capture.getPendingIntent());
+
+ mManager.setTestProviderLocation(FUSED_PROVIDER,
+ createLocation(FUSED_PROVIDER, 0, 0, 10));
+ assertThat(capture.getNextProximityChange(FAILURE_TIMEOUT_MS)).isNull();
+ }
+ }
+}
diff --git a/tests/location/location_fine/src/android/location/cts/fine/GnssStatusTest.java b/tests/location/location_fine/src/android/location/cts/fine/GnssStatusTest.java
index df050ba..64da7fe 100644
--- a/tests/location/location_fine/src/android/location/cts/fine/GnssStatusTest.java
+++ b/tests/location/location_fine/src/android/location/cts/fine/GnssStatusTest.java
@@ -19,6 +19,7 @@
import static org.junit.Assert.assertEquals;
import android.location.GnssStatus;
+import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -57,6 +58,18 @@
assertEquals(0, status.getSatelliteCount());
}
+ @Test
+ public void testRoundtrip() {
+ GnssStatus gnssStatus = getTestGnssStatus();
+
+ Parcel parcel = Parcel.obtain();
+ gnssStatus.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+
+ GnssStatus fromParcel = GnssStatus.CREATOR.createFromParcel(parcel);
+ assertEquals(gnssStatus, fromParcel);
+ }
+
private static GnssStatus getTestGnssStatus() {
GnssStatus.Builder builder = new GnssStatus.Builder();
builder.addSatellite(GnssStatus.CONSTELLATION_GPS,
diff --git a/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java b/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java
index e6e69df..1e63306 100644
--- a/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java
+++ b/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java
@@ -55,7 +55,6 @@
import android.location.cts.common.GetCurrentLocationCapture;
import android.location.cts.common.LocationListenerCapture;
import android.location.cts.common.LocationPendingIntentCapture;
-import android.location.cts.common.ProximityPendingIntentCapture;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.HandlerThread;
@@ -78,10 +77,9 @@
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Random;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
@RunWith(AndroidJUnit4.class)
public class LocationManagerFineTest {
@@ -107,9 +105,7 @@
mRandom = new Random(seed);
mContext = ApplicationProvider.getApplicationContext();
- mManager = mContext.getSystemService(LocationManager.class);
-
- assertThat(mManager).isNotNull();
+ mManager = Objects.requireNonNull(mContext.getSystemService(LocationManager.class));
for (String provider : mManager.getAllProviders()) {
mManager.removeTestProvider(provider);
@@ -130,8 +126,10 @@
@After
public void tearDown() throws Exception {
- for (String provider : mManager.getAllProviders()) {
- mManager.removeTestProvider(provider);
+ if (mManager != null) {
+ for (String provider : mManager.getAllProviders()) {
+ mManager.removeTestProvider(provider);
+ }
}
LocationUtils.registerMockLocationProvider(InstrumentationRegistry.getInstrumentation(),
@@ -428,7 +426,7 @@
true,
Criteria.POWER_LOW,
Criteria.ACCURACY_FINE);
- setTestProviderEnabled(FUSED_PROVIDER, true);
+ mManager.setTestProviderEnabled(FUSED_PROVIDER, true);
Criteria criteria = new Criteria();
criteria.setAccuracy(Criteria.ACCURACY_FINE);
@@ -574,7 +572,7 @@
true,
Criteria.POWER_LOW,
Criteria.ACCURACY_COARSE);
- setTestProviderEnabled(NETWORK_PROVIDER, true);
+ mManager.setTestProviderEnabled(NETWORK_PROVIDER, true);
mManager.setTestProviderLocation(NETWORK_PROVIDER, networkLocation);
// reset gps provider to give it a cold start scenario
@@ -671,7 +669,7 @@
providers = mManager.getProviders(true);
assertThat(providers.contains(TEST_PROVIDER)).isTrue();
- setTestProviderEnabled(TEST_PROVIDER, false);
+ mManager.setTestProviderEnabled(TEST_PROVIDER, false);
providers = mManager.getProviders(false);
assertThat(providers.contains(TEST_PROVIDER)).isTrue();
@@ -730,7 +728,7 @@
criteria.setPowerRequirement(Criteria.POWER_LOW);
assertThat(mManager.getBestProvider(criteria, false)).isEqualTo(TEST_PROVIDER);
- setTestProviderEnabled(TEST_PROVIDER, false);
+ mManager.setTestProviderEnabled(TEST_PROVIDER, false);
assertThat(mManager.getBestProvider(criteria, true)).isNotEqualTo(TEST_PROVIDER);
}
@@ -885,7 +883,7 @@
assertThat(received.isFromMockProvider()).isTrue();
assertThat(mManager.getLastKnownLocation(provider)).isEqualTo(loc1);
- setTestProviderEnabled(provider, false);
+ mManager.setTestProviderEnabled(provider, false);
mManager.setTestProviderLocation(provider, loc2);
assertThat(mManager.getLastKnownLocation(provider)).isNull();
assertThat(capture.getNextLocation(FAILURE_TIMEOUT_MS)).isNull();
@@ -979,130 +977,6 @@
}
@Test
- public void testAddProximityAlert() throws Exception {
- if (isNotSystemUser()) {
- Log.i(TAG, "Skipping test on secondary user");
- return;
- }
-
- mManager.addTestProvider(FUSED_PROVIDER,
- true,
- false,
- true,
- false,
- false,
- false,
- false,
- Criteria.POWER_MEDIUM,
- Criteria.ACCURACY_FINE);
- setTestProviderEnabled(FUSED_PROVIDER, true);
- mManager.setTestProviderLocation(FUSED_PROVIDER, createLocation(FUSED_PROVIDER, 30, 30, 10));
-
- try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
- mManager.addProximityAlert(0, 0, 1000, -1, capture.getPendingIntent());
-
- // adding a proximity alert is asynchronous for no good reason, so we have to wait and
- // hope the alert is added in the mean time.
- Thread.sleep(500);
-
- mManager.setTestProviderLocation(FUSED_PROVIDER, createLocation(FUSED_PROVIDER, 0, 0, 10));
- assertThat(capture.getNextProximityChange(TIMEOUT_MS)).isEqualTo(Boolean.TRUE);
-
- mManager.setTestProviderLocation(FUSED_PROVIDER,
- createLocation(FUSED_PROVIDER, 30, 30, 10));
- assertThat(capture.getNextProximityChange(TIMEOUT_MS)).isEqualTo(Boolean.FALSE);
- }
-
- try {
- mManager.addProximityAlert(0, 0, 1000, -1, null);
- fail("Should throw IllegalArgumentException if pending intent is null!");
- } catch (IllegalArgumentException e) {
- // expected
- }
-
- try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
- try {
- mManager.addProximityAlert(0, 0, 0, -1, capture.getPendingIntent());
- fail("Should throw IllegalArgumentException if radius == 0!");
- } catch (IllegalArgumentException e) {
- // expected
- }
-
- try {
- mManager.addProximityAlert(0, 0, -1, -1, capture.getPendingIntent());
- fail("Should throw IllegalArgumentException if radius < 0!");
- } catch (IllegalArgumentException e) {
- // expected
- }
-
- try {
- mManager.addProximityAlert(1000, 1000, 1000, -1, capture.getPendingIntent());
- fail("Should throw IllegalArgumentException if lat/lon are illegal!");
- } catch (IllegalArgumentException e) {
- // expected
- }
- }
- }
-
- @Test
- public void testAddProximityAlert_StartProximate() throws Exception {
- if (isNotSystemUser()) {
- Log.i(TAG, "Skipping test on secondary user");
- return;
- }
-
- mManager.addTestProvider(FUSED_PROVIDER,
- true,
- false,
- true,
- false,
- false,
- false,
- false,
- Criteria.POWER_MEDIUM,
- Criteria.ACCURACY_FINE);
- setTestProviderEnabled(FUSED_PROVIDER, true);
- mManager.setTestProviderLocation(FUSED_PROVIDER, createLocation(FUSED_PROVIDER, 0, 0, 10));
-
- try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
- mManager.addProximityAlert(0, 0, 1000, -1, capture.getPendingIntent());
- assertThat(capture.getNextProximityChange(TIMEOUT_MS)).isEqualTo(Boolean.TRUE);
- }
- }
-
- @Test
- public void testAddProximityAlert_Expires() throws Exception {
- if (isNotSystemUser()) {
- Log.i(TAG, "Skipping test on secondary user");
- return;
- }
-
- mManager.addTestProvider(FUSED_PROVIDER,
- true,
- false,
- true,
- false,
- false,
- false,
- false,
- Criteria.POWER_MEDIUM,
- Criteria.ACCURACY_FINE);
- setTestProviderEnabled(FUSED_PROVIDER, true);
- mManager.setTestProviderLocation(FUSED_PROVIDER, createLocation(FUSED_PROVIDER, 30, 30, 10));
-
- try (ProximityPendingIntentCapture capture = new ProximityPendingIntentCapture(mContext)) {
- mManager.addProximityAlert(0, 0, 1000, 1, capture.getPendingIntent());
-
- // adding a proximity alert is asynchronous for no good reason, so we have to wait and
- // hope the alert is added in the mean time.
- Thread.sleep(500);
-
- mManager.setTestProviderLocation(FUSED_PROVIDER, createLocation(FUSED_PROVIDER, 0, 0, 10));
- assertThat(capture.getNextProximityChange(FAILURE_TIMEOUT_MS)).isNull();
- }
- }
-
- @Test
public void testGetGnssYearOfHardware() {
assumeTrue(hasGpsFeature());
mManager.getGnssYearOfHardware();
@@ -1171,33 +1045,4 @@
return mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_LOCATION_GPS);
}
-
- private boolean isNotSystemUser() {
- return !mContext.getSystemService(UserManager.class).isSystemUser();
- }
-
- private void setTestProviderEnabled(String provider, boolean enabled) throws InterruptedException {
- // prior to R, setTestProviderEnabled is asynchronous, so we have to wait for provider
- // state to settle.
- if (VERSION.SDK_INT <= VERSION_CODES.Q) {
- CountDownLatch latch = new CountDownLatch(1);
- BroadcastReceiver receiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- latch.countDown();
- }
- };
- mContext.registerReceiver(receiver,
- new IntentFilter(PROVIDERS_CHANGED_ACTION));
- mManager.setTestProviderEnabled(provider, enabled);
-
- // it's ok if this times out, as we don't notify for noop changes
- if (!latch.await(500, TimeUnit.MILLISECONDS)) {
- Log.i(TAG, "timeout while waiting for provider enabled change");
- }
- mContext.unregisterReceiver(receiver);
- } else {
- mManager.setTestProviderEnabled(provider, enabled);
- }
- }
}
diff --git a/tests/location/location_none/src/android/location/cts/none/NoLocationPermissionTest.java b/tests/location/location_none/src/android/location/cts/none/NoLocationPermissionTest.java
index d619f32..7d150cb 100644
--- a/tests/location/location_none/src/android/location/cts/none/NoLocationPermissionTest.java
+++ b/tests/location/location_none/src/android/location/cts/none/NoLocationPermissionTest.java
@@ -16,8 +16,6 @@
package android.location.cts.none;
-import static android.content.pm.PackageManager.FEATURE_TELEPHONY;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
@@ -29,9 +27,6 @@
import android.location.cts.common.LocationListenerCapture;
import android.location.cts.common.LocationPendingIntentCapture;
import android.os.Looper;
-import android.telephony.CellInfo;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -40,8 +35,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.List;
-
@RunWith(AndroidJUnit4.class)
public class NoLocationPermissionTest {
@@ -57,81 +50,6 @@
assertNotNull(mLocationManager);
}
- @SuppressWarnings("deprecation")
- @Test
- public void testGetCellLocation() {
- if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
- return;
- }
-
- TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
- assertNotNull(telephonyManager);
-
- try {
- telephonyManager.getCellLocation();
- fail("Should throw SecurityException");
- } catch (SecurityException e) {
- // expected
- }
- }
-
- @Test
- public void testGetAllCellInfo() {
- if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
- return;
- }
-
- TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
- assertNotNull(telephonyManager);
-
- try {
- telephonyManager.getAllCellInfo();
- fail("Should throw SecurityException");
- } catch (SecurityException e) {
- // expected
- }
- }
-
- @Test
- public void testListenCellLocation() {
- if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
- return;
- }
-
- TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
- assertNotNull(telephonyManager);
-
- try {
- telephonyManager.listen(new PhoneStateListener(Runnable::run),
- PhoneStateListener.LISTEN_CELL_LOCATION);
- fail("Should throw SecurityException");
- } catch (SecurityException e) {
- // expected
- }
- }
-
- @Test
- public void testRequestCellInfoUpdate() {
- if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
- return;
- }
-
- TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
- assertNotNull(telephonyManager);
-
- try {
- telephonyManager.requestCellInfoUpdate(Runnable::run,
- new TelephonyManager.CellInfoCallback() {
- @Override
- public void onCellInfo(List<CellInfo> cellInfos) {
- }
- });
- fail("Should throw SecurityException");
- } catch (SecurityException e) {
- // expected
- }
- }
-
@Test
public void testRequestLocationUpdates() {
for (String provider : mLocationManager.getAllProviders()) {
diff --git a/tests/mocking/debuggable/TEST_MAPPING b/tests/mocking/debuggable/TEST_MAPPING
new file mode 100644
index 0000000..c6529b3
--- /dev/null
+++ b/tests/mocking/debuggable/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsMockingDebuggableTestCases"
+ }
+ ]
+}
diff --git a/tests/netlegacy22.permission/AndroidManifest.xml b/tests/netlegacy22.permission/AndroidManifest.xml
index 14c40e5..85979c9 100644
--- a/tests/netlegacy22.permission/AndroidManifest.xml
+++ b/tests/netlegacy22.permission/AndroidManifest.xml
@@ -16,14 +16,15 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.netlegacy22.permission.cts">
+ package="android.netlegacy22.permission.cts">
- <uses-permission android:name="android.permission.INJECT_EVENTS" />
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.INJECT_EVENTS"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.permission.cts.PermissionStubActivity"
- android:label="PermissionStubActivity">
+ android:label="PermissionStubActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
@@ -32,21 +33,20 @@
</application>
<!--
- The CTS stubs package cannot be used as the target application here,
- since that requires many permissions to be set. Instead, specify this
- package itself as the target and include any stub activities needed.
+ The CTS stubs package cannot be used as the target application here,
+ since that requires many permissions to be set. Instead, specify this
+ package itself as the target and include any stub activities needed.
- This test package uses the default InstrumentationTestRunner, because
- the InstrumentationCtsTestRunner is only available in the stubs
- package. That runner cannot be added to this package either, since it
- relies on hidden APIs.
- -->
+ This test package uses the default InstrumentationTestRunner, because
+ the InstrumentationCtsTestRunner is only available in the stubs
+ package. That runner cannot be added to this package either, since it
+ relies on hidden APIs.
+ -->
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.netlegacy22.permission.cts"
- android:label="CTS tests of legacy android.net permissions as of API 22">
+ android:targetPackage="android.netlegacy22.permission.cts"
+ android:label="CTS tests of legacy android.net permissions as of API 22">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/netlegacy22.permission/TEST_MAPPING b/tests/netlegacy22.permission/TEST_MAPPING
new file mode 100644
index 0000000..1486eca
--- /dev/null
+++ b/tests/netlegacy22.permission/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetTestCasesLegacyPermission22"
+ }
+ ]
+}
diff --git a/tests/openglperf2/AndroidManifest.xml b/tests/openglperf2/AndroidManifest.xml
index f23e411..5e7d0c1 100644
--- a/tests/openglperf2/AndroidManifest.xml
+++ b/tests/openglperf2/AndroidManifest.xml
@@ -1,53 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.opengl2.cts"
- android:versionCode="1"
- android:versionName="1.0" >
+ package="android.opengl2.cts"
+ android:versionCode="1"
+ android:versionName="1.0">
- <uses-sdk
- android:minSdkVersion="16"
- android:targetSdkVersion="17" />
+ <uses-sdk android:minSdkVersion="16"
+ android:targetSdkVersion="17"/>
- <uses-feature
- android:glEsVersion="0x00020000"
- android:required="true" />
+ <uses-feature android:glEsVersion="0x00020000"
+ android:required="true"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
- <application android:allowBackup="false" >
- <uses-library android:name="android.test.runner" />
+ <application android:allowBackup="false">
+ <uses-library android:name="android.test.runner"/>
- <activity
- android:name=".primitive.GLPrimitiveActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+ <activity android:name=".primitive.GLPrimitiveActivity"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity
- android:name=".reference.GLReferenceActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+ <activity android:name=".reference.GLReferenceActivity"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity
- android:name=".reference.GLGameActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+ <activity android:name=".reference.GLGameActivity"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="OpenGL ES Benchmark"
- android:targetPackage="android.opengl2.cts" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="OpenGL ES Benchmark"
+ android:targetPackage="android.opengl2.cts"/>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/quickaccesswallet/AndroidManifest.xml b/tests/quickaccesswallet/AndroidManifest.xml
index 4b6a994..e7a1df5 100755
--- a/tests/quickaccesswallet/AndroidManifest.xml
+++ b/tests/quickaccesswallet/AndroidManifest.xml
@@ -16,78 +16,76 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.quickaccesswallet.cts"
- android:targetSandboxVersion="2">
+ package="android.quickaccesswallet.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<!-- Required for HostApduService -->
<uses-permission android:name="android.permission.NFC"/>
<!-- Required to test QuickAccessWalletClient feature availability -->
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.quickaccesswallet.QuickAccessWalletActivity" >
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.quickaccesswallet.QuickAccessWalletActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name="android.quickaccesswallet.QuickAccessWalletSettingsActivity">
+ <activity android:name="android.quickaccesswallet.QuickAccessWalletSettingsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.quickaccesswallet.action.VIEW_WALLET_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.service.quickaccesswallet.action.VIEW_WALLET_SETTINGS"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <service
- android:name="android.quickaccesswallet.TestHostApduService"
- android:exported="true"
- android:permission="android.permission.BIND_NFC_SERVICE"
- android:label="@string/app_name">
+ <service android:name="android.quickaccesswallet.TestHostApduService"
+ android:exported="true"
+ android:permission="android.permission.BIND_NFC_SERVICE"
+ android:label="@string/app_name">
<intent-filter>
<action android:name="android.nfc.cardemulation.action.HOST_APDU_SERVICE"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
- <meta-data
- android:name="android.nfc.cardemulation.host_apdu_service"
- android:resource="@xml/hce_aids"/>
+ <meta-data android:name="android.nfc.cardemulation.host_apdu_service"
+ android:resource="@xml/hce_aids"/>
</service>
- <service
- android:name="android.quickaccesswallet.TestQuickAccessWalletService"
- android:enabled="true"
- android:label="@string/app_name"
- android:icon="@drawable/android"
- android:permission="android.permission.BIND_QUICK_ACCESS_WALLET_SERVICE">
+ <service android:name="android.quickaccesswallet.TestQuickAccessWalletService"
+ android:enabled="true"
+ android:label="@string/app_name"
+ android:icon="@drawable/android"
+ android:permission="android.permission.BIND_QUICK_ACCESS_WALLET_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.quickaccesswallet.QuickAccessWalletService" />
+ <action android:name="android.service.quickaccesswallet.QuickAccessWalletService"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<meta-data android:name="android.quickaccesswallet"
- android:resource="@xml/quickaccesswallet_configuration" />;
+ android:resource="@xml/quickaccesswallet_configuration"/>;
</service>
- <service
- android:name="android.quickaccesswallet.NoPermissionQuickAccessWalletService"
- android:enabled="false"
- android:label="@string/app_name"
- android:icon="@drawable/android">
+ <service android:name="android.quickaccesswallet.NoPermissionQuickAccessWalletService"
+ android:enabled="false"
+ android:label="@string/app_name"
+ android:icon="@drawable/android"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.quickaccesswallet.QuickAccessWalletService" />
+ <action android:name="android.service.quickaccesswallet.QuickAccessWalletService"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<meta-data android:name="android.quickaccesswallet"
- android:resource="@xml/quickaccesswallet_configuration" />;
+ android:resource="@xml/quickaccesswallet_configuration"/>;
</service>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="Quick Access Wallet tests"
- android:targetPackage="android.quickaccesswallet.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="Quick Access Wallet tests"
+ android:targetPackage="android.quickaccesswallet.cts">
</instrumentation>
</manifest>
-
diff --git a/tests/sample/AndroidManifest.xml b/tests/sample/AndroidManifest.xml
index adeb050..decd1bc 100755
--- a/tests/sample/AndroidManifest.xml
+++ b/tests/sample/AndroidManifest.xml
@@ -16,25 +16,24 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.sample.cts"
- android:targetSandboxVersion="2">
+ package="android.sample.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.sample.SampleDeviceActivity" >
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.sample.SampleDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS sample tests"
- android:targetPackage="android.sample.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS sample tests"
+ android:targetPackage="android.sample.cts">
</instrumentation>
</manifest>
-
diff --git a/tests/signature/api-check/hidden-api-blacklist-27-api/TEST_MAPPING b/tests/signature/api-check/hidden-api-blacklist-27-api/TEST_MAPPING
new file mode 100644
index 0000000..2abb2e5
--- /dev/null
+++ b/tests/signature/api-check/hidden-api-blacklist-27-api/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsHiddenApiBlacklistApi27TestCases"
+ }
+ ]
+}
diff --git a/tests/signature/intent-check/TEST_MAPPING b/tests/signature/intent-check/TEST_MAPPING
new file mode 100644
index 0000000..e731491
--- /dev/null
+++ b/tests/signature/intent-check/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsIntentSignatureTestCases"
+ }
+ ]
+}
diff --git a/tests/suspendapps/test-apps/TestDeviceAdmin/AndroidManifest.xml b/tests/suspendapps/test-apps/TestDeviceAdmin/AndroidManifest.xml
index 3368398..b336cfb 100644
--- a/tests/suspendapps/test-apps/TestDeviceAdmin/AndroidManifest.xml
+++ b/tests/suspendapps/test-apps/TestDeviceAdmin/AndroidManifest.xml
@@ -15,21 +15,20 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.suspendapps.testdeviceadmin" >
+ package="com.android.suspendapps.testdeviceadmin">
- <application android:label="CTS Device Admin" android:testOnly="true">
- <receiver
- android:name=".TestDeviceAdmin"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
- <meta-data
- android:name="android.app.device_admin"
- android:resource="@xml/device_admin"/>
+ <application android:label="CTS Device Admin"
+ android:testOnly="true">
+ <receiver android:name=".TestDeviceAdmin"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
+ <meta-data android:name="android.app.device_admin"
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <receiver
- android:name=".TestCommsReceiver"
- android:exported="true" />
+ <receiver android:name=".TestCommsReceiver"
+ android:exported="true"/>
</application>
</manifest>
diff --git a/tests/suspendapps/tests/AndroidManifest.xml b/tests/suspendapps/tests/AndroidManifest.xml
index 61dd2f2..2ea98af 100755
--- a/tests/suspendapps/tests/AndroidManifest.xml
+++ b/tests/suspendapps/tests/AndroidManifest.xml
@@ -15,27 +15,29 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.suspendapps.cts">
+ package="android.suspendapps.cts">
<application android:label="CTS Suspend Apps Test">
<activity android:name=".SuspendedDetailsActivity"
- android:permission="android.permission.SEND_SHOW_SUSPENDED_APP_DETAILS">
+ android:permission="android.permission.SEND_SHOW_SUSPENDED_APP_DETAILS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SHOW_SUSPENDED_APP_DETAILS" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.SHOW_SUSPENDED_APP_DETAILS"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <receiver android:name=".UnsuspendReceiver">
+ <receiver android:name=".UnsuspendReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.PACKAGE_UNSUSPENDED_MANUALLY" />
+ <action android:name="android.intent.action.PACKAGE_UNSUSPENDED_MANUALLY"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:functionalTest="true"
- android:targetPackage="android.suspendapps.cts"
- android:label="CTS Suspend Apps Test"/>
+ android:functionalTest="true"
+ android:targetPackage="android.suspendapps.cts"
+ android:label="CTS Suspend Apps Test"/>
</manifest>
diff --git a/tests/tests/accounts/AndroidManifest.xml b/tests/tests/accounts/AndroidManifest.xml
index a31b77a..999a3c6 100644
--- a/tests/tests/accounts/AndroidManifest.xml
+++ b/tests/tests/accounts/AndroidManifest.xml
@@ -16,59 +16,61 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.accounts.cts"
- android:targetSandboxVersion="2">
+ package="android.accounts.cts"
+ android:targetSandboxVersion="2">
<uses-sdk android:minSdkVersion="1"
- android:targetSdkVersion="26"/>
+ android:targetSdkVersion="26"/>
<!-- Don't need GET_ACCOUNTS because share a Uid with the relevant
- authenticators -->
+ authenticators -->
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="android.accounts.cts.AccountDummyActivity" >
+ <activity android:name="android.accounts.cts.AccountDummyActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name="android.accounts.cts.AccountRemovalDummyActivity" >
+ <activity android:name="android.accounts.cts.AccountRemovalDummyActivity">
</activity>
- <activity android:name="android.accounts.cts.AccountAuthenticatorDummyActivity" />
+ <activity android:name="android.accounts.cts.AccountAuthenticatorDummyActivity"/>
- <service android:name="MockAccountService" android:exported="true"
- android:process="android.accounts.cts">
+ <service android:name="MockAccountService"
+ android:exported="true"
+ android:process="android.accounts.cts">
<intent-filter>
- <action android:name="android.accounts.AccountAuthenticator" />
+ <action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
<meta-data android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/authenticator" />
+ android:resource="@xml/authenticator"/>
</service>
- <service android:name="MockCustomTokenAccountService" android:exported="true"
- android:process="android.accounts.cts">
+ <service android:name="MockCustomTokenAccountService"
+ android:exported="true"
+ android:process="android.accounts.cts">
<intent-filter>
- <action android:name="android.accounts.AccountAuthenticator" />
+ <action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
<meta-data android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/custom_token_authenticator" />
+ android:resource="@xml/custom_token_authenticator"/>
<meta-data android:name="android.accounts.AccountAuthenticator.customTokens"
- android:value="1" />
+ android:value="1"/>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.accounts.cts"
- android:label="CTS tests for android.accounts">
+ android:targetPackage="android.accounts.cts"
+ android:label="CTS tests for android.accounts">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/appcomponentfactory/TEST_MAPPING b/tests/tests/appcomponentfactory/TEST_MAPPING
new file mode 100644
index 0000000..a69b8bc
--- /dev/null
+++ b/tests/tests/appcomponentfactory/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAppComponentFactoryTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesActivityAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesActivityAction.xml
index 2eba524..6641c9a 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesActivityAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesActivityAction.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasPermission.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasPermission.xml
index 09c75ae..9afdf5a 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasPermission.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasPermission.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasProvider.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasProvider.xml
index 1e94c1b..d046e70 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasProvider.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasProvider.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-seesInstaller.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-seesInstaller.xml
index 0126775..1d5f0bc 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-seesInstaller.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-seesInstaller.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-sharedUser.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-sharedUser.xml
index e98a98c..07b2be6 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-sharedUser.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-sharedUser.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-targetsQ.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-targetsQ.xml
index 2810c87..60a0c2d 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-targetsQ.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-targetsQ.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing.xml
index ce56a77..b5a88a8 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage.xml
index d63d1d5..d06e632 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAction.xml
index 87f8ab7..2f1cf69 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAction.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAuthority.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAuthority.xml
index 1554de8..7fb4191 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAuthority.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAuthority.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesServiceAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesServiceAction.xml
index b451455..dab3e2e 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesServiceAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesServiceAction.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedActivityAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedActivityAction.xml
index cde61df..aabb703 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedActivityAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedActivityAction.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAction.xml
index 3ec5b39..72dfa6b 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAction.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAuthority.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAuthority.xml
index 4562040..09755f0 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAuthority.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAuthority.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedServiceAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedServiceAction.xml
index 26ef435..d1fdd13 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedServiceAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedServiceAction.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browsableActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browsableActivity.xml
index 8cf6bfe..b08cc12 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browsableActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browsableActivity.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-contactsActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-contactsActivity.xml
index a51d7f4..80138c5 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-contactsActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-contactsActivity.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-documentEditorActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-documentEditorActivity.xml
index 1bfa17e..0f7e971 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-documentEditorActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-documentEditorActivity.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-shareActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-shareActivity.xml
index 57efc78..e9a051b 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-shareActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-shareActivity.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-webActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-webActivity.xml
index 3355c35..74412cc 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-webActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-webActivity.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcardAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcardAction.xml
index ffd8848..64e3af3 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcardAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcardAction.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-contactsActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-contactsActivity.xml
index e31d018..0bff9cc 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-contactsActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-contactsActivity.xml
@@ -1,18 +1,18 @@
<?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.
+ 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"
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-documentEditorActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-documentEditorActivity.xml
index 445f90b..6795cf7 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-documentEditorActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-documentEditorActivity.xml
@@ -1,25 +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.
+ 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.appenumeration.editor.activity">
+ package="android.appenumeration.editor.activity">
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.appenumeration.EditorActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.appenumeration.EditorActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.EDIT"/>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-filters.xml b/tests/tests/appenumeration/app/target/AndroidManifest-filters.xml
index 90b7c6d..59ec446 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-filters.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-filters.xml
@@ -1,74 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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.appenumeration.filters">
+ package="android.appenumeration.filters">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.appenumeration.testapp.DummyActivity"
- android:visibleToInstantApps="true">
+ android:visibleToInstantApps="true"
+ android:exported="true">
<!-- Marked visible to instant apps to ensure this logic doesn't conflict with non
- instant filtering -->
+ instant filtering -->
<intent-filter>
- <action android:name="android.appenumeration.action.ACTIVITY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.appenumeration.action.ACTIVITY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <service android:name="android.appenumeration.testapp.DummyService">
+ <service android:name="android.appenumeration.testapp.DummyService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appenumeration.action.SERVICE" />
+ <action android:name="android.appenumeration.action.SERVICE"/>
</intent-filter>
</service>
<provider android:name="android.appenumeration.testapp.DummyProvider"
- android:authorities="android.appenumeration.testapp"
- android:exported="true">
+ android:authorities="android.appenumeration.testapp"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appenumeration.action.PROVIDER" />
+ <action android:name="android.appenumeration.action.PROVIDER"/>
</intent-filter>
</provider>
- <receiver android:name="android.appenumeration.testapp.DummyReceiver">
+ <receiver android:name="android.appenumeration.testapp.DummyReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appenumeration.action.BROADCAST" />
+ <action android:name="android.appenumeration.action.BROADCAST"/>
</intent-filter>
</receiver>
<activity android:name="android.appenumeration.testapp.DummyActivityNotExported"
- android:exported="false">
+ android:exported="false">
<intent-filter>
- <action android:name="android.appenumeration.action.ACTIVITY_UNEXPORTED" />
+ <action android:name="android.appenumeration.action.ACTIVITY_UNEXPORTED"/>
</intent-filter>
</activity>
<service android:name="android.appenumeration.testapp.DummyServiceNotExported"
- android:exported="false">
+ android:exported="false">
<intent-filter>
- <action android:name="android.appenumeration.action.SERVICE_UNEXPORTED" />
+ <action android:name="android.appenumeration.action.SERVICE_UNEXPORTED"/>
</intent-filter>
</service>
<provider android:name="android.appenumeration.testapp.DummyProviderNotExported"
- android:authorities="android.appenumeration.testapp.unexported"
- android:exported="false" >
+ android:authorities="android.appenumeration.testapp.unexported"
+ android:exported="false">
<intent-filter>
- <action android:name="android.appenumeration.action.PROVIDER_UNEXPORTED" />
+ <action android:name="android.appenumeration.action.PROVIDER_UNEXPORTED"/>
</intent-filter>
</provider>
<receiver android:name="android.appenumeration.testapp.DummyReceiverNotExported"
- android:exported="false">
+ android:exported="false">
<intent-filter>
- <action android:name="android.appenumeration.action.BROADCAST_UNEXPORTED" />
+ <action android:name="android.appenumeration.action.BROADCAST_UNEXPORTED"/>
</intent-filter>
</receiver>
</application>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable.xml b/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable.xml
index e6535b3..428cc0d 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-noapi-sharedUser.xml b/tests/tests/appenumeration/app/target/AndroidManifest-noapi-sharedUser.xml
index c3d8487..3b5be22 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-noapi-sharedUser.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-noapi-sharedUser.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-noapi.xml b/tests/tests/appenumeration/app/target/AndroidManifest-noapi.xml
index 9b25acc..fc2835e 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-noapi.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-noapi.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2019 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.
+ Copyright (C) 2019 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"
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-shareActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-shareActivity.xml
index 87f621a..148fa29 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-shareActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-shareActivity.xml
@@ -1,25 +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.
+ 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.appenumeration.share.activity">
+ package="android.appenumeration.share.activity">
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.appenumeration.ShareActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.appenumeration.ShareActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<category android:name="android.intent.category.DEFAULT"/>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-webActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-webActivity.xml
index e198ea5..31fe275 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-webActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-webActivity.xml
@@ -1,31 +1,34 @@
<?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.
+ 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.appenumeration.web.activity">
+ package="android.appenumeration.web.activity">
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name="android.appenumeration.WebActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.appenumeration.WebActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT"/>
- <data android:scheme="http" android:host="appenumeration.android"/>
- <data android:scheme="https" android:host="appenumeration.android"/>
+ <data android:scheme="http"
+ android:host="appenumeration.android"/>
+ <data android:scheme="https"
+ android:host="appenumeration.android"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/appop/TEST_MAPPING b/tests/tests/appop/TEST_MAPPING
new file mode 100644
index 0000000..42315bd
--- /dev/null
+++ b/tests/tests/appop/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAppOpsTestCases"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tests/tests/appop/appopsTestUtilLib/src/android/app/appops/cts/AppOpsUtils.kt b/tests/tests/appop/appopsTestUtilLib/src/android/app/appops/cts/AppOpsUtils.kt
index b1588d5..44e4c05 100644
--- a/tests/tests/appop/appopsTestUtilLib/src/android/app/appops/cts/AppOpsUtils.kt
+++ b/tests/tests/appop/appopsTestUtilLib/src/android/app/appops/cts/AppOpsUtils.kt
@@ -175,4 +175,16 @@
InstrumentationRegistry.getInstrumentation().targetContext
.getSystemService(AppOpsManager::class.java).getOpsForPackage(uid, packageName, op)
}[0].ops[0]
+}
+
+/**
+ * Run a block with a compat change disabled
+ */
+fun withDisabledCompatChange(changeId: Long, packageName: String, wrapped: () -> Unit) {
+ runCommand("am compat disable $changeId $packageName")
+ try {
+ wrapped()
+ } finally {
+ runCommand("am compat reset $changeId $packageName")
+ }
}
\ No newline at end of file
diff --git a/tests/tests/appop/src/android/app/appops/cts/AppOpsLoggingTest.kt b/tests/tests/appop/src/android/app/appops/cts/AppOpsLoggingTest.kt
index ea20c6d..544e399 100644
--- a/tests/tests/appop/src/android/app/appops/cts/AppOpsLoggingTest.kt
+++ b/tests/tests/appop/src/android/app/appops/cts/AppOpsLoggingTest.kt
@@ -67,6 +67,7 @@
import org.junit.Assert.fail
import org.junit.Assume.assumeTrue
import org.junit.Before
+import org.junit.Ignore
import org.junit.Test
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Executor
@@ -520,7 +521,9 @@
/**
* Realistic end-to-end test for getting called back for a proximity alert
+ * (b/150438846 - ignored this test due to flakiness)
*/
+ @Ignore
@Test
fun triggerProximityAlert() {
val PROXIMITY_ALERT_ACTION = "proxAlert"
@@ -555,7 +558,12 @@
eventually {
assertThat(asyncNoted.map { it.op }).contains(OPSTR_FINE_LOCATION)
assertThat(asyncNoted[0].attributionTag).isEqualTo(TEST_ATTRIBUTION_TAG)
- assertThat(asyncNoted[0].message).contains(PROXIMITY_ALERT_ACTION)
+
+ assertThat(asyncNoted[0].message).contains(
+ proximityAlertReceiverPendingIntent::class.java.name)
+ assertThat(asyncNoted[0].message).contains(
+ Integer.toHexString(
+ System.identityHashCode(proximityAlertReceiverPendingIntent)))
}
} finally {
locationManager.removeProximityAlert(proximityAlertReceiverPendingIntent)
diff --git a/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt b/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt
index 3b4dda1..dae5d3a 100644
--- a/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt
+++ b/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt
@@ -249,17 +249,18 @@
mAppOps.startWatchingActive(arrayOf(OPSTR_WRITE_CALENDAR), Executor { it.run() },
activeWatcher)
try {
- mAppOps.startOp(OPSTR_WRITE_CALENDAR, mMyUid, mOpPackageName, "attribution1", null)
+ mAppOps.startOp(OPSTR_WRITE_CALENDAR, mMyUid, mOpPackageName, "firstAttribution",
+ null)
assertTrue(mAppOps.isOpActive(OPSTR_WRITE_CALENDAR, mMyUid, mOpPackageName))
gotActive.get(TIMEOUT_MS, TimeUnit.MILLISECONDS)
mAppOps.startOp(OPSTR_WRITE_CALENDAR, Process.myUid(), mOpPackageName,
- "attribution2", null)
+ "secondAttribution", null)
assertTrue(mAppOps.isOpActive(OPSTR_WRITE_CALENDAR, mMyUid, mOpPackageName))
assertFalse(gotInActive.isDone)
mAppOps.finishOp(OPSTR_WRITE_CALENDAR, Process.myUid(), mOpPackageName,
- "attribution1")
+ "firstAttribution")
// Allow some time for premature "watchingActive" callbacks to arrive
Thread.sleep(500)
@@ -268,7 +269,7 @@
assertFalse(gotInActive.isDone)
mAppOps.finishOp(OPSTR_WRITE_CALENDAR, Process.myUid(), mOpPackageName,
- "attribution2")
+ "secondAttribution")
assertFalse(mAppOps.isOpActive(OPSTR_WRITE_CALENDAR, mMyUid, mOpPackageName))
gotInActive.get(TIMEOUT_MS, TimeUnit.MILLISECONDS)
} finally {
diff --git a/tests/tests/appop/src/android/app/appops/cts/AttributionTest.kt b/tests/tests/appop/src/android/app/appops/cts/AttributionTest.kt
index 0bdf312..33ccf9a 100644
--- a/tests/tests/appop/src/android/app/appops/cts/AttributionTest.kt
+++ b/tests/tests/appop/src/android/app/appops/cts/AttributionTest.kt
@@ -19,12 +19,12 @@
import android.app.AppOpsManager
import android.app.AppOpsManager.OPSTR_WIFI_SCAN
import android.app.AppOpsManager.OP_FLAGS_ALL
+import android.app.AppOpsManager.SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE
import android.platform.test.annotations.AppModeFull
import androidx.test.platform.app.InstrumentationRegistry
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Test
-import java.lang.AssertionError
import java.lang.Thread.sleep
private const val APK_PATH = "/data/local/tmp/cts/appops/"
@@ -62,7 +62,7 @@
sleep(1)
runWithShellPermissionIdentity {
- appOpsManager.noteOpNoThrow(OPSTR_WIFI_SCAN, appUid, APP_PKG, attribution, null)
+ appOpsManager.noteOp(OPSTR_WIFI_SCAN, appUid, APP_PKG, attribution, null)
}
}
@@ -106,6 +106,18 @@
}
}
+ @Test(expected = SecurityException::class)
+ fun cannotUseUndeclaredAttributionTag() {
+ noteForAttribution("invalid attribution tag")
+ }
+
+ @Test
+ fun canUseUndeclaredAttributionTagIfChangeForBlameeIsDisabled() {
+ withDisabledCompatChange(SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE, APP_PKG) {
+ noteForAttribution("invalid attribution tag")
+ }
+ }
+
@Test(expected = AssertionError::class)
fun cannotInheritFromSelf() {
installApk("AppWithAttributionInheritingFromSelf.apk")
diff --git a/tests/tests/appop2/Android.bp b/tests/tests/appop2/Android.bp
new file mode 100644
index 0000000..4b6eed8
--- /dev/null
+++ b/tests/tests/appop2/Android.bp
@@ -0,0 +1,33 @@
+// 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: "CtsAppOps2TestCases",
+
+ srcs: ["src/**/*.kt"],
+
+ static_libs: [
+ "appops-test-util-lib",
+ "androidx.test.rules",
+ "compatibility-device-util-axt",
+ "platform-test-annotations",
+ "truth-prebuilt",
+ ],
+
+ test_suites: [
+ "cts",
+ "vts10",
+ "general-tests",
+ ],
+}
diff --git a/tests/tests/appop2/AndroidManifest.xml b/tests/tests/appop2/AndroidManifest.xml
new file mode 100644
index 0000000..b1ceac6
--- /dev/null
+++ b/tests/tests/appop2/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?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.app.appops2.cts">
+ <attribution android:tag="testAttribution" android:label="@string/dummyLabel" />
+
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:functionalTest="true"
+ android:targetPackage="android.app.appops2.cts"
+ android:label="Tests for the app ops API (cannot include reset of app-op state)."/>
+
+</manifest>
diff --git a/tests/tests/appop2/AndroidTest.xml b/tests/tests/appop2/AndroidTest.xml
new file mode 100644
index 0000000..fc10a83
--- /dev/null
+++ b/tests/tests/appop2/AndroidTest.xml
@@ -0,0 +1,45 @@
+<!--
+ ~ 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.
+ -->
+<configuration description="Config for CTS app ops test cases">
+ <option name="test-suite-tag" value="cts" />
+ <option name="config-descriptor:metadata" key="component" value="framework" />
+ <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+ <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+ <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="CtsAppOps2TestCases.apk" />
+ </target_preparer>
+
+ <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+ <option name="run-command" value="appops set android.app.appops2.cts REQUEST_INSTALL_PACKAGES allow" />
+ <option name="run-command" value="mkdir -p /data/local/tmp/cts/appops2" />
+ <option name="teardown-command" value="pm uninstall android.app.appops.cts.apptoblame" />
+ <option name="teardown-command" value="rm -rf /data/local/tmp/cts" />
+ </target_preparer>
+
+ <!-- Load additional APKs onto device -->
+ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" >
+ <option name="push-file" key="CtsAppToBlame1.apk" value="/data/local/tmp/cts/appops2/CtsAppToBlame1.apk" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="hidden-api-checks" value="true" />
+ <option name="package" value="android.app.appops2.cts" />
+ <option name="runtime-hint" value="1m" />
+ </test>
+</configuration>
diff --git a/tests/tests/appop2/OWNERS b/tests/tests/appop2/OWNERS
new file mode 100644
index 0000000..3753dee
--- /dev/null
+++ b/tests/tests/appop2/OWNERS
@@ -0,0 +1,7 @@
+# Bug component: 137825
+moltmann@google.com
+zhanghai@google.com
+ntmyren@google.com
+eugenesusla@google.com
+svetoslavganov@google.com
+evanseverson@google.com
diff --git a/tests/tests/appop2/TEST_MAPPING b/tests/tests/appop2/TEST_MAPPING
new file mode 100644
index 0000000..dbf2444
--- /dev/null
+++ b/tests/tests/appop2/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAppOps2TestCases"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tests/tests/appop2/res/values/strings.xml b/tests/tests/appop2/res/values/strings.xml
new file mode 100644
index 0000000..ab27f6a
--- /dev/null
+++ b/tests/tests/appop2/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?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.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="dummyLabel">A feature</string>
+</resources>
diff --git a/tests/tests/appop2/src/android/app/appops2/cts/AppOpsLoggingTest.kt b/tests/tests/appop2/src/android/app/appops2/cts/AppOpsLoggingTest.kt
new file mode 100644
index 0000000..a2d5faa
--- /dev/null
+++ b/tests/tests/appop2/src/android/app/appops2/cts/AppOpsLoggingTest.kt
@@ -0,0 +1,140 @@
+/*
+ * 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.appops2.cts
+
+import android.app.AppOpsManager
+import android.app.AppOpsManager.OnOpNotedCallback
+import android.app.AppOpsManager.permissionToOp
+import android.app.AsyncNotedAppOp
+import android.app.PendingIntent
+import android.app.SyncNotedAppOp
+import android.app.appops.cts.eventually
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.IntentFilter
+import android.content.pm.PackageInstaller.EXTRA_STATUS
+import android.content.pm.PackageInstaller.STATUS_FAILURE_INVALID
+import android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION
+import android.content.pm.PackageInstaller.SessionParams
+import android.content.pm.PackageInstaller.SessionParams.MODE_FULL_INSTALL
+import android.platform.test.annotations.AppModeFull
+import androidx.test.platform.app.InstrumentationRegistry
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.io.File
+import java.util.concurrent.Executor
+
+private const val TEST_ATTRIBUTION_TAG = "testAttribution";
+
+@AppModeFull(reason = "Test relies on other app to connect to. Instant apps can't see other apps")
+class AppOpsLoggingTest {
+ private val context = InstrumentationRegistry.getInstrumentation().targetContext
+ private val appOpsManager = context.getSystemService(AppOpsManager::class.java)
+
+ // Collected note-op calls inside of this process
+ private val noted = mutableListOf<Pair<SyncNotedAppOp, Array<StackTraceElement>>>()
+ private val selfNoted = mutableListOf<Pair<SyncNotedAppOp, Array<StackTraceElement>>>()
+ private val asyncNoted = mutableListOf<AsyncNotedAppOp>()
+
+ @Before
+ fun setNotedAppOpsCollectorAndClearCollectedNoteOps() {
+ setNotedAppOpsCollector()
+ clearCollectedNotedOps()
+ }
+
+ private fun clearCollectedNotedOps() {
+ noted.clear()
+ selfNoted.clear()
+ asyncNoted.clear()
+ }
+
+ private fun setNotedAppOpsCollector() {
+ appOpsManager.setOnOpNotedCallback(Executor { it.run() },
+ object : OnOpNotedCallback() {
+ override fun onNoted(op: SyncNotedAppOp) {
+ noted.add(op to Throwable().stackTrace)
+ }
+
+ override fun onSelfNoted(op: SyncNotedAppOp) {
+ selfNoted.add(op to Throwable().stackTrace)
+ }
+
+ override fun onAsyncNoted(asyncOp: AsyncNotedAppOp) {
+ asyncNoted.add(asyncOp)
+ }
+ })
+ }
+
+ /**
+ * Realistic end-to-end test for requesting to install a package
+ */
+ @Test
+ fun requestInstall() {
+ val pi = context.createAttributionContext(TEST_ATTRIBUTION_TAG).packageManager
+ .packageInstaller
+ val sessionId = pi.createSession(SessionParams(MODE_FULL_INSTALL))
+
+ val session = pi.openSession(sessionId)
+ try {
+ // Write apk data to session
+ File("/data/local/tmp/cts/appops2/CtsAppToBlame1.apk")
+ .inputStream().use { fileOnDisk ->
+ session.openWrite("base.apk", 0, -1).use { sessionFile ->
+ fileOnDisk.copyTo(sessionFile)
+ }
+ }
+
+ val installAction = context.packageName + ".install_cb"
+ context.registerReceiver(object : BroadcastReceiver() {
+ override fun onReceive(ignored: Context?, intent: Intent) {
+ if (intent.getIntExtra(EXTRA_STATUS, STATUS_FAILURE_INVALID)
+ != STATUS_PENDING_USER_ACTION) {
+ return
+ }
+
+ // Start package install request UI (should trigger REQUEST_INSTALL_PACKAGES)
+ val activityIntent = intent.getParcelableExtra<Intent>(Intent.EXTRA_INTENT)
+ activityIntent!!.addFlags(
+ FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK)
+ context.startActivity(activityIntent)
+ }
+ }, IntentFilter(installAction))
+
+ // Commit session (should trigger installAction receiver)
+ session.commit(PendingIntent.getBroadcast(context, 0, Intent(installAction),
+ PendingIntent.FLAG_UPDATE_CURRENT).intentSender)
+
+ eventually {
+ assertThat(asyncNoted[0].op).isEqualTo(
+ permissionToOp(android.Manifest.permission.REQUEST_INSTALL_PACKAGES))
+ assertThat(asyncNoted[0].attributionTag).isEqualTo(TEST_ATTRIBUTION_TAG)
+ }
+ } finally {
+ session.abandon()
+ }
+ }
+
+ @After
+ fun removeNotedAppOpsCollector() {
+ appOpsManager.setOnOpNotedCallback(null, null)
+ }
+}
diff --git a/tests/tests/appwidget/AndroidManifest.xml b/tests/tests/appwidget/AndroidManifest.xml
index 4c23851..645bdc5 100644
--- a/tests/tests/appwidget/AndroidManifest.xml
+++ b/tests/tests/appwidget/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
* Copyright (C) 2014 The Android Open Source Project
*
@@ -17,81 +16,88 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.appwidget.cts"
- android:targetSandboxVersion="2">
+ package="android.appwidget.cts"
+ android:targetSandboxVersion="2">
<application>
<uses-library android:name="android.test.runner"/>
- <receiver android:name="android.appwidget.cts.provider.FirstAppWidgetProvider" >
+ <receiver android:name="android.appwidget.cts.provider.FirstAppWidgetProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/first_appwidget_info" />
+ android:resource="@xml/first_appwidget_info"/>
</receiver>
- <receiver android:name="android.appwidget.cts.provider.SecondAppWidgetProvider" >
+ <receiver android:name="android.appwidget.cts.provider.SecondAppWidgetProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/second_appwidget_info" />
+ android:resource="@xml/second_appwidget_info"/>
</receiver>
- <receiver android:name="android.appwidget.cts.provider.AppWidgetProviderWithFeatures$Provider1" >
+ <receiver android:name="android.appwidget.cts.provider.AppWidgetProviderWithFeatures$Provider1"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/appwidget_info_with_feature1" />
+ android:resource="@xml/appwidget_info_with_feature1"/>
</receiver>
- <receiver android:name="android.appwidget.cts.provider.AppWidgetProviderWithFeatures$Provider2" >
+ <receiver android:name="android.appwidget.cts.provider.AppWidgetProviderWithFeatures$Provider2"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/appwidget_info_with_feature2" />
+ android:resource="@xml/appwidget_info_with_feature2"/>
</receiver>
- <receiver android:name="android.appwidget.cts.provider.AppWidgetProviderWithFeatures$Provider3" >
+ <receiver android:name="android.appwidget.cts.provider.AppWidgetProviderWithFeatures$Provider3"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/appwidget_info_with_feature3" />
+ android:resource="@xml/appwidget_info_with_feature3"/>
</receiver>
- <receiver android:name="android.appwidget.cts.provider.CollectionAppWidgetProvider" >
+ <receiver android:name="android.appwidget.cts.provider.CollectionAppWidgetProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/collection_appwidget_info" />
+ android:resource="@xml/collection_appwidget_info"/>
</receiver>
<service android:name="android.appwidget.cts.service.MyAppWidgetService"
- android:permission="android.permission.BIND_REMOTEVIEWS">
+ android:permission="android.permission.BIND_REMOTEVIEWS">
</service>
<activity android:name="android.appwidget.cts.activity.EmptyActivity"
- android:label="EmptyActivity">
+ android:label="EmptyActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.appwidget.cts.activity.TransitionActivity"
- android:label="TransitionActivity" />
+ android:label="TransitionActivity"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.appwidget.cts"
- android:label="Tests for the app widget APIs.">
+ android:targetPackage="android.appwidget.cts"
+ android:label="Tests for the app widget APIs.">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml
index 47d1e05..1decc84 100644
--- a/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml
+++ b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml
@@ -16,12 +16,13 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.appwidget.cts.packages">
+ package="android.appwidget.cts.packages">
<application>
- <activity android:name="AppWidgetConfirmPin">
+ <activity android:name="AppWidgetConfirmPin"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET" />
+ <action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/appwidget/packages/launchermanifest/AndroidManifest.xml b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest.xml
index 57c4e4d..0c6707f 100644
--- a/tests/tests/appwidget/packages/launchermanifest/AndroidManifest.xml
+++ b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest.xml
@@ -16,15 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.appwidget.cts.packages"
- android:targetSandboxVersion="2">
+ package="android.appwidget.cts.packages"
+ android:targetSandboxVersion="2">
<application>
- <activity android:name="Launcher">
+ <activity android:name="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.HOME"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV1.xml b/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV1.xml
index 2c1db2f..1d4e17f 100644
--- a/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV1.xml
+++ b/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV1.xml
@@ -16,18 +16,19 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.appwidget.cts.widgetprovider">
+ package="android.appwidget.cts.widgetprovider">
<application>
- <receiver android:name="android.appwidget.cts.packages.SimpleProvider">
+ <receiver android:name="android.appwidget.cts.packages.SimpleProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
- <action android:name="android.appwidget.cts.widgetprovider.APPLY_OVERRIDE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+ <action android:name="android.appwidget.cts.widgetprovider.APPLY_OVERRIDE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/widget_no_config" />
+ android:resource="@xml/widget_no_config"/>
<meta-data android:name="my_custom_info"
- android:resource="@xml/widget_config" />
+ android:resource="@xml/widget_config"/>
</receiver>
</application>
</manifest>
diff --git a/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV2.xml b/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV2.xml
index 8a070b4..6674f54 100644
--- a/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV2.xml
+++ b/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV2.xml
@@ -16,18 +16,19 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.appwidget.cts.widgetprovider">
+ package="android.appwidget.cts.widgetprovider">
<application>
- <receiver android:name="android.appwidget.cts.packages.SimpleProvider">
+ <receiver android:name="android.appwidget.cts.packages.SimpleProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
- <action android:name="android.appwidget.cts.widgetprovider.APPLY_OVERRIDE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+ <action android:name="android.appwidget.cts.widgetprovider.APPLY_OVERRIDE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/widget_no_config" />
+ android:resource="@xml/widget_no_config"/>
<meta-data android:name="my_custom_info"
- android:resource="@xml/widget_config_no_resize" />
+ android:resource="@xml/widget_config_no_resize"/>
</receiver>
</application>
</manifest>
diff --git a/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV3.xml b/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV3.xml
index f6f012e..ac77f90 100644
--- a/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV3.xml
+++ b/tests/tests/appwidget/packages/widgetprovider/AndroidManifestV3.xml
@@ -16,16 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.appwidget.cts.widgetprovider">
+ package="android.appwidget.cts.widgetprovider">
<application>
- <receiver android:name="android.appwidget.cts.packages.SimpleProvider">
+ <receiver android:name="android.appwidget.cts.packages.SimpleProvider"
+ android:exported="true">
<intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
- <action android:name="android.appwidget.cts.widgetprovider.APPLY_OVERRIDE" />
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+ <action android:name="android.appwidget.cts.widgetprovider.APPLY_OVERRIDE"/>
</intent-filter>
<meta-data android:name="android.appwidget.provider"
- android:resource="@xml/widget_no_config" />
+ android:resource="@xml/widget_no_config"/>
</receiver>
</application>
</manifest>
diff --git a/tests/tests/assist/AndroidManifest.xml b/tests/tests/assist/AndroidManifest.xml
index feff7c4..2d68e1a 100644
--- a/tests/tests/assist/AndroidManifest.xml
+++ b/tests/tests/assist/AndroidManifest.xml
@@ -16,40 +16,40 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.assist.cts">
+ package="android.assist.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION" />
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- resizeableActivity makes the TestStartActivity run on Primary display to accommodate
- stack behavior assumptions in this test. See b/70032125 -->
+ stack behavior assumptions in this test. See b/70032125 -->
<activity android:name="android.assist.cts.TestStartActivity"
- android:label="Assist Test Start Activity"
- android:resizeableActivity="false">
+ android:label="Assist Test Start Activity"
+ android:resizeableActivity="false"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_START_ACTIVITY_ASSIST_STRUCTURE" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_DISABLE_CONTEXT" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_FLAG_SECURE" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_LIFECYCLE" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_SCREENSHOT" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_EXTRA_ASSIST" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_TEXTVIEW" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_LARGE_VIEW_HIERARCHY" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_WEBVIEW" />
- <category android:name="android.intent.category.LAUNCHER" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_ASSIST_STRUCTURE"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_DISABLE_CONTEXT"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_FLAG_SECURE"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_LIFECYCLE"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_SCREENSHOT"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_EXTRA_ASSIST"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_TEXTVIEW"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_LARGE_VIEW_HIERARCHY"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_WEBVIEW"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.assist.cts"
- android:label="CTS tests of android.assist">
+ android:targetPackage="android.assist.cts"
+ android:label="CTS tests of android.assist">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/assist/service/AndroidManifest.xml b/tests/tests/assist/service/AndroidManifest.xml
index 05da5fd..e116a1c 100644
--- a/tests/tests/assist/service/AndroidManifest.xml
+++ b/tests/tests/assist/service/AndroidManifest.xml
@@ -16,62 +16,64 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.assist.service">
+ package="android.assist.service">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name=".MainInteractionService"
- android:label="CTS test voice interaction service"
- android:permission="android.permission.BIND_VOICE_INTERACTION"
- android:process=":interactor"
- android:exported="true"
- android:visibleToInstantApps="true">
+ android:label="CTS test voice interaction service"
+ android:permission="android.permission.BIND_VOICE_INTERACTION"
+ android:process=":interactor"
+ android:exported="true"
+ android:visibleToInstantApps="true">
<meta-data android:name="android.voice_interaction"
- android:resource="@xml/interaction_service" />
+ android:resource="@xml/interaction_service"/>
<intent-filter>
- <action android:name="android.service.voice.VoiceInteractionService" />
+ <action android:name="android.service.voice.VoiceInteractionService"/>
</intent-filter>
</service>
<activity android:name=".DisableContextActivity"
- android:visibleToInstantApps="true">
+ android:visibleToInstantApps="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.START_TEST_DISABLE_CONTEXT" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.START_TEST_DISABLE_CONTEXT"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name=".DelayedAssistantActivity"
- android:label="Delay Assistant Start Activity"
- android:exported="true"
- android:visibleToInstantApps="true">
+ android:label="Delay Assistant Start Activity"
+ android:exported="true"
+ android:visibleToInstantApps="true">
<intent-filter>
- <action android:name="android.intent.action.START_TEST_ASSIST_STRUCTURE" />
- <action android:name="android.intent.action.START_TEST_LIFECYCLE" />
- <action android:name="android.intent.action.START_TEST_LIFECYCLE_NOUI" />
- <action android:name="android.intent.action.START_TEST_FLAG_SECURE" />
- <action android:name="android.intent.action.START_TEST_SCREENSHOT" />
- <action android:name="android.intent.action.START_TEST_EXTRA_ASSIST" />
- <action android:name="android.intent.action.START_TEST_TEXTVIEW" />
- <action android:name="android.intent.action.START_TEST_LARGE_VIEW_HIERARCHY" />
- <action android:name="android.intent.action.START_TEST_VERIFY_CONTENT_VIEW" />
- <action android:name="android.intent.action.START_TEST_FOCUS_CHANGE" />
- <action android:name="android.intent.action.START_TEST_WEBVIEW" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.START_TEST_ASSIST_STRUCTURE"/>
+ <action android:name="android.intent.action.START_TEST_LIFECYCLE"/>
+ <action android:name="android.intent.action.START_TEST_LIFECYCLE_NOUI"/>
+ <action android:name="android.intent.action.START_TEST_FLAG_SECURE"/>
+ <action android:name="android.intent.action.START_TEST_SCREENSHOT"/>
+ <action android:name="android.intent.action.START_TEST_EXTRA_ASSIST"/>
+ <action android:name="android.intent.action.START_TEST_TEXTVIEW"/>
+ <action android:name="android.intent.action.START_TEST_LARGE_VIEW_HIERARCHY"/>
+ <action android:name="android.intent.action.START_TEST_VERIFY_CONTENT_VIEW"/>
+ <action android:name="android.intent.action.START_TEST_FOCUS_CHANGE"/>
+ <action android:name="android.intent.action.START_TEST_WEBVIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<service android:name=".MainInteractionSessionService"
- android:permission="android.permission.BIND_VOICE_INTERACTION"
- android:process=":session">
+ android:permission="android.permission.BIND_VOICE_INTERACTION"
+ android:process=":session">
</service>
<service android:name=".MainRecognitionService"
- android:label="CTS Voice Recognition Service">
+ android:label="CTS Voice Recognition Service"
+ android:exported="true">
<intent-filter>
- <action android:name="android.speech.RecognitionService" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.speech.RecognitionService"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
- <meta-data android:name="android.speech" android:resource="@xml/recognition_service" />
+ <meta-data android:name="android.speech"
+ android:resource="@xml/recognition_service"/>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/assist/testapp/AndroidManifest.xml b/tests/tests/assist/testapp/AndroidManifest.xml
index 513d27a..a2dcd7a 100644
--- a/tests/tests/assist/testapp/AndroidManifest.xml
+++ b/tests/tests/assist/testapp/AndroidManifest.xml
@@ -16,79 +16,87 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.assist.testapp">
+ package="android.assist.testapp">
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.INTERNET"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name=".TestApp"
- android:label="Assist Structure Test Activity">
+ android:label="Assist Structure Test Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_APP_ASSIST_STRUCTURE" />
- <action android:name="android.intent.action.TEST_APP_LARGE_VIEW_HIERARCHY" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
+ <action android:name="android.intent.action.TEST_APP_ASSIST_STRUCTURE"/>
+ <action android:name="android.intent.action.TEST_APP_LARGE_VIEW_HIERARCHY"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.VOICE"/>
</intent-filter>
</activity>
<activity android:name=".SecureActivity"
- android:label="Secure Test Activity">
+ android:label="Secure Test Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_APP_FLAG_SECURE" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
+ <action android:name="android.intent.action.TEST_APP_FLAG_SECURE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.VOICE"/>
</intent-filter>
</activity>
<activity android:name=".LifecycleActivity"
- android:label="Life Cycle Check Activity">
+ android:label="Life Cycle Check Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_APP_LIFECYCLE" />
- <action android:name="android.intent.action.TEST_APP_LIFECYCLE_NOUI" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
+ <action android:name="android.intent.action.TEST_APP_LIFECYCLE"/>
+ <action android:name="android.intent.action.TEST_APP_LIFECYCLE_NOUI"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.VOICE"/>
</intent-filter>
</activity>
<!-- resizeableActivity makes the ScreenshotActivity run on Primary display to accommodate
- assumptions about screenshot display vs TestStartActivity display in this test.
- See b/70032125 -->
+ assumptions about screenshot display vs TestStartActivity display in this test.
+ See b/70032125 -->
<activity android:name=".ScreenshotActivity"
- android:label="Screenshot Test Activity"
- android:resizeableActivity="false">
+ android:label="Screenshot Test Activity"
+ android:resizeableActivity="false"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_APP_SCREENSHOT" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
+ <action android:name="android.intent.action.TEST_APP_SCREENSHOT"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.VOICE"/>
</intent-filter>
</activity>
<activity android:name=".ExtraAssistDataActivity"
- android:label="Extra Assist Test Activity">
+ android:label="Extra Assist Test Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_APP_EXTRA_ASSIST" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
+ <action android:name="android.intent.action.TEST_APP_EXTRA_ASSIST"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.VOICE"/>
</intent-filter>
</activity>
<activity android:name=".TextViewActivity"
- android:label="TextView Test Activity">
+ android:label="TextView Test Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_APP_TEXTVIEW" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.TEST_APP_TEXTVIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name=".WebViewActivity"
- android:label="WebView Test Activity">
+ android:label="WebView Test Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_APP_WEBVIEW" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.TEST_APP_WEBVIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name=".FocusChangeActivity"
- android:label="Focus Change Test Activity">
+ android:label="Focus Change Test Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_APP_FOCUS_CHANGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE" />
+ <action android:name="android.intent.action.TEST_APP_FOCUS_CHANGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.VOICE"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/batterysaving/Android.bp b/tests/tests/batterysaving/Android.bp
index f00ab52..f5402cd 100644
--- a/tests/tests/batterysaving/Android.bp
+++ b/tests/tests/batterysaving/Android.bp
@@ -35,6 +35,7 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
sdk_version: "test_current",
}
diff --git a/tests/tests/batterysaving/AndroidTest.xml b/tests/tests/batterysaving/AndroidTest.xml
index 5f32612..ad98752 100644
--- a/tests/tests/batterysaving/AndroidTest.xml
+++ b/tests/tests/batterysaving/AndroidTest.xml
@@ -47,4 +47,9 @@
<option name="package" value="android.os.cts.batterysaving" />
<option name="runtime-hint" value="10m00s" />
</test>
+
+ <object type="module_controller"
+ class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+ <option name="mainline-module-package-name" value="android.scheduling"/>
+ </object>
</configuration>
diff --git a/tests/tests/batterysaving/apps/app_target_api_25/Android.bp b/tests/tests/batterysaving/apps/app_target_api_25/Android.bp
index bf00faf..a41f00f 100644
--- a/tests/tests/batterysaving/apps/app_target_api_25/Android.bp
+++ b/tests/tests/batterysaving/apps/app_target_api_25/Android.bp
@@ -23,5 +23,6 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
}
diff --git a/tests/tests/batterysaving/apps/app_target_api_current/Android.bp b/tests/tests/batterysaving/apps/app_target_api_current/Android.bp
index fa42b00..89c1540 100644
--- a/tests/tests/batterysaving/apps/app_target_api_current/Android.bp
+++ b/tests/tests/batterysaving/apps/app_target_api_current/Android.bp
@@ -22,6 +22,7 @@
"cts",
"vts10",
"general-tests",
+ "mts",
],
}
diff --git a/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverLocationTest.java b/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverLocationTest.java
index e7a3272..9b06545 100644
--- a/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverLocationTest.java
+++ b/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverLocationTest.java
@@ -76,6 +76,9 @@
private static final String TEST_PROVIDER_NAME = "test_provider";
+ private static final String READ_DEVICE_CONFIG_PERMISSION =
+ "android.permission.READ_DEVICE_CONFIG";
+
@Rule
public final RequiredFeatureRule mRequireLocationRule =
new RequiredFeatureRule(PackageManager.FEATURE_LOCATION);
@@ -134,9 +137,19 @@
"");
}
+ private List<LocationRequest> getTestProviderCurrentRequests(String provider) {
+ getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+ READ_DEVICE_CONFIG_PERMISSION);
+ try {
+ return mLocationManager.getTestProviderCurrentRequests(provider);
+ } finally {
+ getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+ }
+ }
+
private boolean areOnlyIgnoreSettingsRequestsSentToProvider() {
List<LocationRequest> requests =
- mLocationManager.getTestProviderCurrentRequests(TEST_PROVIDER_NAME);
+ getTestProviderCurrentRequests(TEST_PROVIDER_NAME);
for (LocationRequest request : requests) {
if (!request.isLocationSettingsIgnored()) {
return false;
@@ -274,7 +287,7 @@
mLocationManager.requestLocationUpdates(
ignoreSettingsLocationRequest, new TestLocationListener(), Looper.getMainLooper());
assertTrue("Not enough requests sent to provider",
- mLocationManager.getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 2);
+ getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 2);
assertFalse("Normal priority requests not sent to provider",
areOnlyIgnoreSettingsRequestsSentToProvider());
@@ -310,21 +323,21 @@
waitUntil("Normal location request still sent to provider",
this::areOnlyIgnoreSettingsRequestsSentToProvider);
assertTrue("Not enough requests sent to provider",
- mLocationManager.getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 1);
+ getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 1);
// On again.
turnOnScreen(true);
waitUntil("Normal location request not sent to provider",
() -> !areOnlyIgnoreSettingsRequestsSentToProvider());
assertTrue("Not enough requests sent to provider",
- mLocationManager.getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 2);
+ getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 2);
// Off again.
turnOnScreen(false);
waitUntil("Normal location request still sent to provider",
this::areOnlyIgnoreSettingsRequestsSentToProvider);
assertTrue("Not enough requests sent to provider",
- mLocationManager.getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 1);
+ getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 1);
// Disable battery saver and make sure the kill switch is off.
@@ -332,6 +345,7 @@
waitUntil("Normal location request not sent to provider",
() -> !areOnlyIgnoreSettingsRequestsSentToProvider());
assertTrue("Not enough requests sent to provider",
- mLocationManager.getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 2);
+ getTestProviderCurrentRequests(TEST_PROVIDER_NAME).size() >= 2);
}
}
+
diff --git a/tests/tests/bluetooth/TEST_MAPPING b/tests/tests/bluetooth/TEST_MAPPING
new file mode 100644
index 0000000..f349b92
--- /dev/null
+++ b/tests/tests/bluetooth/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsBluetoothTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/calendarcommon/TEST_MAPPING b/tests/tests/calendarcommon/TEST_MAPPING
new file mode 100644
index 0000000..0d71e66
--- /dev/null
+++ b/tests/tests/calendarcommon/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsCalendarcommon2TestCases"
+ }
+ ]
+}
diff --git a/tests/tests/calendarprovider/TEST_MAPPING b/tests/tests/calendarprovider/TEST_MAPPING
new file mode 100644
index 0000000..94417b5
--- /dev/null
+++ b/tests/tests/calendarprovider/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsCalendarProviderTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/car/src/android/car/cts/CarAppFocusManagerTest.java b/tests/tests/car/src/android/car/cts/CarAppFocusManagerTest.java
index 9383460..7405566 100644
--- a/tests/tests/car/src/android/car/cts/CarAppFocusManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarAppFocusManagerTest.java
@@ -116,8 +116,8 @@
@Test
public void testRegisterUnregister() throws Exception {
- FocusChangedListerner listener = new FocusChangedListerner();
- FocusChangedListerner listener2 = new FocusChangedListerner();
+ FocusChangedListener listener = new FocusChangedListener();
+ FocusChangedListener listener2 = new FocusChangedListener();
mManager.addFocusListener(listener, 1);
mManager.addFocusListener(listener2, 1);
mManager.removeFocusListener(listener);
@@ -137,8 +137,8 @@
final int[] emptyFocus = new int[0];
Assert.assertArrayEquals(emptyFocus, mManager.getActiveAppTypes());
- FocusChangedListerner change = new FocusChangedListerner();
- FocusChangedListerner change2 = new FocusChangedListerner();
+ FocusChangedListener change = new FocusChangedListener();
+ FocusChangedListener change2 = new FocusChangedListener();
FocusOwnershipCallback owner = new FocusOwnershipCallback();
FocusOwnershipCallback owner2 = new FocusOwnershipCallback();
mManager.addFocusListener(change, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
@@ -250,8 +250,8 @@
Assert.assertArrayEquals(new int[0], mManager.getActiveAppTypes());
- FocusChangedListerner listener = new FocusChangedListerner();
- FocusChangedListerner listener2 = new FocusChangedListerner();
+ FocusChangedListener listener = new FocusChangedListener();
+ FocusChangedListener listener2 = new FocusChangedListener();
FocusOwnershipCallback owner = new FocusOwnershipCallback();
mManager.addFocusListener(listener, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
manager2.addFocusListener(listener2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
@@ -277,8 +277,8 @@
@Test
public void testMultipleChangeListenersPerManager() throws Exception {
- FocusChangedListerner listener = new FocusChangedListerner();
- FocusChangedListerner listener2 = new FocusChangedListerner();
+ FocusChangedListener listener = new FocusChangedListener();
+ FocusChangedListener listener2 = new FocusChangedListener();
FocusOwnershipCallback owner = new FocusOwnershipCallback();
mManager.addFocusListener(listener, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
mManager.addFocusListener(listener2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
@@ -295,14 +295,14 @@
listener.reset();
listener2.reset();
- mManager.abandonAppFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+ mManager.abandonAppFocus(owner);
assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, false));
assertTrue(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, false));
}
- private class FocusChangedListerner implements CarAppFocusManager.OnAppFocusChangedListener {
+ private class FocusChangedListener implements CarAppFocusManager.OnAppFocusChangedListener {
private int mLastChangeAppType;
private boolean mLastChangeAppActive;
private final Semaphore mChangeWait = new Semaphore(0);
diff --git a/tests/tests/car/src/android/car/cts/CarBluetoothTest.java b/tests/tests/car/src/android/car/cts/CarBluetoothTest.java
index aee85da..8b2dd93 100644
--- a/tests/tests/car/src/android/car/cts/CarBluetoothTest.java
+++ b/tests/tests/car/src/android/car/cts/CarBluetoothTest.java
@@ -49,10 +49,9 @@
/**
* Contains the tests to prove compliance with android automotive specific bluetooth requirements.
*/
-// TODO(b/146663105): Fix hidden API
-//@SmallTest
-//@RequiresDevice
-//@RunWith(AndroidJUnit4.class)
+@SmallTest
+@RequiresDevice
+@RunWith(AndroidJUnit4.class)
public class CarBluetoothTest {
@ClassRule
public static final RequiredFeatureRule sRequiredFeatureRule = new RequiredFeatureRule(
@@ -165,20 +164,19 @@
mConnected = false;
}
}
-// TODO(b/146663105): Fix hidden API
-/*
+
// Automotive required profiles and meta data. Profile defaults to 'not connected' and name
// is used in debug and error messages
private static SparseArray<ProfileInfo> sRequiredBluetoothProfiles = new SparseArray();
static {
- sRequiredBluetoothProfiles.put(BluetoothProfile.A2DP_SINK,
- new ProfileInfo("A2DP Sink")); // 11
- sRequiredBluetoothProfiles.put(BluetoothProfile.AVRCP_CONTROLLER,
- new ProfileInfo("AVRCP Controller")); // 12
- sRequiredBluetoothProfiles.put(BluetoothProfile.HEADSET_CLIENT,
- new ProfileInfo("HSP Client")); // 16
- sRequiredBluetoothProfiles.put(BluetoothProfile.PBAP_CLIENT,
- new ProfileInfo("PBAP Client")); // 17
+ sRequiredBluetoothProfiles.put(11,
+ new ProfileInfo("A2DP Sink")); // BluetoothProfile.A2DP_SINK
+ sRequiredBluetoothProfiles.put(12,
+ new ProfileInfo("AVRCP Controller")); // BluetoothProfile.AVRCP_CONTROLLER
+ sRequiredBluetoothProfiles.put(16,
+ new ProfileInfo("HSP Client")); // BluetoothProfile.HEADSET_CLIENT
+ sRequiredBluetoothProfiles.put(17,
+ new ProfileInfo("PBAP Client")); // BluetoothProfile.PBAP_CLIENT
}
private static final int MAX_PROFILES_SUPPORTED = sRequiredBluetoothProfiles.size();
@@ -363,5 +361,4 @@
waitForProfileConnections();
checkProfileConnections();
}
-*/
}
diff --git a/tests/tests/classloaderfactory/test-memcl/TEST_MAPPING b/tests/tests/classloaderfactory/test-memcl/TEST_MAPPING
new file mode 100644
index 0000000..1e7fc8c
--- /dev/null
+++ b/tests/tests/classloaderfactory/test-memcl/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsClassLoaderFactoryInMemoryDexClassLoaderTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/classloaderfactory/test-pathcl/TEST_MAPPING b/tests/tests/classloaderfactory/test-pathcl/TEST_MAPPING
new file mode 100644
index 0000000..0f4b263
--- /dev/null
+++ b/tests/tests/classloaderfactory/test-pathcl/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsClassLoaderFactoryPathClassLoaderTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/contactsprovider/src/android/provider/cts/contacts/CallLogProviderTest.java b/tests/tests/contactsprovider/src/android/provider/cts/contacts/CallLogProviderTest.java
new file mode 100644
index 0000000..8f55aa0
--- /dev/null
+++ b/tests/tests/contactsprovider/src/android/provider/cts/contacts/CallLogProviderTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.provider.CallLog;
+import android.provider.CallLog.Calls;
+import android.test.InstrumentationTestCase;
+
+public class CallLogProviderTest extends InstrumentationTestCase {
+ private ContentResolver mContentResolver;
+ private ContentProviderClient mProvider;
+
+ private static final String TEST_NUMBER = "5551234";
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
+ mProvider = mContentResolver.acquireContentProviderClient(CallLog.AUTHORITY);
+ }
+
+ public void testNoSubqueries() throws Exception {
+ // Add a single call just to make sure the call log has something inside
+ ContentValues values = new ContentValues();
+ values.put(CallLog.Calls.NUMBER, TEST_NUMBER);
+ values.put(CallLog.Calls.TYPE, Calls.OUTGOING_TYPE);
+ values.put(CallLog.Calls.DATE, Long.valueOf(0 /*start time*/));
+ values.put(CallLog.Calls.DURATION, Long.valueOf(5 /*call duration*/));
+
+ mContentResolver.insert(CallLog.Calls.CONTENT_URI, values);
+
+ // Attempt to do a query that contains a subquery -- this should fail since this test does
+ // not have READ_VOICEMAIL.
+ try {
+ Cursor c = mProvider.query(Calls.CONTENT_URI, null, CallLog.Calls.NUMBER + " = ?",
+ new String[]{TEST_NUMBER},
+ "date DESC LIMIT (SELECT count(*) + 1 FROM calls WHERE type = 4");
+ assertEquals(0, c.getCount());
+ } catch (IllegalArgumentException e) {
+ // expected/tolerated
+ }
+ }
+}
diff --git a/tests/tests/content/AndroidManifest.xml b/tests/tests/content/AndroidManifest.xml
index 45b6795..f132ac0 100644
--- a/tests/tests/content/AndroidManifest.xml
+++ b/tests/tests/content/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
* Copyright (C) 2007 The Android Open Source Project
*
@@ -15,353 +16,371 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.content.cts">
+ package="android.content.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<!-- content sync tests -->
- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
- <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
- <uses-permission android:name="android.permission.USE_CREDENTIALS" />
- <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
- <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
- <uses-permission android:name="android.permission.READ_SYNC_STATS" />
- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
- <uses-permission android:name="android.permission.SET_WALLPAPER" />
- <uses-permission android:name="android.permission.BROADCAST_STICKY" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.content.cts.permission.TEST_GRANTED" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+ <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+ <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
+ <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+ <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.content.cts.permission.TEST_GRANTED"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<!-- Used for ContextTest#testCreatePackageContextAsUser -->
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
<!-- Used for PackageManager test, don't delete this INTERNET permission -->
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.INTERNET"/>
<!-- Used for PackageManager test, don't delete this permission-tree -->
<permission-tree android:name="android.content.cts.permission.TEST_DYNAMIC"
- android:label="Test Tree"/>
+ android:label="Test Tree"/>
<!-- Used for PackageManager test, don't delete this permission-group -->
<permission-group android:name="android.permission-group.COST_MONEY"
- android:label="@string/permlab_costMoney"
- android:description="@string/permdesc_costMoney"/>
+ android:label="@string/permlab_costMoney"
+ android:description="@string/permdesc_costMoney"/>
<permission android:name="android.content.cts.CALL_ABROAD_PERMISSION"
- android:label="@string/permlab_callAbroad"
- android:description="@string/permdesc_callAbroad"
- android:protectionLevel="normal"
- android:permissionGroup="android.permission-group.COST_MONEY" />
+ android:label="@string/permlab_callAbroad"
+ android:description="@string/permdesc_callAbroad"
+ android:protectionLevel="normal"
+ android:permissionGroup="android.permission-group.COST_MONEY"/>
<permission android:name="android.content.cts.REQUIRED_FEATURE_DEFINED"
- android:protectionLevel="normal" />
+ android:protectionLevel="normal"/>
<permission android:name="android.content.cts.REQUIRED_FEATURE_UNDEFINED"
- android:protectionLevel="normal" />
+ android:protectionLevel="normal"/>
<permission android:name="android.content.cts.REQUIRED_NOT_FEATURE_DEFINED"
- android:protectionLevel="normal" />
+ android:protectionLevel="normal"/>
<permission android:name="android.content.cts.REQUIRED_NOT_FEATURE_UNDEFINED"
- android:protectionLevel="normal" />
+ android:protectionLevel="normal"/>
<permission android:name="android.content.cts.REQUIRED_MULTI_DENY"
- android:protectionLevel="normal" />
+ android:protectionLevel="normal"/>
<permission android:name="android.content.cts.REQUIRED_MULTI_GRANT"
- android:protectionLevel="normal" />
+ android:protectionLevel="normal"/>
<uses-permission android:name="android.content.cts.REQUIRED_FEATURE_DEFINED"
- android:requiredFeature="android.software.cts" />
+ android:requiredFeature="android.software.cts"/>
<uses-permission android:name="android.content.cts.REQUIRED_FEATURE_UNDEFINED"
- android:requiredFeature="android.software.cts.undefined" />
+ android:requiredFeature="android.software.cts.undefined"/>
<uses-permission android:name="android.content.cts.REQUIRED_NOT_FEATURE_DEFINED"
- android:requiredNotFeature="android.software.cts" />
+ android:requiredNotFeature="android.software.cts"/>
<uses-permission android:name="android.content.cts.REQUIRED_NOT_FEATURE_UNDEFINED"
- android:requiredNotFeature="android.software.cts.undefined" />
+ android:requiredNotFeature="android.software.cts.undefined"/>
<uses-permission android:name="android.content.cts.REQUIRED_MULTI_DENY"
- android:requiredFeature="android.software.cts.undefined"
- android:requiredNotFeature="android.software.cts" />
+ android:requiredFeature="android.software.cts.undefined"
+ android:requiredNotFeature="android.software.cts"/>
<uses-permission android:name="android.content.cts.REQUIRED_MULTI_DENY"
- android:requiredFeature="android.software.cts"
- android:requiredNotFeature="android.software.cts" />
+ android:requiredFeature="android.software.cts"
+ android:requiredNotFeature="android.software.cts"/>
<uses-permission android:name="android.content.cts.REQUIRED_MULTI_DENY"
- android:requiredFeature="android.software.cts.undefined"
- android:requiredNotFeature="android.software.cts.undefined" />
+ android:requiredFeature="android.software.cts.undefined"
+ android:requiredNotFeature="android.software.cts.undefined"/>
<uses-permission android:name="android.content.cts.REQUIRED_MULTI_GRANT"
- android:requiredFeature="android.software.cts"
- android:requiredNotFeature="android.software.cts.undefined" />
+ android:requiredFeature="android.software.cts"
+ android:requiredNotFeature="android.software.cts.undefined"/>
<permission android:name="android.content.cts.SIGNATURE_PERMISSION"
- android:protectionLevel="signature" />
+ android:protectionLevel="signature"/>
- <uses-permission android:name="android.content.cts.SIGNATURE_PERMISSION" />
+ <uses-permission android:name="android.content.cts.SIGNATURE_PERMISSION"/>
<!-- Used for PackageManager test, don't delete! -->
<uses-configuration/>
- <uses-feature android:name="android.hardware.camera" />
- <uses-feature android:glEsVersion="0x00020000" />
+ <uses-feature android:name="android.hardware.camera"/>
+ <uses-feature android:glEsVersion="0x00020000"/>
<feature-group/>
<feature-group>
- <uses-feature android:glEsVersion="0x00030000" />
- <uses-feature android:name="android.hardware.location" />
+ <uses-feature android:glEsVersion="0x00030000"/>
+ <uses-feature android:name="android.hardware.location"/>
</feature-group>
<feature-group>
- <uses-feature android:glEsVersion="0x00010001" />
- <uses-feature android:name="android.hardware.camera" />
+ <uses-feature android:glEsVersion="0x00010001"/>
+ <uses-feature android:name="android.hardware.camera"/>
</feature-group>
<application android:label="Android TestCase"
- android:icon="@drawable/size_48x48"
- android:maxRecents="1"
- android:multiArch="true"
- android:name="android.content.cts.MockApplication"
- android:supportsRtl="true"
- android:appCategory="productivity">
- <activity android:name="android.content.cts.MockActivity">
+ android:icon="@drawable/size_48x48"
+ android:maxRecents="1"
+ android:multiArch="true"
+ android:name="android.content.cts.MockApplication"
+ android:supportsRtl="true"
+ android:appCategory="productivity">
+ <activity android:name="android.content.cts.MockActivity"
+ android:exported="true">
<meta-data android:name="android.app.alias"
- android:resource="@xml/alias" />
+ android:resource="@xml/alias"/>
<meta-data android:name="android.app.intent.filter"
- android:resource="@xml/intentfilter" />
+ android:resource="@xml/intentfilter"/>
<meta-data android:name="android.app.intent"
- android:resource="@xml/intent" />
+ android:resource="@xml/intent"/>
<intent-filter>
- <action android:name="android.content.cts.action.TEST_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.content.cts.category.TEST_CATEGORY" />
+ <action android:name="android.content.cts.action.TEST_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.content.cts.category.TEST_CATEGORY"/>
</intent-filter>
</activity>
<activity-alias android:name="android.content.cts.MockActivity2"
- android:targetActivity="android.content.cts.MockActivity">
+ android:targetActivity="android.content.cts.MockActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.cts.action.TEST_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.content.cts.action.TEST_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity-alias>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <service android:name="android.content.cts.MockContextService" />
+ <service android:name="android.content.cts.MockContextService"/>
<activity android:name=".content.ContextCtsActivity"
- android:label="ContextCtsActivity">
+ android:label="ContextCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <receiver android:name="android.content.cts.MockReceiverFirst">
+ <receiver android:name="android.content.cts.MockReceiverFirst"
+ android:exported="true">
<intent-filter android:priority="3">
- <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT" />
+ <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT"/>
</intent-filter>
</receiver>
- <receiver android:name="android.content.cts.MockReceiverAbort">
+ <receiver android:name="android.content.cts.MockReceiverAbort"
+ android:exported="true">
<intent-filter android:priority="2">
- <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT" />
+ <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT"/>
</intent-filter>
</receiver>
<receiver android:name="android.content.cts.MockReceiver"
- android:permission="android.content.cts.SIGNATURE_PERMISSION">
+ android:permission="android.content.cts.SIGNATURE_PERMISSION"
+ android:exported="true">
<intent-filter android:priority="1">
- <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_MOCKTEST" />
- <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT" />
- <action android:name="android.content.cts.ContextTest.BROADCAST_TESTORDER" />
+ <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_MOCKTEST"/>
+ <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT"/>
+ <action android:name="android.content.cts.ContextTest.BROADCAST_TESTORDER"/>
</intent-filter>
</receiver>
<!-- Receiver that will be explicitly disabled at runtime -->
<receiver android:name="android.content.cts.MockReceiverDisableable"
- android:enabled="true">
+ android:enabled="true"
+ android:exported="true">
<intent-filter android:priority="1">
- <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_DISABLED" />
+ <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_DISABLED"/>
</intent-filter>
</receiver>
<activity android:name="android.content.cts.AvailableIntentsActivity"
- android:label="AvailableIntentsActivity">
+ android:label="AvailableIntentsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<!--Test for PackageManager-->
<activity android:name="android.content.pm.cts.TestPmActivity"
- android:icon="@drawable/start"
- android:launchMode="singleTop">
+ android:icon="@drawable/start"
+ android:launchMode="singleTop"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.PMTEST" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.PMTEST"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
- <meta-data android:name="android.content.pm.cts.xmltest" android:resource="@xml/pm_test" />
+ <meta-data android:name="android.content.pm.cts.xmltest"
+ android:resource="@xml/pm_test"/>
</activity>
- <activity android:name="android.content.pm.cts.TestPmCompare">
+ <activity android:name="android.content.pm.cts.TestPmCompare"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.INFO" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.INFO"/>
</intent-filter>
</activity>
<!--Test for PackageManager-->
<service android:name="android.content.pm.cts.TestPmService"
- android:permission="android.content.cts.CALL_ABROAD_PERMISSION">
+ android:permission="android.content.cts.CALL_ABROAD_PERMISSION"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.pm.cts.activity.PMTEST_SERVICE" />
+ <action android:name="android.content.pm.cts.activity.PMTEST_SERVICE"/>
</intent-filter>
</service>
<!--Test for PackageManager-->
- <receiver android:name="android.content.pm.cts.PmTestReceiver">
+ <receiver android:name="android.content.pm.cts.PmTestReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.pm.cts.PackageManagerTest.PMTEST_RECEIVER" />
+ <action android:name="android.content.pm.cts.PackageManagerTest.PMTEST_RECEIVER"/>
</intent-filter>
</receiver>
<activity android:name="android.content.pm.cts.LauncherMockActivity"
- android:enabled="true">
+ android:enabled="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.HOME" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.HOME"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<!--Used by test for LauncherApps-->
<activity-alias android:name="android.content.pm.cts.MockActivity_Disabled"
- android:targetActivity="android.content.cts.MockActivity"
- android:enabled="false">
+ android:targetActivity="android.content.cts.MockActivity"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.cts.action.TEST_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.content.cts.action.TEST_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity-alias>
<!-- Used for PackageManager test, don't delete this MockContentProvider provider -->
- <provider android:name="android.content.cts.MockContentProvider" android:authorities="ctstest"
- android:multiprocess="false" />
+ <provider android:name="android.content.cts.MockContentProvider"
+ android:authorities="ctstest"
+ android:multiprocess="false"/>
<provider android:name="android.content.cts.MockSRSProvider"
- android:authorities="android.content.cts.MockSRSProvider"
- android:exported="false"
- android:multiprocess="false" />
+ android:authorities="android.content.cts.MockSRSProvider"
+ android:exported="false"
+ android:multiprocess="false"/>
<provider android:name="android.content.cts.DummyProvider"
- android:authorities="android.content.cts.dummyprovider"
- android:multiprocess="true" />
+ android:authorities="android.content.cts.dummyprovider"
+ android:multiprocess="true"/>
<provider android:name="android.content.cts.MockRemoteContentProvider"
- android:authorities="remotectstest"
- android:process=":remoteprovider" android:multiprocess="false" />
+ android:authorities="remotectstest"
+ android:process=":remoteprovider"
+ android:multiprocess="false"/>
<provider android:name="androidx.core.content.FileProvider"
- android:authorities="android.content.cts.fileprovider"
- android:grantUriPermissions="true">
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/file_paths" />
+ android:authorities="android.content.cts.fileprovider"
+ android:grantUriPermissions="true">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths"/>
</provider>
<provider android:name="android.content.cts.TestPagingContentProvider"
- android:authorities="android.content.cts.testpagingprovider"
- android:process=":testpagingprovider"
- android:multiprocess="false" />
+ android:authorities="android.content.cts.testpagingprovider"
+ android:process=":testpagingprovider"
+ android:multiprocess="false"/>
<provider android:name="android.content.cts.MockBuggyProvider"
- android:authorities="android.content.cts.mockbuggyprovider"
- android:process=":mockbuggyprovider"
- android:multiprocess="false" />
+ android:authorities="android.content.cts.mockbuggyprovider"
+ android:process=":mockbuggyprovider"
+ android:multiprocess="false"/>
- <service android:name="android.content.cts.MockService" />
+ <service android:name="android.content.cts.MockService"/>
- <service android:name="android.content.cts.MockSyncAdapterService" android:exported="true">
+ <service android:name="android.content.cts.MockSyncAdapterService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.SyncAdapter" />
+ <action android:name="android.content.SyncAdapter"/>
</intent-filter>
<meta-data android:name="android.content.SyncAdapter"
- android:resource="@xml/syncadapter" />
+ android:resource="@xml/syncadapter"/>
</service>
- <service android:name="android.content.cts.MockAccountService" android:exported="true"
- >
+ <service android:name="android.content.cts.MockAccountService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accounts.AccountAuthenticator" />
+ <action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
<meta-data android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/authenticator" />
+ android:resource="@xml/authenticator"/>
</service>
<activity android:name="android.content.cts.ClipboardManagerListenerActivity"/>
<activity android:name="android.content.cts.ImageCaptureActivity"
- android:exported="true">
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.action.IMAGE_CAPTURE" />
- <action android:name="android.media.action.IMAGE_CAPTURE_SECURE" />
- <action android:name="android.media.action.VIDEO_CAPTURE" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.media.action.IMAGE_CAPTURE"/>
+ <action android:name="android.media.action.IMAGE_CAPTURE_SECURE"/>
+ <action android:name="android.media.action.VIDEO_CAPTURE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name="android.content.cts.ReadableFileReceiverActivity"
- android:exported="true">
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SEND_MULTIPLE" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SEND_MULTIPLE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <provider
- android:name="android.content.cts.CursorWindowContentProvider"
- android:authorities="cursorwindow.provider"
- android:exported="true"
- android:process=":providerProcess">
+ <provider android:name="android.content.cts.CursorWindowContentProvider"
+ android:authorities="cursorwindow.provider"
+ android:exported="true"
+ android:process=":providerProcess">
</provider>
<activity android:name="com.android.cts.content.StubActivity"/>
- <service android:name="com.android.cts.content.NotAlwaysSyncableSyncService">
+ <service android:name="com.android.cts.content.NotAlwaysSyncableSyncService"
+ android:exported="true">
<intent-filter>
<action android:name="android.content.SyncAdapter"/>
</intent-filter>
<meta-data android:name="android.content.SyncAdapter"
- android:resource="@xml/not_always_syncable_account_access_adapter" />
+ android:resource="@xml/not_always_syncable_account_access_adapter"/>
</service>
- <service android:name="com.android.cts.content.AlwaysSyncableSyncService">
+ <service android:name="com.android.cts.content.AlwaysSyncableSyncService"
+ android:exported="true">
<intent-filter>
<action android:name="android.content.SyncAdapter"/>
</intent-filter>
<meta-data android:name="android.content.SyncAdapter"
- android:resource="@xml/always_syncable_account_access_adapter" />
+ android:resource="@xml/always_syncable_account_access_adapter"/>
</service>
- <activity android:name="com.android.cts.content.StubCameraIntentHandlerActivity">
+ <activity android:name="com.android.cts.content.StubCameraIntentHandlerActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.action.IMAGE_CAPTURE" />
- <action android:name="android.media.action.IMAGE_CAPTURE_SECURE" />
- <action android:name="android.media.action.VIDEO_CAPTURE" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.media.action.IMAGE_CAPTURE"/>
+ <action android:name="android.media.action.IMAGE_CAPTURE_SECURE"/>
+ <action android:name="android.media.action.VIDEO_CAPTURE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.content.cts"
- android:label="CTS tests of android.content">
+ android:targetPackage="android.content.cts"
+ android:label="CTS tests of android.content">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
<instrumentation android:name="android.content.pm.cts.TestPmInstrumentation"
- android:targetPackage="android"
- android:label="PackageManager Instrumentation Test" />
+ android:targetPackage="android"
+ android:label="PackageManager Instrumentation Test"/>
</manifest>
-
diff --git a/tests/tests/content/AndroidTest.xml b/tests/tests/content/AndroidTest.xml
index 7c0f3ac..36cf3b7 100644
--- a/tests/tests/content/AndroidTest.xml
+++ b/tests/tests/content/AndroidTest.xml
@@ -54,6 +54,8 @@
<option name="push-file" key="HelloWorld5_xxhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5_xxhdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld5_xxxhdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld5_xxxhdpi-v4.apk" />
<option name="push-file" key="HelloWorld5_xxxhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5_xxxhdpi-v4.apk.idsig" />
+ <option name="push-file" key="HelloWorld5Profileable.apk" value="/data/local/tmp/cts/content/HelloWorld5Profileable.apk" />
+ <option name="push-file" key="HelloWorld5Profileable.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld5Profileable.apk.idsig" />
<option name="push-file" key="HelloWorld7.apk" value="/data/local/tmp/cts/content/HelloWorld7.apk" />
<option name="push-file" key="HelloWorld7.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7.apk.idsig" />
<option name="push-file" key="HelloWorld7_hdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld7_hdpi-v4.apk" />
@@ -66,6 +68,8 @@
<option name="push-file" key="HelloWorld7_xxhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7_xxhdpi-v4.apk.idsig" />
<option name="push-file" key="HelloWorld7_xxxhdpi-v4.apk" value="/data/local/tmp/cts/content/HelloWorld7_xxxhdpi-v4.apk" />
<option name="push-file" key="HelloWorld7_xxxhdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorld7_xxxhdpi-v4.apk.idsig" />
+ <option name="push-file" key="HelloWorldShell.apk" value="/data/local/tmp/cts/content/HelloWorldShell.apk" />
+ <option name="push-file" key="HelloWorldShell.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldShell.apk.idsig" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/tests/tests/content/CtsSyncAccountAccessOtherCertTests/AndroidManifest.xml b/tests/tests/content/CtsSyncAccountAccessOtherCertTests/AndroidManifest.xml
index 67d20f9..acb5e66 100644
--- a/tests/tests/content/CtsSyncAccountAccessOtherCertTests/AndroidManifest.xml
+++ b/tests/tests/content/CtsSyncAccountAccessOtherCertTests/AndroidManifest.xml
@@ -15,27 +15,27 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.content">
+ package="com.android.cts.content">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name=".StubActivity"/>
- <service android:name=".AlwaysSyncableSyncService">
+ <service android:name=".AlwaysSyncableSyncService"
+ android:exported="true">
<intent-filter>
<action android:name="android.content.SyncAdapter"/>
</intent-filter>
<meta-data android:name="android.content.SyncAdapter"
- android:resource="@xml/syncadapter" />
+ android:resource="@xml/syncadapter"/>
</service>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.content" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.content"/>
</manifest>
diff --git a/tests/tests/content/HelloWorldApp/Android.bp b/tests/tests/content/HelloWorldApp/Android.bp
index 36bce17..f82899c 100644
--- a/tests/tests/content/HelloWorldApp/Android.bp
+++ b/tests/tests/content/HelloWorldApp/Android.bp
@@ -47,6 +47,21 @@
//-----------------------------------------------------------
android_test {
+ name: "HelloWorld5Profileable",
+ defaults: ["hello_world_defaults"],
+ srcs: ["src5/**/*.java"],
+ manifest: "AndroidManifestProfileable.xml",
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts10",
+ "general-tests",
+ ],
+ v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
name: "HelloWorld7",
defaults: ["hello_world_defaults"],
srcs: ["src7/**/*.java"],
@@ -58,3 +73,18 @@
],
v4_signature: true,
}
+
+//-----------------------------------------------------------
+android_test {
+ name: "HelloWorldShell",
+ defaults: ["hello_world_defaults"],
+ srcs: ["src_shell/**/*.java"],
+ manifest: "AndroidManifestShell.xml",
+ // tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts10",
+ "general-tests",
+ ],
+ v4_signature: true,
+}
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifest.xml b/tests/tests/content/HelloWorldApp/AndroidManifest.xml
index f195701..875c27a 100644
--- a/tests/tests/content/HelloWorldApp/AndroidManifest.xml
+++ b/tests/tests/content/HelloWorldApp/AndroidManifest.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.helloworld">
+ package="com.example.helloworld">
- <application
- android:allowBackup="true"
- android:debuggable="true"
- android:icon="@mipmap/ic_launcher"
- android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
- android:supportsRtl="true"
- android:theme="@style/AppTheme">
- <activity
- android:name=".MainActivity"
- android:label="@string/app_name"
- android:theme="@style/AppTheme.NoActionBar">
+ <application android:allowBackup="true"
+ android:debuggable="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:roundIcon="@mipmap/ic_launcher_round"
+ android:supportsRtl="true"
+ android:theme="@style/AppTheme">
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:theme="@style/AppTheme.NoActionBar"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestProfileable.xml b/tests/tests/content/HelloWorldApp/AndroidManifestProfileable.xml
new file mode 100644
index 0000000..0410a4b
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestProfileable.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.example.helloworld">
+
+ <application android:allowBackup="true"
+ android:debuggable="false"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:roundIcon="@mipmap/ic_launcher_round"
+ android:supportsRtl="true"
+ android:theme="@style/AppTheme">
+ <profileable android:shell="true"/>
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:theme="@style/AppTheme.NoActionBar"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestShell.xml b/tests/tests/content/HelloWorldApp/AndroidManifestShell.xml
new file mode 100644
index 0000000..c42546a
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestShell.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.shell">
+
+ <application android:allowBackup="true"
+ android:debuggable="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:roundIcon="@mipmap/ic_launcher_round"
+ android:supportsRtl="true"
+ android:theme="@style/AppTheme">
+ <profileable android:shell="true"/>
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:theme="@style/AppTheme.NoActionBar"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/src_shell/com/android/shell/MainActivity.java b/tests/tests/content/HelloWorldApp/src_shell/com/android/shell/MainActivity.java
new file mode 100644
index 0000000..d771f8d
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/src_shell/com/android/shell/MainActivity.java
@@ -0,0 +1,58 @@
+/*
+ * 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 com.android.shell;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+public class MainActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+ System.exit(1);
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.menu_main, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+}
diff --git a/tests/tests/content/SyncAccountAccessStubs/AndroidManifest.xml b/tests/tests/content/SyncAccountAccessStubs/AndroidManifest.xml
index a0dee84..8423733 100644
--- a/tests/tests/content/SyncAccountAccessStubs/AndroidManifest.xml
+++ b/tests/tests/content/SyncAccountAccessStubs/AndroidManifest.xml
@@ -15,31 +15,28 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.stub">
+ package="com.android.cts.stub">
<application>
- <service
- android:name=".StubAuthenticator">
+ <service android:name=".StubAuthenticator"
+ android:exported="true">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
- <meta-data
- android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/authenticator" />
+ <meta-data android:name="android.accounts.AccountAuthenticator"
+ android:resource="@xml/authenticator"/>
</service>
- <provider
- android:name=".StubProvider"
- android:authorities="com.android.cts.stub.provider"
- android:exported="true"
- android:syncable="true">
+ <provider android:name=".StubProvider"
+ android:authorities="com.android.cts.stub.provider"
+ android:exported="true"
+ android:syncable="true">
</provider>
- <provider
- android:name=".StubProvider2"
- android:authorities="com.android.cts.stub.provider2"
- android:exported="true"
- android:syncable="true">
+ <provider android:name=".StubProvider2"
+ android:authorities="com.android.cts.stub.provider2"
+ android:exported="true"
+ android:syncable="true">
</provider>
</application>
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
index 75f7cc4..4c5ef9a 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
@@ -63,6 +63,8 @@
private static final String TEST_APK_PATH = "/data/local/tmp/cts/content/";
private static final String TEST_APK = "HelloWorld5.apk";
+ private static final String TEST_APK_PROFILEABLE = "HelloWorld5Profileable.apk";
+ private static final String TEST_APK_SHELL = "HelloWorldShell.apk";
private static final String TEST_APK_SPLIT = "HelloWorld5_hdpi-v4.apk";
private static UiAutomation getUiAutomation() {
@@ -164,6 +166,16 @@
}
@Test
+ public void testSystemInstallWithIdSig() throws Exception {
+ final String baseName = TEST_APK_SHELL;
+ final File file = new File(createApkPath(baseName));
+ assertEquals(
+ "Failure [INSTALL_FAILED_SESSION_INVALID: Incremental installation of this "
+ + "package is not allowed.]\n",
+ executeShellCommand("pm install-incremental -t -g " + file.getPath()));
+ }
+
+ @Test
public void testInstallWithIdSigAndSplit() throws Exception {
File apkfile = new File(createApkPath(TEST_APK));
File splitfile = new File(createApkPath(TEST_APK_SPLIT));
@@ -233,7 +245,17 @@
@LargeTest
@Test
- public void testInstallSysTrace() throws Exception {
+ public void testInstallSysTraceDebuggable() throws Exception {
+ doTestInstallSysTrace(TEST_APK);
+ }
+
+ @LargeTest
+ @Test
+ public void testInstallSysTraceProfileable() throws Exception {
+ doTestInstallSysTrace(TEST_APK_PROFILEABLE);
+ }
+
+ private void doTestInstallSysTrace(String testApk) throws Exception {
// Async atrace dump uses less resources but requires periodic pulls.
// Overall timeout of 30secs in 100ms intervals should be enough.
final int atraceDumpIterations = 300;
@@ -250,7 +272,7 @@
"atrace --async_dump");
try (InputStream inputStream =
new ParcelFileDescriptor.AutoCloseInputStream(
- stdout)) {
+ stdout)) {
final String found = waitForSubstring(inputStream, expected);
if (!TextUtils.isEmpty(found)) {
result.write(found.getBytes());
@@ -269,7 +291,7 @@
readFromProcess.start();
for (int i = 0; i < 3; ++i) {
- installPackage(TEST_APK);
+ installPackage(testApk);
assertTrue(isAppInstalled(TEST_APP_PACKAGE));
uninstallPackageSilently(TEST_APP_PACKAGE);
}
diff --git a/tests/tests/cronet/TEST_MAPPING b/tests/tests/cronet/TEST_MAPPING
new file mode 100644
index 0000000..b1f3088
--- /dev/null
+++ b/tests/tests/cronet/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsCronetTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/database/TEST_MAPPING b/tests/tests/database/TEST_MAPPING
new file mode 100644
index 0000000..4a7fa66
--- /dev/null
+++ b/tests/tests/database/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsDatabaseTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java b/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
index 125197c..f4b293d 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
@@ -743,6 +743,18 @@
}
@Test
+ public void testStrictQueryEmptyToken() {
+ for (String column : COLUMNS_VALID) {
+ assertStrictQueryValid(
+ new String[] { column }, column + "=\"\"", null, null, null, null, null);
+ }
+ for (String column : COLUMNS_INVALID) {
+ assertStrictQueryInvalid(
+ new String[] { column }, column + "=\"\"", null, null, null, null, null);
+ }
+ }
+
+ @Test
public void testStrictQueryOrderBy() {
for (String column : COLUMNS_VALID) {
assertStrictQueryValid(
diff --git a/tests/tests/dpi2/TEST_MAPPING b/tests/tests/dpi2/TEST_MAPPING
new file mode 100644
index 0000000..09c90d6
--- /dev/null
+++ b/tests/tests/dpi2/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsDpiTestCases2"
+ }
+ ]
+}
diff --git a/tests/tests/dreams/TEST_MAPPING b/tests/tests/dreams/TEST_MAPPING
new file mode 100644
index 0000000..d8c6848
--- /dev/null
+++ b/tests/tests/dreams/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsDreamsTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/drm/TEST_MAPPING b/tests/tests/drm/TEST_MAPPING
new file mode 100644
index 0000000..437c95c
--- /dev/null
+++ b/tests/tests/drm/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsDrmTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/effect/TEST_MAPPING b/tests/tests/effect/TEST_MAPPING
new file mode 100644
index 0000000..623dc8c
--- /dev/null
+++ b/tests/tests/effect/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsEffectTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/externalservice/TEST_MAPPING b/tests/tests/externalservice/TEST_MAPPING
new file mode 100644
index 0000000..044b14f
--- /dev/null
+++ b/tests/tests/externalservice/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsExternalServiceTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/gesture/TEST_MAPPING b/tests/tests/gesture/TEST_MAPPING
new file mode 100644
index 0000000..7572991
--- /dev/null
+++ b/tests/tests/gesture/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsGestureTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/graphics/AndroidManifest.xml b/tests/tests/graphics/AndroidManifest.xml
index 2e53417..6406133 100644
--- a/tests/tests/graphics/AndroidManifest.xml
+++ b/tests/tests/graphics/AndroidManifest.xml
@@ -16,69 +16,66 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.graphics.cts"
- android:targetSandboxVersion="2">
+ package="android.graphics.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.graphics.cts.CameraGpuCtsActivity"
- android:label="CameraGpuCtsActivity">
+ android:label="CameraGpuCtsActivity">
</activity>
<activity android:name="android.graphics.cts.FrameRateCtsActivity"
- android:label="FrameRateCtsActivity">
+ android:label="FrameRateCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.graphics.cts.ImageViewCtsActivity"
- android:label="ImageViewCtsActivity">
+ android:label="ImageViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.graphics.cts.VulkanPreTransformCtsActivity"
- android:label="VulkanPreTransformCtsActivity"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+ android:label="VulkanPreTransformCtsActivity"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
</activity>
<activity android:name="android.graphics.drawable.cts.DrawableStubActivity"
- android:theme="@style/WhiteBackgroundNoWindowAnimation"
- android:screenOrientation="locked"/>
+ android:theme="@style/WhiteBackgroundNoWindowAnimation"
+ android:screenOrientation="locked"/>
<activity android:name="android.graphics.drawable.cts.AnimatedImageActivity"
- android:theme="@style/WhiteBackgroundNoWindowAnimation"
- android:screenOrientation="locked">
+ android:theme="@style/WhiteBackgroundNoWindowAnimation"
+ android:screenOrientation="locked">
</activity>
- <provider
- android:name=".EmptyProvider"
- android:exported="true"
- android:authorities="android.graphics.cts.assets"/>
- <provider
- android:name="androidx.core.content.FileProvider"
- android:authorities="android.graphics.cts.fileprovider"
- android:exported="false"
- android:grantUriPermissions="true"
- >
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/file_paths" />
+ <provider android:name=".EmptyProvider"
+ android:exported="true"
+ android:authorities="android.graphics.cts.assets"/>
+ <provider android:name="androidx.core.content.FileProvider"
+ android:authorities="android.graphics.cts.fileprovider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths"/>
</provider>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.graphics.cts"
- android:label="CTS tests of android.graphics">
+ android:targetPackage="android.graphics.cts"
+ android:label="CTS tests of android.graphics">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/graphics/jni/VulkanPreTransformTestHelpers.cpp b/tests/tests/graphics/jni/VulkanPreTransformTestHelpers.cpp
index f84658f..7d177e5 100644
--- a/tests/tests/graphics/jni/VulkanPreTransformTestHelpers.cpp
+++ b/tests/tests/graphics/jni/VulkanPreTransformTestHelpers.cpp
@@ -69,6 +69,10 @@
"VK_KHR_swapchain",
};
+static const char* blacklistedDeviceExtensions[] = {
+ "VK_KHR_performance_query",
+};
+
static bool enumerateInstanceExtensions(std::vector<VkExtensionProperties>* extensions) {
VkResult result;
@@ -191,6 +195,11 @@
std::vector<VkExtensionProperties> supportedDeviceExtensions;
ASSERT(enumerateDeviceExtensions(mGpu, &supportedDeviceExtensions));
+ // Fail if the blacklisted extensions are advertised as supported
+ for (const auto extension : blacklistedDeviceExtensions) {
+ ASSERT(!hasExtension(extension, supportedDeviceExtensions));
+ }
+
std::vector<const char*> enabledDeviceExtensions;
for (const auto extension : requiredDeviceExtensions) {
ASSERT(hasExtension(extension, supportedDeviceExtensions));
@@ -250,7 +259,8 @@
SwapchainInfo::SwapchainInfo(const DeviceInfo* const deviceInfo)
: mDeviceInfo(deviceInfo),
mFormat(VK_FORMAT_UNDEFINED),
- mDisplaySize({0, 0}),
+ mSurfaceSize({0, 0}),
+ mImageSize({0, 0}),
mSwapchain(VK_NULL_HANDLE),
mSwapchainLength(0) {}
@@ -296,7 +306,7 @@
ASSERT(formatIndex < formatCount);
mFormat = formats[formatIndex].format;
- mDisplaySize = surfaceCapabilities.currentExtent;
+ mImageSize = mSurfaceSize = surfaceCapabilities.currentExtent;
VkSurfaceTransformFlagBitsKHR preTransform =
(setPreTransform ? surfaceCapabilities.currentTransform
@@ -309,7 +319,7 @@
(VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR | VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR |
VK_SURFACE_TRANSFORM_HORIZONTAL_MIRROR_ROTATE_90_BIT_KHR |
VK_SURFACE_TRANSFORM_HORIZONTAL_MIRROR_ROTATE_270_BIT_KHR)) != 0) {
- std::swap(mDisplaySize.width, mDisplaySize.height);
+ std::swap(mImageSize.width, mImageSize.height);
}
if (outPreTransformHint) {
@@ -325,7 +335,7 @@
.minImageCount = surfaceCapabilities.minImageCount,
.imageFormat = mFormat,
.imageColorSpace = formats[formatIndex].colorSpace,
- .imageExtent = mDisplaySize,
+ .imageExtent = mImageSize,
.imageArrayLayers = 1,
.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE,
@@ -474,8 +484,8 @@
.renderPass = mRenderPass,
.attachmentCount = 1,
.pAttachments = &mImageViews[i],
- .width = mSwapchainInfo->displaySize().width,
- .height = mSwapchainInfo->displaySize().height,
+ .width = mSwapchainInfo->imageSize().width,
+ .height = mSwapchainInfo->imageSize().height,
.layers = 1,
};
VK_CALL(vkCreateFramebuffer(mDeviceInfo->device(), &framebufferCreateInfo, nullptr,
@@ -604,8 +614,8 @@
const VkViewport viewports = {
.x = 0.0f,
.y = 0.0f,
- .width = (float)mSwapchainInfo->displaySize().width,
- .height = (float)mSwapchainInfo->displaySize().height,
+ .width = (float)mSwapchainInfo->imageSize().width,
+ .height = (float)mSwapchainInfo->imageSize().height,
.minDepth = 0.0f,
.maxDepth = 1.0f,
};
@@ -615,7 +625,7 @@
.x = 0,
.y = 0,
},
- .extent = mSwapchainInfo->displaySize(),
+ .extent = mSwapchainInfo->imageSize(),
};
const VkPipelineViewportStateCreateInfo viewportInfo = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO,
@@ -793,7 +803,7 @@
.x = 0,
.y = 0,
},
- .extent = mSwapchainInfo->displaySize(),
+ .extent = mSwapchainInfo->imageSize(),
},
.clearValueCount = 1,
.pClearValues = &clearVals,
diff --git a/tests/tests/graphics/jni/VulkanPreTransformTestHelpers.h b/tests/tests/graphics/jni/VulkanPreTransformTestHelpers.h
index 743c124..753df15 100644
--- a/tests/tests/graphics/jni/VulkanPreTransformTestHelpers.h
+++ b/tests/tests/graphics/jni/VulkanPreTransformTestHelpers.h
@@ -58,7 +58,8 @@
~SwapchainInfo();
VkTestResult init(bool setPreTransform, int* outPreTransformHint);
VkFormat format() const { return mFormat; }
- VkExtent2D displaySize() const { return mDisplaySize; }
+ VkExtent2D surfaceSize() const { return mSurfaceSize; }
+ VkExtent2D imageSize() const { return mImageSize; }
VkSwapchainKHR swapchain() const { return mSwapchain; }
uint32_t swapchainLength() const { return mSwapchainLength; }
@@ -66,7 +67,8 @@
const DeviceInfo* const mDeviceInfo;
VkFormat mFormat;
- VkExtent2D mDisplaySize;
+ VkExtent2D mSurfaceSize;
+ VkExtent2D mImageSize;
VkSwapchainKHR mSwapchain;
uint32_t mSwapchainLength;
};
diff --git a/tests/tests/graphics/jni/VulkanTestHelpers.cpp b/tests/tests/graphics/jni/VulkanTestHelpers.cpp
index b549b97..ee7fe1f 100644
--- a/tests/tests/graphics/jni/VulkanTestHelpers.cpp
+++ b/tests/tests/graphics/jni/VulkanTestHelpers.cpp
@@ -137,6 +137,18 @@
ASSERT(hasExtension(extension, supportedDeviceExtensions));
}
+ const VkPhysicalDeviceExternalSemaphoreInfo externalSemaphoreInfo = {
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO,
+ nullptr,
+ VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
+ };
+ VkExternalSemaphoreProperties externalSemaphoreProperties;
+ vkGetPhysicalDeviceExternalSemaphoreProperties(mGpu, &externalSemaphoreInfo,
+ &externalSemaphoreProperties);
+
+ ASSERT(externalSemaphoreProperties.externalSemaphoreFeatures &
+ VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT);
+
uint32_t queueFamilyCount = 0;
vkGetPhysicalDeviceQueueFamilyProperties(mGpu, &queueFamilyCount, nullptr);
ASSERT(queueFamilyCount != 0);
diff --git a/tests/tests/graphics/jni/android_graphics_cts_VulkanPreTransformCtsActivity.cpp b/tests/tests/graphics/jni/android_graphics_cts_VulkanPreTransformCtsActivity.cpp
index c9f557f..4bc1f98 100644
--- a/tests/tests/graphics/jni/android_graphics_cts_VulkanPreTransformCtsActivity.cpp
+++ b/tests/tests/graphics/jni/android_graphics_cts_VulkanPreTransformCtsActivity.cpp
@@ -29,14 +29,16 @@
namespace {
-jboolean validatePixelValues(JNIEnv* env, jboolean setPreTransform, jint preTransformHint) {
+jboolean validatePixelValues(JNIEnv* env, jint width, jint height, jboolean setPreTransform,
+ jint preTransformHint) {
jclass clazz = env->FindClass("android/graphics/cts/VulkanPreTransformTest");
- jmethodID mid = env->GetStaticMethodID(clazz, "validatePixelValuesAfterRotation", "(ZI)Z");
+ jmethodID mid = env->GetStaticMethodID(clazz, "validatePixelValuesAfterRotation", "(IIZI)Z");
if (mid == 0) {
ALOGE("Failed to find method ID");
return false;
}
- return env->CallStaticBooleanMethod(clazz, mid, setPreTransform, preTransformHint);
+ return env->CallStaticBooleanMethod(clazz, mid, width, height, setPreTransform,
+ preTransformHint);
}
void createNativeTest(JNIEnv* env, jclass /*clazz*/, jobject jAssetManager, jobject jSurface,
@@ -71,7 +73,10 @@
}
}
- ASSERT(validatePixelValues(env, setPreTransform, preTransformHint), "Not properly rotated");
+ const VkExtent2D surfaceSize = swapchainInfo.surfaceSize();
+ ASSERT(validatePixelValues(env, surfaceSize.width, surfaceSize.height, setPreTransform,
+ preTransformHint),
+ "Not properly rotated");
}
const std::array<JNINativeMethod, 1> JNI_METHODS = {{
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
index 371a637..3e1d527 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
@@ -18,6 +18,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -49,6 +50,8 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -147,7 +150,7 @@
InputStream is = obtainInputStream(RES_IDS[i]);
try {
BitmapRegionDecoder decoder =
- BitmapRegionDecoder.newInstance(is, false);
+ BitmapRegionDecoder.newInstance(is);
assertEquals(WIDTHS[i], decoder.getWidth());
assertEquals(HEIGHTS[i], decoder.getHeight());
} catch (IOException e) {
@@ -167,7 +170,7 @@
byte[] imageData = obtainByteArray(RES_IDS[i]);
try {
BitmapRegionDecoder decoder = BitmapRegionDecoder
- .newInstance(imageData, 0, imageData.length, false);
+ .newInstance(imageData, 0, imageData.length);
assertEquals(WIDTHS[i], decoder.getWidth());
assertEquals(HEIGHTS[i], decoder.getHeight());
} catch (IOException e) {
@@ -182,15 +185,14 @@
for (int i = 0; i < RES_IDS.length; ++i) {
String filepath = obtainPath(i);
ParcelFileDescriptor pfd = obtainParcelDescriptor(filepath);
- FileDescriptor fd = pfd.getFileDescriptor();
try {
BitmapRegionDecoder decoder1 =
- BitmapRegionDecoder.newInstance(filepath, false);
+ BitmapRegionDecoder.newInstance(filepath);
assertEquals(WIDTHS[i], decoder1.getWidth());
assertEquals(HEIGHTS[i], decoder1.getHeight());
BitmapRegionDecoder decoder2 =
- BitmapRegionDecoder.newInstance(fd, false);
+ BitmapRegionDecoder.newInstance(pfd);
assertEquals(WIDTHS[i], decoder2.getWidth());
assertEquals(HEIGHTS[i], decoder2.getHeight());
} catch (IOException e) {
@@ -211,7 +213,7 @@
opts.inPreferredConfig = COLOR_CONFIGS[k];
InputStream is1 = obtainInputStream(RES_IDS[i]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
InputStream is2 = obtainInputStream(RES_IDS[i]);
Bitmap wholeImage = BitmapFactory.decodeStream(is2, null, opts);
@@ -239,7 +241,7 @@
opts.inBitmap = null;
InputStream is1 = obtainInputStream(RES_IDS[i]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
InputStream is2 = obtainInputStream(RES_IDS[i]);
Bitmap wholeImage = BitmapFactory.decodeStream(is2, null, opts);
@@ -271,7 +273,7 @@
byte[] imageData = obtainByteArray(RES_IDS[i]);
BitmapRegionDecoder decoder = BitmapRegionDecoder
- .newInstance(imageData, 0, imageData.length, false);
+ .newInstance(imageData, 0, imageData.length);
Bitmap wholeImage = BitmapFactory.decodeByteArray(imageData,
0, imageData.length, opts);
@@ -298,8 +300,7 @@
opts.inSampleSize = SAMPLESIZES[j];
opts.inPreferredConfig = COLOR_CONFIGS[k];
- BitmapRegionDecoder decoder =
- BitmapRegionDecoder.newInstance(filepath, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(filepath);
Bitmap wholeImage = BitmapFactory.decodeFile(filepath, opts);
if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
compareRegionByRegion(decoder, opts, MSE_MARGIN_WEB_P_CONFIG_RGB_565,
@@ -309,10 +310,7 @@
}
ParcelFileDescriptor pfd1 = obtainParcelDescriptor(filepath);
- FileDescriptor fd1 = pfd1.getFileDescriptor();
- decoder = BitmapRegionDecoder.newInstance(fd1, false);
- ParcelFileDescriptor pfd2 = obtainParcelDescriptor(filepath);
- FileDescriptor fd2 = pfd2.getFileDescriptor();
+ decoder = BitmapRegionDecoder.newInstance(pfd1);
if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
compareRegionByRegion(decoder, opts, MSE_MARGIN_WEB_P_CONFIG_RGB_565,
wholeImage);
@@ -328,7 +326,7 @@
@Test
public void testRecycle() throws IOException {
InputStream is = obtainInputStream(RES_IDS[0]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is);
decoder.recycle();
assertTrue(decoder.isRecycled());
try {
@@ -369,7 +367,7 @@
for (int i = 0; i < NUM_TEST_IMAGES; i++) {
InputStream is = obtainInputStream(RES_IDS[i]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is);
for (int j = 0; j < SAMPLESIZES.length; j++) {
int sampleSize = SAMPLESIZES[j];
defaultOpts.inSampleSize = sampleSize;
@@ -437,7 +435,7 @@
BitmapFactory.Options options = new BitmapFactory.Options();
options.inPreferredConfig = Bitmap.Config.HARDWARE;
InputStream is = obtainInputStream(RES_IDS[0]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is);
Bitmap hardwareBitmap = decoder.decodeRegion(new Rect(0, 0, 10, 10), options);
assertNotNull(hardwareBitmap);
// Test that checks that correct bitmap was obtained is in uirendering/HardwareBitmapTests
@@ -454,7 +452,7 @@
opts.inPreferredConfig = COLOR_CONFIGS[k];
InputStream is1 = obtainInputStream(RES_IDS[i]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
Bitmap region = decoder.decodeRegion(
new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
decoder.recycle();
@@ -477,7 +475,7 @@
String assetName = ASSET_NAMES[i];
InputStream is1 = obtainInputStream(assetName);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
Bitmap region = decoder.decodeRegion(
new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
decoder.recycle();
@@ -501,7 +499,7 @@
// sRGB
BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(
- obtainInputStream(ASSET_NAMES[3]), false);
+ obtainInputStream(ASSET_NAMES[3]));
Bitmap region = decoder.decodeRegion(
new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
decoder.recycle();
@@ -509,7 +507,7 @@
assertEquals(ColorSpace.get(ColorSpace.Named.SRGB), region.getColorSpace());
// DisplayP3
- decoder = BitmapRegionDecoder.newInstance(obtainInputStream(ASSET_NAMES[1]), false);
+ decoder = BitmapRegionDecoder.newInstance(obtainInputStream(ASSET_NAMES[1]));
region = decoder.decodeRegion(new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
decoder.recycle();
@@ -525,7 +523,7 @@
opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.DISPLAY_P3);
InputStream is1 = obtainInputStream(RES_IDS[i]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
Bitmap region = decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
decoder.recycle();
@@ -542,7 +540,7 @@
opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.ADOBE_RGB);
InputStream is1 = obtainInputStream(ASSET_NAMES[0]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
Bitmap region = decoder.decodeRegion(new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
decoder.recycle();
@@ -557,7 +555,7 @@
opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.ADOBE_RGB);
InputStream is1 = obtainInputStream(ASSET_NAMES[1]); // Display P3
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
Bitmap region = decoder.decodeRegion(new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
decoder.recycle();
@@ -570,7 +568,7 @@
// This image normally decodes to F16, but if there is an inBitmap,
// decoding will match the Config of that Bitmap.
InputStream is = obtainInputStream(ASSET_NAMES[0]); // F16
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is);
Options opts = new BitmapFactory.Options();
for (Bitmap.Config config : new Bitmap.Config[] {
@@ -597,7 +595,7 @@
Options opts = new BitmapFactory.Options();
opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.CIE_LAB);
InputStream is1 = obtainInputStream(RES_IDS[0]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
Bitmap region = decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
}
@@ -610,7 +608,7 @@
x -> Math.pow(x, 1.0f / 2.2f), x -> Math.pow(x, 2.2f),
0, 1);
InputStream is1 = obtainInputStream(RES_IDS[0]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1);
Bitmap region = decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
}
@@ -621,7 +619,7 @@
.copy(Config.HARDWARE, false);
opts.inBitmap = bitmap;
InputStream is = obtainInputStream(RES_IDS[0]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is);
decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
}
@@ -633,7 +631,7 @@
opts.inBitmap = bitmap;
InputStream is = obtainInputStream(RES_IDS[0]);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is);
assertThrows(IllegalArgumentException.class, () -> {
decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
});
@@ -642,7 +640,7 @@
@Test
public void testHeif() throws IOException {
InputStream is = obtainInputStream(R.raw.heifwriter_input);
- BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+ BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is);
Bitmap region = decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), null);
assertNotNull(region);
@@ -652,6 +650,120 @@
assertNotNull(full);
}
+ @Test(expected = NullPointerException.class)
+ public void testNullParcelFileDescriptor() throws IOException {
+ ParcelFileDescriptor pfd = null;
+ BitmapRegionDecoder.newInstance(pfd);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testNullFileDescriptor() throws IOException {
+ FileDescriptor fd = null;
+ BitmapRegionDecoder.newInstance(fd, false);
+ }
+
+ @Test
+ public void testNullInputStream() throws IOException {
+ InputStream is = null;
+ assertNull(BitmapRegionDecoder.newInstance(is));
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testNullPathName() throws IOException {
+ String pathName = null;
+ BitmapRegionDecoder.newInstance(pathName);
+ }
+
+ @Test(expected = IOException.class)
+ public void testEmptyPathName() throws IOException {
+ String pathName = "";
+ BitmapRegionDecoder.newInstance(pathName);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testNullByteArray() throws IOException {
+ byte[] data = null;
+ BitmapRegionDecoder.newInstance(data, 0, 0);
+ }
+
+ @Test(expected = ArrayIndexOutOfBoundsException.class)
+ public void testNegativeOffset() throws IOException {
+ byte[] data = new byte[10];
+ BitmapRegionDecoder.newInstance(data, -1, 10);
+ }
+
+ @Test(expected = ArrayIndexOutOfBoundsException.class)
+ public void testNegativeLength() throws IOException {
+ byte[] data = new byte[10];
+ BitmapRegionDecoder.newInstance(data, 0, -10);
+ }
+
+ @Test(expected = ArrayIndexOutOfBoundsException.class)
+ public void testTooLong() throws IOException {
+ byte[] data = new byte[10];
+ BitmapRegionDecoder.newInstance(data, 1, 10);
+ }
+
+ @Test(expected = IOException.class)
+ public void testEmptyByteArray() throws IOException {
+ byte[] data = new byte[0];
+ BitmapRegionDecoder.newInstance(data, 0, 0);
+ }
+
+ @Test(expected = IOException.class)
+ public void testEmptyInputStream() throws IOException {
+ InputStream is = new InputStream() {
+ @Override
+ public int read() {
+ return -1;
+ }
+ };
+ BitmapRegionDecoder.newInstance(is);
+ }
+
+ private static File createEmptyFile() throws IOException {
+ File dir = InstrumentationRegistry.getTargetContext().getFilesDir();
+ dir.mkdirs();
+ return File.createTempFile("emptyFile", "tmp", dir);
+ }
+
+ @Test
+ public void testEmptyFile() throws IOException {
+ File file = createEmptyFile();
+ String pathName = file.getAbsolutePath();
+ assertThrows(IOException.class, () -> {
+ BitmapRegionDecoder.newInstance(pathName);
+ });
+ file.delete();
+ }
+
+ @Test
+ public void testEmptyFileDescriptor() throws IOException {
+ File file = createEmptyFile();
+ FileInputStream fileStream = new FileInputStream(file);
+ FileDescriptor fd = fileStream.getFD();
+ assertThrows(IOException.class, () -> {
+ BitmapRegionDecoder.newInstance(fd, false);
+ });
+ file.delete();
+ }
+
+ @Test
+ public void testEmptyParcelFileDescriptor() throws IOException, FileNotFoundException {
+ File file = createEmptyFile();
+ ParcelFileDescriptor pfd = ParcelFileDescriptor.open(file,
+ ParcelFileDescriptor.MODE_READ_ONLY);
+ assertThrows(IOException.class, () -> {
+ BitmapRegionDecoder.newInstance(pfd);
+ });
+ file.delete();
+ }
+
+ @Test(expected = IOException.class)
+ public void testInvalidFileDescriptor() throws IOException {
+ BitmapRegionDecoder.newInstance(new FileDescriptor(), false);
+ }
+
private void compareRegionByRegion(BitmapRegionDecoder decoder,
Options opts, int mseMargin, Bitmap wholeImage) {
int width = decoder.getWidth();
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
index d8fad93..94271f1 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
@@ -68,6 +68,7 @@
import java.nio.ShortBuffer;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -675,6 +676,103 @@
}
}
+ private void assertMatches(HardwareBuffer hwBuffer, HardwareBuffer hwBuffer2) {
+ assertEquals(hwBuffer, hwBuffer2);
+ assertEquals(hwBuffer.hashCode(), hwBuffer2.hashCode());
+ assertEquals(hwBuffer.getWidth(), hwBuffer2.getWidth());
+ assertEquals(hwBuffer.getHeight(), hwBuffer2.getHeight());
+ assertEquals(hwBuffer.getFormat(), hwBuffer2.getFormat());
+ assertEquals(hwBuffer.getLayers(), hwBuffer2.getLayers());
+ assertEquals(hwBuffer.getUsage(), hwBuffer2.getUsage());
+ }
+
+ @Test
+ public void testGetHardwareBufferMatchesWrapped() {
+ try (HardwareBuffer hwBuffer = createTestBuffer(128, 128, false)) {
+ Bitmap bitmap = Bitmap.wrapHardwareBuffer(hwBuffer, ColorSpace.get(Named.SRGB));
+ assertNotNull(bitmap);
+
+ try (HardwareBuffer hwBuffer2 = bitmap.getHardwareBuffer()) {
+ assertNotNull(hwBuffer2);
+ assertMatches(hwBuffer, hwBuffer2);
+ }
+ bitmap.recycle();
+ }
+ }
+
+ private static Object[] parametersFor_testGetHardwareBufferConfig() {
+ return new Object[] {Config.ARGB_8888, Config.RGBA_F16, Config.RGB_565};
+ }
+
+ @Test
+ @Parameters(method = "parametersFor_testGetHardwareBufferConfig")
+ public void testGetHardwareBufferConfig(Config config) {
+ Bitmap bitmap = Bitmap.createBitmap(10, 10, config);
+ bitmap = bitmap.copy(Config.HARDWARE, false);
+ if (bitmap == null) {
+ fail("Failed to copy to HARDWARE with Config " + config);
+ }
+ try (HardwareBuffer hwBuffer = bitmap.getHardwareBuffer()) {
+ assertNotNull(hwBuffer);
+ assertEquals(hwBuffer.getWidth(), 10);
+ assertEquals(hwBuffer.getHeight(), 10);
+ }
+ }
+
+ @Test
+ public void testGetHardwareBufferTwice() {
+ Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+ bitmap = bitmap.copy(Config.HARDWARE, false);
+ try (HardwareBuffer hwBuffer = bitmap.getHardwareBuffer()) {
+ assertNotNull(hwBuffer);
+ try (HardwareBuffer hwBuffer2 = bitmap.getHardwareBuffer()) {
+ assertNotNull(hwBuffer2);
+ assertMatches(hwBuffer, hwBuffer2);
+ }
+ }
+ }
+
+ @Test
+ public void testGetHardwareBufferMatches() {
+ Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+ bitmap = bitmap.copy(Config.HARDWARE, false);
+ try (HardwareBuffer hwBuffer = bitmap.getHardwareBuffer()) {
+ HashSet<HardwareBuffer> set = new HashSet<HardwareBuffer>();
+ set.add(hwBuffer);
+ assertTrue(set.contains(bitmap.getHardwareBuffer()));
+ }
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testGetHardwareBufferNonHardware() {
+ Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+ bitmap.getHardwareBuffer();
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testGetHardwareBufferRecycled() {
+ Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+ bitmap = bitmap.copy(Config.HARDWARE, false);
+ bitmap.recycle();
+ bitmap.getHardwareBuffer();
+ }
+
+ @Test
+ public void testGetHardwareBufferClosed() {
+ HardwareBuffer hwBuffer = createTestBuffer(128, 128, false);
+ Bitmap bitmap = Bitmap.wrapHardwareBuffer(hwBuffer, ColorSpace.get(Named.SRGB));
+ assertNotNull(bitmap);
+
+ hwBuffer.close();
+
+ try (HardwareBuffer hwBuffer2 = bitmap.getHardwareBuffer()) {
+ assertNotNull(hwBuffer2);
+ assertFalse(hwBuffer2.isClosed());
+ assertNotEquals(hwBuffer, hwBuffer2);
+ }
+ bitmap.recycle();
+ }
+
@Test
public void testGenerationId() {
Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
@@ -2301,6 +2399,108 @@
}
}
+ private static byte[] compressToPng(Bitmap bitmap) {
+ try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+ assertTrue("Failed to encode a Bitmap with Config " + bitmap.getConfig()
+ + " and ColorSpace " + bitmap.getColorSpace() + "!",
+ bitmap.compress(CompressFormat.PNG, 100, stream));
+ return stream.toByteArray();
+ } catch (IOException e) {
+ fail("Failed to compress with " + e);
+ return null;
+ }
+ }
+
+ private static Object[] parametersForTestAsShared() {
+ return Utils.crossProduct(Config.values(), getRgbColorSpaces().toArray(new Object[0]));
+ }
+
+ @Test
+ @Parameters(method = "parametersForTestAsShared")
+ public void testAsShared(Config config, ColorSpace colorSpace) {
+ Bitmap original = Bitmap.createBitmap(10, 10,
+ config == Config.HARDWARE ? Config.ARGB_8888 : config, true /*hasAlpha*/,
+ colorSpace);
+ drawGradient(original);
+
+ if (config == Config.HARDWARE) {
+ original = original.copy(Config.HARDWARE, false /*mutable*/);
+ }
+
+ // There's no visible way to test that the memory is allocated in shared memory, but we can
+ // verify that the Bitmaps look the same.
+ Bitmap shared = original.asShared();
+ assertNotNull(shared);
+
+ if (config == Config.HARDWARE) {
+ int expectedFormat = nGetFormat(original);
+ assertEquals(expectedFormat, configToFormat(shared.getConfig()));
+
+ // There's no public way to look at the pixels in the HARDWARE Bitmap, but if we
+ // compress each as a lossless PNG, they should look identical.
+ byte[] origBytes = compressToPng(original);
+ byte[] sharedBytes = compressToPng(shared);
+ assertTrue(Arrays.equals(origBytes, sharedBytes));
+ } else {
+ assertSame(original.getConfig(), shared.getConfig());
+ assertTrue(shared.sameAs(original));
+ }
+ assertSame(original.getColorSpace(), shared.getColorSpace());
+
+ // The Bitmap is already in shared memory, so no work is done.
+ Bitmap shared2 = shared.asShared();
+ assertSame(shared, shared2);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testAsSharedRecycled() {
+ Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+ bitmap.recycle();
+ bitmap.asShared();
+ }
+
+ @Test
+ public void testAsSharedDensity() {
+ DisplayMetrics metrics =
+ InstrumentationRegistry.getTargetContext().getResources().getDisplayMetrics();
+ Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+ for (int density : new int[] { Bitmap.DENSITY_NONE, metrics.densityDpi,
+ DisplayMetrics.DENSITY_HIGH, DisplayMetrics.DENSITY_DEVICE_STABLE,
+ DisplayMetrics.DENSITY_MEDIUM }) {
+ bitmap.setDensity(density);
+ Bitmap shared = bitmap.asShared();
+ assertEquals(density, shared.getDensity());
+ shared.recycle();
+ }
+ }
+
+ @Test
+ @Parameters({"true", "false"})
+ public void testAsSharedImageDecoder(boolean mutable) {
+ Resources res = InstrumentationRegistry.getTargetContext().getResources();
+ ImageDecoder.Source source = ImageDecoder.createSource(res.getAssets(),
+ "grayscale-16bit-linearSrgb.png");
+ try {
+ Bitmap bitmap = ImageDecoder.decodeBitmap(source, (decoder, info, s) -> {
+ decoder.setAllocator(ImageDecoder.ALLOCATOR_SHARED_MEMORY);
+ if (mutable) decoder.setMutableRequired(true);
+ });
+
+ Bitmap shared = bitmap.asShared();
+ if (mutable) {
+ // bitmap is mutable, so asShared must make a copy.
+ assertNotEquals(bitmap, shared);
+ assertTrue(bitmap.sameAs(shared));
+ } else {
+ // bitmap is already immutable and in shared memory, so asShared will return
+ // itself.
+ assertSame(bitmap, shared);
+ }
+ } catch (IOException e) {
+ fail("Failed to decode with " + e);
+ }
+ }
+
@Test
public void testNdkFormats() {
for (ConfigToFormat pair : CONFIG_TO_FORMAT) {
@@ -2565,6 +2765,24 @@
|| cs == ColorSpace.get(Named.LINEAR_EXTENDED_SRGB);
}
+ // Helper method for populating a Bitmap with interesting pixels for comparison.
+ private static void drawGradient(Bitmap bitmap) {
+ // Use different colors and alphas.
+ Canvas canvas = new Canvas(bitmap);
+ ColorSpace cs = bitmap.getColorSpace();
+ if (cs == null) {
+ assertSame(Config.ALPHA_8, bitmap.getConfig());
+ cs = ColorSpace.get(ColorSpace.Named.SRGB);
+ }
+ long color0 = Color.pack(0, 0, 1, 1, cs);
+ long color1 = Color.pack(1, 0, 0, 0, cs);
+ LinearGradient gradient = new LinearGradient(0, 0, 10, 10, color0, color1,
+ Shader.TileMode.CLAMP);
+ Paint paint = new Paint();
+ paint.setShader(gradient);
+ canvas.drawPaint(paint);
+ }
+
@Test
@Parameters(method = "parametersForNdkCompress")
public void testNdkCompress(CompressFormat format, ColorSpace cs, Config config)
@@ -2574,15 +2792,7 @@
assertNotNull(bitmap);
{
- // Use different colors and alphas.
- Canvas canvas = new Canvas(bitmap);
- long color0 = Color.pack(0, 0, 1, 1, cs);
- long color1 = Color.pack(1, 0, 0, 0, cs);
- LinearGradient gradient = new LinearGradient(0, 0, 10, 10, color0, color1,
- Shader.TileMode.CLAMP);
- Paint paint = new Paint();
- paint.setShader(gradient);
- canvas.drawPaint(paint);
+ drawGradient(bitmap);
}
byte[] storage = new byte[16 * 1024];
@@ -2657,6 +2867,7 @@
private static native void nFillRgbaHwBuffer(HardwareBuffer hwBuffer);
private static native void nTestNullBitmap(Bitmap bitmap);
+ private static final int ANDROID_BITMAP_FORMAT_NONE = 0;
static final int ANDROID_BITMAP_FORMAT_RGBA_8888 = 1;
private static final int ANDROID_BITMAP_FORMAT_RGB_565 = 4;
private static final int ANDROID_BITMAP_FORMAT_A_8 = 8;
@@ -2672,6 +2883,15 @@
}
}
+ private static int configToFormat(Config config) {
+ for (ConfigToFormat pair : CONFIG_TO_FORMAT) {
+ if (config == pair.config) {
+ return pair.format;
+ }
+ }
+ return ANDROID_BITMAP_FORMAT_NONE;
+ }
+
private static final ConfigToFormat[] CONFIG_TO_FORMAT = new ConfigToFormat[] {
new ConfigToFormat(Bitmap.Config.ARGB_8888, ANDROID_BITMAP_FORMAT_RGBA_8888),
// ARGB_4444 is deprecated, and createBitmap converts to 8888.
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java
index 92919b9..3d7561c 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java
@@ -26,7 +26,6 @@
import android.graphics.ColorSpace;
import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,8 +33,11 @@
import java.util.Arrays;
import java.util.function.DoubleUnaryOperator;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+
@SmallTest
-@RunWith(AndroidJUnit4.class)
+@RunWith(JUnitParamsRunner.class)
public class ColorSpaceTest {
// Column-major RGB->XYZ transform matrix for the sRGB color space
private static final float[] SRGB_TO_XYZ = {
@@ -790,9 +792,154 @@
1 / 1.055, 0.055 / 1.055, 1 / 12.92, 0.04045, 2.4)));
}
+ @Test(expected = IllegalArgumentException.class)
+ @Parameters({"0", "-1", "-50"})
+ public void testInvalidCct(int cct) {
+ ColorSpace.cctToXyz(cct);
+ }
+
+ @Test
+ public void testCctToXyz() {
+ // Verify that range listed as meaningful by the API return float arrays as expected.
+ for (int i = 1667; i <= 25000; i++) {
+ float[] result = ColorSpace.cctToXyz(i);
+ assertNotNull(result);
+ assertEquals(3, result.length);
+ }
+ }
+
+ private static Object[] cctToXyzExpected() {
+ return new Object[] {
+ // ILLUMINANT_A
+ new Object[] { 2856, new float[] { 1.0970824f, 1.0f, 0.3568525f }},
+ // ILLUMINANT_B
+ new Object[] { 4874, new float[] { 0.98355806f, 1.0f, 0.8376475f }},
+ // ILLUMINANT_C
+ new Object[] { 6774, new float[] { 0.9680535f, 1.0f, 1.1603559f }},
+ // ILLUMINANT_D50
+ new Object[] { 5003, new float[] { 0.9811904f, 1.0f, 0.86360276f }},
+ // ILLUMINANT_D55
+ new Object[] { 5503, new float[] { 0.97444946f, 1.0f, 0.9582717f }},
+ // ILLUMINANT_D60
+ new Object[] { 6004, new float[] { 0.9705604f, 1.0f, 1.0441511f }},
+ // ILLUMINANT_D65
+ new Object[] { 6504, new float[] { 0.968573f, 1.0f, 1.1216444f }},
+ // ILLUMINANT_D75
+ new Object[] { 7504, new float[] { 0.9679457f, 1.0f, 1.2551404f }},
+ // ILLUMINANT_E
+ new Object[] { 5454, new float[] { 0.9749648f, 1.0f, 0.9494016f }},
+ // Test a sample of values in the meaningful range according to the API.
+ new Object[] { 1667, new float[] { 1.4014802f, 1.0f, 0.08060435f }},
+ new Object[] { 1668, new float[] { 1.4010513f, 1.0f, 0.08076303f }},
+ new Object[] { 1700, new float[] { 1.3874257f, 1.0f, 0.08596305f }},
+ new Object[] { 1701, new float[] { 1.3870035f, 1.0f, 0.08612958f }},
+ new Object[] { 2020, new float[] { 1.2686056f, 1.0f, 0.14921218f }},
+ new Object[] { 2102, new float[] { 1.2439337f, 1.0f, 0.1678791f }},
+ new Object[] { 2360, new float[] { 1.1796018f, 1.0f, 0.2302558f }},
+ new Object[] { 4688, new float[] { 0.9875373f, 1.0f, 0.79908675f }},
+ new Object[] { 5797, new float[] { 0.97189087f, 1.0f, 1.0097121f }},
+ new Object[] { 7625, new float[] { 0.96806175f, 1.0f, 1.2695707f }},
+ new Object[] { 8222, new float[] { 0.9690009f, 1.0f, 1.3359972f }},
+ new Object[] { 8330, new float[] { 0.9692224f, 1.0f, 1.3472213f }},
+ new Object[] { 9374, new float[] { 0.9718307f, 1.0f, 1.4447508f }},
+ new Object[] { 9604, new float[] { 0.97247595f, 1.0f, 1.4638413f }},
+ new Object[] { 9894, new float[] { 0.9733059f, 1.0f, 1.4868189f }},
+ new Object[] { 10764, new float[] { 0.97584003f, 1.0f, 1.5491791f }},
+ new Object[] { 11735, new float[] { 0.97862047f, 1.0f, 1.6088297f }},
+ new Object[] { 12819, new float[] { 0.98155034f, 1.0f, 1.6653923f }},
+ new Object[] { 13607, new float[] { 0.98353446f, 1.0f, 1.7010691f }},
+ new Object[] { 15185, new float[] { 0.98712224f, 1.0f, 1.7615601f }},
+ new Object[] { 17474, new float[] { 0.9914801f, 1.0f, 1.8297766f }},
+ new Object[] { 18788, new float[] { 0.9935937f, 1.0f, 1.8612393f }},
+ new Object[] { 19119, new float[] { 0.99408686f, 1.0f, 1.8684553f }},
+ new Object[] { 19174, new float[] { 0.99416786f, 1.0f, 1.8696303f }},
+ new Object[] { 19437, new float[] { 0.9945476f, 1.0f, 1.8751476f }},
+ new Object[] { 19533, new float[] { 0.99468416f, 1.0f, 1.8771234f }},
+ new Object[] { 19548, new float[] { 0.99470526f, 1.0f, 1.8774294f }},
+ new Object[] { 19762, new float[] { 0.995005f, 1.0f, 1.8817542f }},
+ new Object[] { 19774, new float[] { 0.9950216f, 1.0f, 1.8819935f }},
+ new Object[] { 20291, new float[] { 0.99572146f, 1.0f, 1.8920314f }},
+ new Object[] { 23018, new float[] { 0.99893945f, 1.0f, 1.9371331f }},
+ new Object[] { 23509, new float[] { 0.999445f, 1.0f, 1.9440757f }},
+ new Object[] { 24761, new float[] { 1.0006485f, 1.0f, 1.9604537f }},
+
+ };
+ }
+
+ @Test
+ @Parameters(method = "cctToXyzExpected")
+ public void testCctToXyzValues(int cct, float[] xyz) {
+ float[] result = ColorSpace.cctToXyz(cct);
+ assertArrayEquals(xyz, result, 1e-3f);
+ }
+
+ private static Object[] chromaticAdaptationNullParameters() {
+ return new Object[] {
+ new Object[] { null, ColorSpace.ILLUMINANT_D50, ColorSpace.ILLUMINANT_D60 },
+ new Object[] { ColorSpace.Adaptation.BRADFORD, null, ColorSpace.ILLUMINANT_D60 },
+ new Object[] { ColorSpace.Adaptation.BRADFORD, ColorSpace.ILLUMINANT_D60, null },
+ };
+ }
+
+ @Test(expected = NullPointerException.class)
+ @Parameters(method = "chromaticAdaptationNullParameters")
+ public void testChromaticAdaptationNullParameters(ColorSpace.Adaptation adaptation,
+ float[] srcWhitePoint, float[] dstWhitePoint) {
+ ColorSpace.chromaticAdaptation(adaptation, srcWhitePoint, dstWhitePoint);
+ }
+
+ private static Object[] chromaticAdaptationWrongSizedArrays() {
+ return new Object[] {
+ new Object[] { ColorSpace.Adaptation.BRADFORD, new float[] { 1.0f },
+ ColorSpace.ILLUMINANT_D60 },
+ new Object[] { ColorSpace.Adaptation.BRADFORD, ColorSpace.ILLUMINANT_D60,
+ new float[] { 1.0f, 1.0f, 1.0f, 1.0f }},
+ };
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ @Parameters(method = "chromaticAdaptationWrongSizedArrays")
+ public void testChromaticAdaptationWrongSizedArrays(ColorSpace.Adaptation adaptation,
+ float[] srcWhitePoint, float[] dstWhitePoint) {
+ ColorSpace.chromaticAdaptation(adaptation, srcWhitePoint, dstWhitePoint);
+ }
+
+ private static float[] sIdentityMatrix = new float[] {
+ 1.0f, 0.0f, 0.0f,
+ 0.0f, 1.0f, 0.0f,
+ 0.0f, 0.0f, 1.0f
+ };
+
+ @Test
+ public void testChromaticAdaptation() {
+ for (ColorSpace.Adaptation adaptation : ColorSpace.Adaptation.values()) {
+ float[][] whitePoints = {
+ ColorSpace.ILLUMINANT_A,
+ ColorSpace.ILLUMINANT_B,
+ ColorSpace.ILLUMINANT_C,
+ ColorSpace.ILLUMINANT_D50,
+ ColorSpace.ILLUMINANT_D55,
+ ColorSpace.ILLUMINANT_D60,
+ ColorSpace.ILLUMINANT_D65,
+ ColorSpace.ILLUMINANT_D75,
+ ColorSpace.ILLUMINANT_E,
+ };
+ for (float[] srcWhitePoint : whitePoints) {
+ for (float[] dstWhitePoint : whitePoints) {
+ float[] result = ColorSpace.chromaticAdaptation(adaptation, srcWhitePoint,
+ dstWhitePoint);
+ assertNotNull(result);
+ assertEquals(9, result.length);
+ if (Arrays.equals(srcWhitePoint, dstWhitePoint)) {
+ assertArrayEquals(sIdentityMatrix, result, 0f);
+ }
+ }
+ }
+ }
+ }
@SuppressWarnings("SameParameterValue")
- private static void assertArrayNotEquals(float[] a, float[] b, float eps) {
+ private void assertArrayNotEquals(float[] a, float[] b, float eps) {
for (int i = 0; i < a.length; i++) {
if (Float.compare(a[i], b[i]) == 0 || Math.abs(a[i] - b[i]) < eps) {
fail("Expected " + a[i] + ", received " + b[i]);
@@ -800,7 +947,7 @@
}
}
- private static void assertArrayEquals(float[] a, float[] b, float eps) {
+ private void assertArrayEquals(float[] a, float[] b, float eps) {
for (int i = 0; i < a.length; i++) {
if (Float.compare(a[i], b[i]) != 0 && Math.abs(a[i] - b[i]) > eps) {
fail("Expected " + a[i] + ", received " + b[i]);
diff --git a/tests/tests/graphics/src/android/graphics/cts/ImageDecoderTest.java b/tests/tests/graphics/src/android/graphics/cts/ImageDecoderTest.java
index 867f8a3..09020e2 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ImageDecoderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ImageDecoderTest.java
@@ -211,6 +211,7 @@
private interface SourceCreator extends IntFunction<ImageDecoder.Source> {};
private SourceCreator[] mCreators = new SourceCreator[] {
+ resId -> ImageDecoder.createSource(getAsByteArray(resId)),
resId -> ImageDecoder.createSource(getAsByteBufferWrap(resId)),
resId -> ImageDecoder.createSource(getAsDirectByteBuffer(resId)),
resId -> ImageDecoder.createSource(getAsReadOnlyByteBuffer(resId)),
@@ -1997,11 +1998,55 @@
}
}
+ @Test(expected = ArrayIndexOutOfBoundsException.class)
+ public void testArrayOutOfBounds() {
+ byte[] array = new byte[10];
+ ImageDecoder.createSource(array, 1, 10);
+ }
+
+ @Test(expected = ArrayIndexOutOfBoundsException.class)
+ public void testOffsetOutOfBounds() {
+ byte[] array = new byte[10];
+ ImageDecoder.createSource(array, 10, 0);
+ }
+
+ @Test(expected = ArrayIndexOutOfBoundsException.class)
+ public void testLengthOutOfBounds() {
+ byte[] array = new byte[10];
+ ImageDecoder.createSource(array, 0, 11);
+ }
+
+ @Test(expected = ArrayIndexOutOfBoundsException.class)
+ public void testNegativeLength() {
+ byte[] array = new byte[10];
+ ImageDecoder.createSource(array, 0, -1);
+ }
+
+ @Test(expected = ArrayIndexOutOfBoundsException.class)
+ public void testNegativeOffset() {
+ byte[] array = new byte[10];
+ ImageDecoder.createSource(array, -1, 10);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testNullByteArray() {
+ ImageDecoder.createSource(null, 0, 0);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testNullByteArray2() {
+ byte[] array = null;
+ ImageDecoder.createSource(array);
+ }
+
+ @Test(expected = IOException.class)
+ public void testZeroLengthByteArray() throws IOException {
+ ImageDecoder.decodeDrawable(ImageDecoder.createSource(new byte[10], 0, 0));
+ }
+
@Test(expected = IOException.class)
public void testZeroLengthByteBuffer() throws IOException {
- Drawable drawable = ImageDecoder.decodeDrawable(
- ImageDecoder.createSource(ByteBuffer.wrap(new byte[10], 0, 0)));
- fail("should not have reached here!");
+ ImageDecoder.decodeDrawable(ImageDecoder.createSource(ByteBuffer.wrap(new byte[10], 0, 0)));
}
private interface ByteBufferSupplier extends Supplier<ByteBuffer> {};
@@ -2094,6 +2139,24 @@
@Test
@Parameters(method = "getRecords")
+ public void testOffsetByteArray2(Record record) throws IOException {
+ ImageDecoder.Source src = ImageDecoder.createSource(getAsByteArray(record.resId));
+ Bitmap expected = ImageDecoder.decodeBitmap(src, (decoder, info, s) -> {
+ decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE);
+ });
+
+ final int offset = 10;
+ final int extra = 15;
+ final byte[] array = getAsByteArray(record.resId, offset, extra);
+ src = ImageDecoder.createSource(array, offset, array.length - (offset + extra));
+ Bitmap actual = ImageDecoder.decodeBitmap(src, (decoder, info, s) -> {
+ decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE);
+ });
+ assertTrue(actual.sameAs(expected));
+ }
+
+ @Test
+ @Parameters(method = "getRecords")
public void testResourceSource(Record record) {
ImageDecoder.Source src = ImageDecoder.createSource(getResources(), record.resId);
try {
diff --git a/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java b/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
index d67411f..07bc33e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
@@ -60,6 +60,180 @@
}
@Test
+ public void testIdentityMatrix() {
+ assertNotNull(Matrix.IDENTITY_MATRIX);
+ assertTrue(Matrix.IDENTITY_MATRIX.isIdentity());
+ assertTrue(Matrix.IDENTITY_MATRIX.isAffine());
+ assertTrue(Matrix.IDENTITY_MATRIX.rectStaysRect());
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSet() {
+ Matrix m = new Matrix();
+ m.setRotate(90);
+ Matrix.IDENTITY_MATRIX.set(m);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixReset() {
+ Matrix.IDENTITY_MATRIX.reset();
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetTranslate() {
+ Matrix.IDENTITY_MATRIX.setTranslate(1f, 1f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetScale() {
+ Matrix.IDENTITY_MATRIX.setScale(.5f, .5f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetScalePivot() {
+ Matrix.IDENTITY_MATRIX.setScale(.5f, .5f, 10f, 10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetRotate() {
+ Matrix.IDENTITY_MATRIX.setRotate(60);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetRotateAbout() {
+ Matrix.IDENTITY_MATRIX.setRotate(60, 100f, 100f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetSinCos() {
+ Matrix.IDENTITY_MATRIX.setSinCos(1f, 2f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetSinCosPivot() {
+ Matrix.IDENTITY_MATRIX.setSinCos(1f, 2f, 3f, 4f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetSkew() {
+ Matrix.IDENTITY_MATRIX.setSkew(1f, 2f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetSkewPivot() {
+ Matrix.IDENTITY_MATRIX.setSkew(1f, 2f, 3f, 4f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetConcat() {
+ Matrix a = new Matrix();
+ Matrix b = new Matrix();
+ Matrix.IDENTITY_MATRIX.setConcat(a, b);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPreTranslate() {
+ Matrix.IDENTITY_MATRIX.preTranslate(10f, 10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPreScale() {
+ Matrix.IDENTITY_MATRIX.preScale(10f, 10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPreScalePivot() {
+ Matrix.IDENTITY_MATRIX.preScale(10f, 10f, 100f, 100f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPreRotate() {
+ Matrix.IDENTITY_MATRIX.preRotate(10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPreRotatePivot() {
+ Matrix.IDENTITY_MATRIX.preRotate(10f, 10f, 10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPreSkew() {
+ Matrix.IDENTITY_MATRIX.preSkew(1f, 3f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPreSkewPivot() {
+ Matrix.IDENTITY_MATRIX.preSkew(1f, 3f, 4f, 7f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPreConcat() {
+ Matrix a = new Matrix();
+ Matrix.IDENTITY_MATRIX.preConcat(a);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPostTranslate() {
+ Matrix.IDENTITY_MATRIX.postTranslate(10f, 10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPostScale() {
+ Matrix.IDENTITY_MATRIX.postScale(10f, 10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPostScalePivot() {
+ Matrix.IDENTITY_MATRIX.postScale(10f, 10f, 100f, 100f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPostRotate() {
+ Matrix.IDENTITY_MATRIX.postRotate(10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPostRotatePivot() {
+ Matrix.IDENTITY_MATRIX.postRotate(10f, 10f, 10f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPostSkew() {
+ Matrix.IDENTITY_MATRIX.postSkew(1f, 3f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPostSkewPivot() {
+ Matrix.IDENTITY_MATRIX.postSkew(1f, 3f, 4f, 7f);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixPostConcat() {
+ Matrix a = new Matrix();
+ Matrix.IDENTITY_MATRIX.postConcat(a);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetRectToRect() {
+ Matrix.IDENTITY_MATRIX.setRectToRect(new RectF(), new RectF(), ScaleToFit.CENTER);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetPolyToPoly() {
+ float[] src = new float[9];
+ src[0] = 100f;
+ float[] dst = new float[9];
+ dst[0] = 200f;
+ dst[1] = 300f;
+ Matrix.IDENTITY_MATRIX.setPolyToPoly(src, 0, dst, 0, 1);
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testIdentityMatrixSetValues() {
+ Matrix.IDENTITY_MATRIX.setValues(new float[9]);
+ }
+
+ @Test
public void testRectStaysRect() {
assertTrue(mMatrix.rectStaysRect());
mMatrix.postRotate(80);
diff --git a/tests/tests/graphics/src/android/graphics/cts/VulkanPreTransformTest.java b/tests/tests/graphics/src/android/graphics/cts/VulkanPreTransformTest.java
index 14d3000..d461535 100644
--- a/tests/tests/graphics/src/android/graphics/cts/VulkanPreTransformTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/VulkanPreTransformTest.java
@@ -143,15 +143,11 @@
return mContext.getPackageManager().hasSystemFeature(requiredFeature);
}
- private static Bitmap takeScreenshot() {
+ private static Bitmap takeScreenshot(int width, int height) {
assertNotNull("sActivity should not be null", sActivity);
- Rect srcRect = new Rect();
- sActivity.findViewById(R.id.surfaceview).getGlobalVisibleRect(srcRect);
SynchronousPixelCopy copy = new SynchronousPixelCopy();
- Bitmap dest =
- Bitmap.createBitmap(srcRect.width(), srcRect.height(), Bitmap.Config.ARGB_8888);
- int copyResult =
- copy.request((SurfaceView) sActivity.findViewById(R.id.surfaceview), srcRect, dest);
+ Bitmap dest = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ int copyResult = copy.request((SurfaceView) sActivity.findViewById(R.id.surfaceview), dest);
assertEquals("PixelCopy failed", PixelCopy.SUCCESS, copyResult);
return dest;
}
@@ -168,11 +164,9 @@
}
private static boolean validatePixelValuesAfterRotation(
- boolean setPreTransform, int preTransformHint) {
- Bitmap bitmap = takeScreenshot();
+ int width, int height, boolean setPreTransform, int preTransformHint) {
+ Bitmap bitmap = takeScreenshot(width, height);
- int width = bitmap.getWidth();
- int height = bitmap.getHeight();
int diff = 0;
if (!setPreTransform || preTransformHint == 0x1 /*VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR*/) {
diff += pixelDiff(bitmap.getPixel(0, 0), 255, 0, 0);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
index 60f7b0a..a371932 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
@@ -559,4 +559,19 @@
resources.getDrawable(R.drawable.testimage).setAlpha(restoreAlpha);
}
}
+
+ @Test
+ public void testSetBitmap() {
+ Resources resources = mContext.getResources();
+ Bitmap source = BitmapFactory.decodeResource(resources, R.raw.testimage);
+ BitmapDrawable bitmapDrawable = new BitmapDrawable(resources, source);
+ assertSame(source, bitmapDrawable.getBitmap());
+
+ Bitmap bm = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+ bitmapDrawable.setBitmap(bm);
+ assertSame(bm, bitmapDrawable.getBitmap());
+
+ bitmapDrawable.setBitmap(null);
+ assertNull(bitmapDrawable.getBitmap());
+ }
}
diff --git a/tests/tests/hardware/Android.bp b/tests/tests/hardware/Android.bp
index d365b37..4114c1a 100644
--- a/tests/tests/hardware/Android.bp
+++ b/tests/tests/hardware/Android.bp
@@ -32,6 +32,7 @@
"compatibility-device-util-axt",
"cts-input-lib",
"ctstestrunner-axt",
+ "cts-wm-util",
"mockito-target-minus-junit4",
"platform-test-annotations",
"ub-uiautomator",
diff --git a/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_homekey.json b/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_homekey.json
new file mode 100644
index 0000000..f3d81d7
--- /dev/null
+++ b/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_homekey.json
@@ -0,0 +1,12 @@
+[
+ {
+ "name": "Press BUTTON_HOME",
+ "reports": [
+ [0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "events": [
+ ]
+ }
+
+]
diff --git a/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_keyeventtests.json b/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_keyeventtests.json
new file mode 100644
index 0000000..26a4523
--- /dev/null
+++ b/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_keyeventtests.json
@@ -0,0 +1,184 @@
+[
+ {
+ "name": "Press BUTTON_A",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_A"},
+ {"action": "UP", "keycode": "BUTTON_A"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_B",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_B"},
+ {"action": "UP", "keycode": "BUTTON_B"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_X",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_X"},
+ {"action": "UP", "keycode": "BUTTON_X"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_Y",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_Y"},
+ {"action": "UP", "keycode": "BUTTON_Y"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_L1",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_L1"},
+ {"action": "UP", "keycode": "BUTTON_L1"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_R1",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_R1"},
+ {"action": "UP", "keycode": "BUTTON_R1"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_L2",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_L2"},
+ {"action": "UP", "keycode": "BUTTON_L2"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_R2",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_R2"},
+ {"action": "UP", "keycode": "BUTTON_R2"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_L3",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_THUMBL"},
+ {"action": "UP", "keycode": "BUTTON_THUMBL"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_R3",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_THUMBR"},
+ {"action": "UP", "keycode": "BUTTON_THUMBR"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_SELECT",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_SELECT"},
+ {"action": "UP", "keycode": "BUTTON_SELECT"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_START",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_START"},
+ {"action": "UP", "keycode": "BUTTON_START"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_HOME",
+ "reports": [
+ [0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BUTTON_MODE"},
+ {"action": "UP", "keycode": "BUTTON_MODE"}
+ ]
+ },
+
+ {
+ "name": "Press BUTTON_BACK",
+ "reports": [
+ [0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "KEYBOARD | GAMEPAD",
+ "events": [
+ {"action": "DOWN", "keycode": "BACK"},
+ {"action": "UP", "keycode": "BACK"}
+ ]
+ }
+
+]
diff --git a/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_motioneventtests.json b/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_motioneventtests.json
new file mode 100644
index 0000000..2d802c9
--- /dev/null
+++ b/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_motioneventtests.json
@@ -0,0 +1,214 @@
+[
+ {
+ "name": "Sanity check - should not produce any events",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ ]
+ },
+
+ {
+ "name": "Press left DPAD key",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_HAT_X": -1}},
+ {"action": "MOVE", "axes": {"AXIS_HAT_X": 0}}
+ ]
+ },
+
+ {
+ "name": "Press right DPAD key",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_HAT_X": 1}},
+ {"action": "MOVE", "axes": {"AXIS_HAT_X": 0}}
+ ]
+ },
+
+ {
+ "name": "Press up DPAD key",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_HAT_Y": -1}},
+ {"action": "MOVE", "axes": {"AXIS_HAT_Y": 0}}
+ ]
+ },
+
+ {
+ "name": "Press down DPAD key",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_HAT_Y": 1}},
+ {"action": "MOVE", "axes": {"AXIS_HAT_Y": 0}}
+ ]
+ },
+
+ {
+ "name": "Left stick - press left",
+ "reports": [
+ [0x01, 0x40, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x00, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_X": -0.5}},
+ {"action": "MOVE", "axes": {"AXIS_X": -1}},
+ {"action": "MOVE", "axes": {"AXIS_X": 0}}
+ ]
+ },
+
+ {
+ "name": "Left stick - press right",
+ "reports": [
+ [0x01, 0xc0, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0xff, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_X": 0.51}},
+ {"action": "MOVE", "axes": {"AXIS_X": 1}},
+ {"action": "MOVE", "axes": {"AXIS_X": 0}}
+ ]
+ },
+
+ {
+ "name": "Left stick - press up",
+ "reports": [
+ [0x01, 0x80, 0x40, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x00, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_Y": -0.5}},
+ {"action": "MOVE", "axes": {"AXIS_Y": -1}},
+ {"action": "MOVE", "axes": {"AXIS_Y": 0}}
+ ]
+ },
+
+ {
+ "name": "Left stick - press down",
+ "reports": [
+ [0x01, 0x80, 0xc0, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0xff, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_Y": 0.51}},
+ {"action": "MOVE", "axes": {"AXIS_Y": 1}},
+ {"action": "MOVE", "axes": {"AXIS_Y": 0}}
+ ]
+ },
+
+ {
+ "name": "Right stick - press left",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x40, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x00, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_Z": -0.5}},
+ {"action": "MOVE", "axes": {"AXIS_Z": -1}},
+ {"action": "MOVE", "axes": {"AXIS_Z": 0}}
+ ]
+ },
+
+ {
+ "name": "Right stick - press right",
+ "reports": [
+ [0x01, 0x80, 0x80, 0xc0, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0xff, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_Z": 0.51}},
+ {"action": "MOVE", "axes": {"AXIS_Z": 1}},
+ {"action": "MOVE", "axes": {"AXIS_Z": 0}}
+ ]
+ },
+
+ {
+ "name": "Right stick - press up",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_RZ": -0.5}},
+ {"action": "MOVE", "axes": {"AXIS_RZ": -1}},
+ {"action": "MOVE", "axes": {"AXIS_RZ": 0}}
+ ]
+ },
+
+ {
+ "name": "Right stick - press down",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0xc0, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0xff, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": {"AXIS_RZ": 0.51}},
+ {"action": "MOVE", "axes": {"AXIS_RZ": 1}},
+ {"action": "MOVE", "axes": {"AXIS_RZ": 0}}
+ ]
+ },
+
+ {
+ "name": "Left trigger - quick press",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x10, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x10, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": { "AXIS_LTRIGGER": 0.5, "AXIS_BRAKE": 0.5}},
+ {"action": "MOVE", "axes": { "AXIS_LTRIGGER": 1.0, "AXIS_BRAKE": 1.0}},
+ {"action": "MOVE", "axes": { "AXIS_LTRIGGER": 0.0, "AXIS_BRAKE": 0.0}}
+ ]
+ },
+
+ {
+ "name": "Right trigger - quick press",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x20, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x20, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ ],
+ "source": "JOYSTICK",
+ "events": [
+ {"action": "MOVE", "axes": { "AXIS_RTRIGGER": 0.5, "AXIS_GAS": 0.5}},
+ {"action": "MOVE", "axes": { "AXIS_RTRIGGER": 1.0, "AXIS_GAS": 1.0}},
+ {"action": "MOVE", "axes": { "AXIS_RTRIGGER": 0.0, "AXIS_GAS": 0.0}}
+ ]
+ }
+
+]
diff --git a/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_register.json b/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_register.json
new file mode 100644
index 0000000..8ac2685
--- /dev/null
+++ b/tests/tests/hardware/res/raw/razer_raiju_mobile_bluetooth_register.json
@@ -0,0 +1,21 @@
+{
+ "id": 1,
+ "command": "register",
+ "name": "Razer Raiju Mobile(Bluetooth Test)",
+ "vid": 0x1532,
+ "pid": 0x0707,
+ "bus": "bluetooth",
+ "descriptor": [0x05, 0x01, 0x09, 0x05, 0xa1, 0x01, 0x85, 0x01, 0x09, 0x30, 0x09, 0x31, 0x09, 0x32,
+ 0x09, 0x35, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75, 0x08, 0x95, 0x04, 0x81, 0x02, 0x09, 0x39,
+ 0x15, 0x00, 0x25, 0x07, 0x35, 0x00, 0x46, 0x3b, 0x01, 0x65, 0x14, 0x75, 0x04, 0x95, 0x01,
+ 0x81, 0x42, 0x65, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x0f, 0x15, 0x00, 0x25, 0x01, 0x75,
+ 0x01, 0x95, 0x0f, 0x81, 0x02, 0x75, 0x0d, 0x95, 0x01, 0x81, 0x03, 0x05, 0x02, 0x09, 0xc5,
+ 0x09, 0xc4, 0x15, 0x00, 0x26, 0xff, 0x00, 0x35, 0x00, 0x46, 0xff, 0x00, 0x75, 0x08, 0x95,
+ 0x02, 0x81, 0x02, 0x06, 0x00, 0xff, 0x09, 0x21, 0x95, 0x02, 0x81, 0x02, 0x85, 0x03, 0x0a,
+ 0x21, 0x27, 0x95, 0x2f, 0xb1, 0x02, 0xc0, 0x05, 0x0c, 0x09, 0x01, 0xa1, 0x01, 0x85, 0x02,
+ 0x0a, 0x23, 0x02, 0x0a, 0x24, 0x02, 0x09, 0x40, 0x09, 0xe9, 0x09, 0xea, 0x09, 0x30, 0x09,
+ 0x32, 0x0a, 0xa2, 0x01, 0x15, 0x00, 0x25, 0x01, 0x75, 0x01, 0x95, 0x08, 0x81, 0x02, 0x75,
+ 0x01, 0x95, 0x08, 0x81, 0x03, 0x75, 0x08, 0x95, 0x0a, 0x81, 0x01, 0xc0, 0x05, 0x01, 0x09,
+ 0x00, 0xa1, 0x01, 0x85, 0x07, 0x09, 0x03, 0x15, 0x00, 0x26, 0xff, 0x00, 0x35, 0x00, 0x46,
+ 0xff, 0x00, 0x75, 0x08, 0x95, 0x0c, 0x81, 0x00, 0xc0]
+}
diff --git a/tests/tests/hardware/res/raw/razer_serval_homekey.json b/tests/tests/hardware/res/raw/razer_serval_homekey.json
new file mode 100644
index 0000000..0b39087
--- /dev/null
+++ b/tests/tests/hardware/res/raw/razer_serval_homekey.json
@@ -0,0 +1,11 @@
+[
+ {
+ "name": "Press HOME",
+ "reports": [
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x80, 0x00, 0x00, 0x00, 0xff],
+ [0x01, 0x80, 0x80, 0x80, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0xff]
+ ],
+ "events": [
+ ]
+ }
+]
\ No newline at end of file
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/InputCtsActivity.java b/tests/tests/hardware/src/android/hardware/input/cts/InputCtsActivity.java
index 028b18e..42e75f8 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/InputCtsActivity.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/InputCtsActivity.java
@@ -18,13 +18,17 @@
import android.app.Activity;
import android.os.Bundle;
+import android.util.Log;
import android.view.KeyEvent;
import android.view.MotionEvent;
+import java.util.ArrayList;
+
public class InputCtsActivity extends Activity {
private static final String TAG = "InputCtsActivity";
private InputCallback mInputCallback;
+ private final ArrayList<Integer> mUnhandledKeys = new ArrayList<>();
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -60,10 +64,23 @@
if (mInputCallback != null) {
mInputCallback.onKeyEvent(ev);
}
+ // Do not handle keys in UnhandledKeys list, let it fallback
+ if (mUnhandledKeys.contains(ev.getKeyCode())) {
+ Log.i(TAG, "Unhandled keyEvent: " + ev);
+ return false;
+ }
return true;
}
public void setInputCallback(InputCallback callback) {
mInputCallback = callback;
}
+
+ public void addUnhandleKeyCode(int keyCode) {
+ mUnhandledKeys.add(keyCode);
+ }
+
+ public void clearUnhandleKeyCode() {
+ mUnhandledKeys.clear();
+ }
}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
index 6239026..ff5476d 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
@@ -78,6 +78,7 @@
public void setUp() {
mInstrumentation = InstrumentationRegistry.getInstrumentation();
mActivityRule.getActivity().setInputCallback(mInputListener);
+ mActivityRule.getActivity().clearUnhandleKeyCode();
mDecorView = mActivityRule.getActivity().getWindow().getDecorView();
mParser = new HidJsonParser(mInstrumentation.getTargetContext());
int hidDeviceId = mParser.readDeviceId(mRegisterResourceId);
@@ -212,31 +213,33 @@
private InputEvent waitForEvent() {
try {
- return mEvents.poll(5, TimeUnit.SECONDS);
+ return mEvents.poll(1, TimeUnit.SECONDS);
} catch (InterruptedException e) {
failWithMessage("unexpectedly interrupted while waiting for InputEvent");
return null;
}
}
+ // Ignore Motion event received during the 5 seconds timeout period. Return on the first Key
+ // event received.
private KeyEvent waitForKey() {
- InputEvent event = waitForEvent();
- if (event instanceof KeyEvent) {
- return (KeyEvent) event;
- }
- if (event instanceof MotionEvent) {
- failWithMessage("Instead of a key event, received " + event);
+ for (int i = 0; i < 5; i++) {
+ InputEvent event = waitForEvent();
+ if (event instanceof KeyEvent) {
+ return (KeyEvent) event;
+ }
}
return null;
}
+ // Ignore Key event received during the 5 seconds timeout period. Return on the first Motion
+ // event received.
private MotionEvent waitForMotion() {
- InputEvent event = waitForEvent();
- if (event instanceof MotionEvent) {
- return (MotionEvent) event;
- }
- if (event instanceof KeyEvent) {
- failWithMessage("Instead of a motion event, received " + event);
+ for (int i = 0; i < 5; i++) {
+ InputEvent event = waitForEvent();
+ if (event instanceof MotionEvent) {
+ return (MotionEvent) event;
+ }
}
return null;
}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerRaijuMobileBluetoothTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerRaijuMobileBluetoothTest.java
new file mode 100644
index 0000000..01d9d3c
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerRaijuMobileBluetoothTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 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.hardware.input.cts.tests;
+
+import android.hardware.cts.R;
+import android.server.wm.WindowManagerStateHelper;
+import android.view.KeyEvent;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RazerRaijuMobileBluetoothTest extends InputTestCase {
+
+ // Simulates the behavior of Razer Raiju Mobile gamepad.
+ public RazerRaijuMobileBluetoothTest() {
+ super(R.raw.razer_raiju_mobile_bluetooth_register);
+ }
+
+ @Test
+ public void testAllKeys() {
+ testInputEvents(R.raw.razer_raiju_mobile_bluetooth_keyeventtests);
+ }
+
+ @Test
+ public void testAllMotions() {
+ testInputEvents(R.raw.razer_raiju_mobile_bluetooth_motioneventtests);
+ }
+
+ /**
+ * Add BUTTON_MODE to the activity's unhandled keys list to allow the fallback
+ * of HOME. Do home button behavior check with wm utils.
+ */
+ @Test
+ public void testHomeKey() throws Exception {
+ mActivityRule.getActivity().addUnhandleKeyCode(KeyEvent.KEYCODE_BUTTON_MODE);
+ testInputEvents(R.raw.razer_raiju_mobile_bluetooth_homekey);
+
+ WindowManagerStateHelper wmStateHelper = new WindowManagerStateHelper();
+
+ wmStateHelper.waitForHomeActivityVisible();
+ wmStateHelper.assertHomeActivityVisible(true);
+ }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerServalTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerServalTest.java
index 2122085..2cc84d6 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerServalTest.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerServalTest.java
@@ -17,6 +17,7 @@
package android.hardware.input.cts.tests;
import android.hardware.cts.R;
+import android.server.wm.WindowManagerStateHelper;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
@@ -43,4 +44,18 @@
public void testAllMotions() {
testInputEvents(R.raw.razer_serval_motioneventtests);
}
+
+ /**
+ * We cannot test the home key using "testAllKeys" because the home key does not go to the
+ * apps, and therefore cannot be received in InputCtsActivity.
+ * Instead, we rely on the home button behaviour check using the wm utils.
+ */
+ @Test
+ public void testHomeKey() {
+ testInputEvents(R.raw.razer_serval_homekey);
+ WindowManagerStateHelper wmStateHelper = new WindowManagerStateHelper();
+
+ wmStateHelper.waitForHomeActivityVisible();
+ wmStateHelper.assertHomeActivityVisible(true);
+ }
}
diff --git a/tests/tests/jni/src/android/jni/cts/LinkerNamespacesHelper.java b/tests/tests/jni/src/android/jni/cts/LinkerNamespacesHelper.java
index 6cd2441..0af0f1a 100644
--- a/tests/tests/jni/src/android/jni/cts/LinkerNamespacesHelper.java
+++ b/tests/tests/jni/src/android/jni/cts/LinkerNamespacesHelper.java
@@ -188,7 +188,7 @@
Collections.addAll(systemLibs, PUBLIC_SYSTEM_LIBRARIES);
Collections.addAll(systemLibs, OPTIONAL_SYSTEM_LIBRARIES);
- // System path could contain public ART libraries on foreign arch. http://b/149852946
+ // System path could contain public ART libraries on foreign arch. http://b/149852946
if (isForeignArchitecture()) {
Collections.addAll(systemLibs, PUBLIC_ART_LIBRARIES);
}
diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
index 7605d61..260be3f 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -240,6 +240,7 @@
}
@RestrictedBuildTest
+ @RequiresDevice
public void testEcAttestation_DeviceLocked() throws Exception {
String keystoreAlias = "test_key";
Date now = new Date();
diff --git a/tests/tests/libcoreapievolution/TEST_MAPPING b/tests/tests/libcoreapievolution/TEST_MAPPING
new file mode 100644
index 0000000..40dc97e
--- /dev/null
+++ b/tests/tests/libcoreapievolution/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsLibcoreApiEvolutionTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/libcorefileio/AndroidManifest.xml b/tests/tests/libcorefileio/AndroidManifest.xml
index 1271089..7ef7c14 100644
--- a/tests/tests/libcorefileio/AndroidManifest.xml
+++ b/tests/tests/libcorefileio/AndroidManifest.xml
@@ -16,17 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.libcorefileio.cts">
+ package="android.libcorefileio.cts">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application>
<uses-library android:name="android.test.runner"/>
<service android:name="android.cts.LockHoldingService"
- android:process=":lockHoldingService"
- android:permission="android.permission.WRITE_EXTERNAL_STORAGE"
- />
- <receiver android:name="android.cts.FileChannelInterProcessLockTest$IntentReceiver">
+ android:process=":lockHoldingService"
+ android:permission="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <receiver android:name="android.cts.FileChannelInterProcessLockTest$IntentReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.cts.CtsLibcoreFileIOTestCases">
@@ -37,10 +37,9 @@
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.libcorefileio.cts">
+ android:targetPackage="android.libcorefileio.cts">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener"/>
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/libcorelegacy22/TEST_MAPPING b/tests/tests/libcorelegacy22/TEST_MAPPING
new file mode 100644
index 0000000..acefbee
--- /dev/null
+++ b/tests/tests/libcorelegacy22/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsLibcoreLegacy22TestCases"
+ }
+ ]
+}
diff --git a/tests/tests/match_flags/app/a/AndroidManifest.xml b/tests/tests/match_flags/app/a/AndroidManifest.xml
index 8ad54de..6ad9415 100644
--- a/tests/tests/match_flags/app/a/AndroidManifest.xml
+++ b/tests/tests/match_flags/app/a/AndroidManifest.xml
@@ -16,16 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.matchflags.app.uniqueandshared">
+ package="android.matchflags.app.uniqueandshared">
<application>
<uses-library android:name="android.test.runner"/>
- <activity android:name="android.matchflags.cts.app.TestActivity">
+ <activity android:name="android.matchflags.cts.app.TestActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:scheme="https"
- android:host="unique-5gle2bs6woovjn8xabwyb3js01xl0ducci3gd3fpe622h48lyg.com"/>
+ android:host="unique-5gle2bs6woovjn8xabwyb3js01xl0ducci3gd3fpe622h48lyg.com"/>
</intent-filter>
<intent-filter>
<action android:name="android.matchflags.app.UNIQUE_ACTION"/>
diff --git a/tests/tests/match_flags/app/b/AndroidManifest.xml b/tests/tests/match_flags/app/b/AndroidManifest.xml
index 6d2c9d0..4a0d85a 100644
--- a/tests/tests/match_flags/app/b/AndroidManifest.xml
+++ b/tests/tests/match_flags/app/b/AndroidManifest.xml
@@ -16,10 +16,11 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.matchflags.app.shared">
+ package="android.matchflags.app.shared">
<application>
<uses-library android:name="android.test.runner"/>
- <activity android:name="android.matchflags.cts.app.TestActivity">
+ <activity android:name="android.matchflags.cts.app.TestActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.matchflags.app.SHARED_ACTION"/>
<category android:name="android.intent.category.DEFAULT"/>
diff --git a/tests/tests/media/AndroidManifest.xml b/tests/tests/media/AndroidManifest.xml
index e316b4d..11579cd 100644
--- a/tests/tests/media/AndroidManifest.xml
+++ b/tests/tests/media/AndroidManifest.xml
@@ -15,152 +15,163 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.media.cts"
- android:targetSandboxVersion="2">
+ package="android.media.cts"
+ android:targetSandboxVersion="2">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
- <uses-permission android:name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" />
- <uses-permission android:name="android.permission.SET_MEDIA_KEY_LISTENER" />
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
- <uses-permission android:name="android.permission.INSTANT_APP_FOREGROUND_SERVICE" />
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission android:name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER"/>
+ <uses-permission android:name="android.permission.SET_MEDIA_KEY_LISTENER"/>
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <uses-permission android:name="android.permission.INSTANT_APP_FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.VIBRATE" />
+ <uses-permission android:name="android.permission.VIBRATE"/>
- <permission android:name="android.media.cts" android:protectionLevel="normal" />
+ <permission android:name="android.media.cts"
+ android:protectionLevel="normal"/>
- <application
- android:networkSecurityConfig="@xml/network_security_config"
- android:requestLegacyExternalStorage="true"
- android:largeHeap="true">
- <uses-library android:name="android.test.runner" />
- <uses-library android:name="org.apache.http.legacy" android:required="false" />
+ <application android:networkSecurityConfig="@xml/network_security_config"
+ android:requestLegacyExternalStorage="true"
+ android:largeHeap="true">
+ <uses-library android:name="android.test.runner"/>
+ <uses-library android:name="org.apache.http.legacy"
+ android:required="false"/>
<activity android:name="android.media.cts.MediaProjectionActivity"
- android:label="MediaProjectionActivity"
- android:screenOrientation="locked"/>
+ android:label="MediaProjectionActivity"
+ android:screenOrientation="locked"/>
<activity android:name="android.media.cts.AudioManagerStub"
- android:label="AudioManagerStub"/>
+ android:label="AudioManagerStub"/>
<activity android:name="android.media.cts.AudioManagerStubHelper"
- android:label="AudioManagerStubHelper"/>
+ android:label="AudioManagerStubHelper"/>
<activity android:name="android.media.cts.DecodeAccuracyTestActivity"
- android:label="DecodeAccuracyTestActivity"
- android:screenOrientation="locked"
- android:configChanges="mcc|mnc|keyboard|keyboardHidden|orientation|screenSize|navigation">
+ android:label="DecodeAccuracyTestActivity"
+ android:screenOrientation="locked"
+ android:configChanges="mcc|mnc|keyboard|keyboardHidden|orientation|screenSize|navigation"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.media.cts.MediaSessionTestActivity"
- android:label="MediaSessionTestActivity"
- android:screenOrientation="nosensor"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+ android:label="MediaSessionTestActivity"
+ android:screenOrientation="nosensor"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.media.cts.MediaStubActivity"
- android:label="MediaStubActivity"
- android:screenOrientation="nosensor"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+ android:label="MediaStubActivity"
+ android:screenOrientation="nosensor"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.media.cts.MediaStubActivity2"
- android:label="MediaStubActivity2"
- android:screenOrientation="nosensor"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+ android:label="MediaStubActivity2"
+ android:screenOrientation="nosensor"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.media.cts.FaceDetectorStub"
- android:label="FaceDetectorStub"/>
+ android:label="FaceDetectorStub"/>
<activity android:name="android.media.cts.MediaPlayerSurfaceStubActivity"
- android:label="MediaPlayerSurfaceStubActivity">
+ android:label="MediaPlayerSurfaceStubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.media.cts.ResourceManagerStubActivity"
- android:label="ResourceManagerStubActivity">
+ android:label="ResourceManagerStubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.media.cts.ResourceManagerTestActivity1"
- android:label="ResourceManagerTestActivity1"
- android:process=":mediaCodecTestProcess1">
+ android:label="ResourceManagerTestActivity1"
+ android:process=":mediaCodecTestProcess1">
</activity>
<activity android:name="android.media.cts.ResourceManagerTestActivity2"
- android:label="ResourceManagerTestActivity2"
- android:process=":mediaCodecTestProcess2">
+ android:label="ResourceManagerTestActivity2"
+ android:process=":mediaCodecTestProcess2">
</activity>
<activity android:name="android.media.cts.RingtonePickerActivity"
- android:label="RingtonePickerActivity">
+ android:label="RingtonePickerActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity android:name="android.media.cts.MockActivity" />
+ <activity android:name="android.media.cts.MockActivity"/>
<service android:name="android.media.cts.RemoteVirtualDisplayService"
- android:process=":remoteService" >
+ android:process=":remoteService"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</service>
- <service android:name="android.media.cts.StubMediaBrowserService">
+ <service android:name="android.media.cts.StubMediaBrowserService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.browse.MediaBrowserService" />
+ <action android:name="android.media.browse.MediaBrowserService"/>
</intent-filter>
</service>
<service android:name="android.media.cts.StubMediaSession2Service"
- android:permission="android.media.cts">
+ android:permission="android.media.cts"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.MediaSession2Service" />
+ <action android:name="android.media.MediaSession2Service"/>
</intent-filter>
</service>
<service android:name="android.media.cts.LocalMediaProjectionService"
- android:foregroundServiceType="mediaProjection"
- android:enabled="true">
+ android:foregroundServiceType="mediaProjection"
+ android:enabled="true">
</service>
<service android:name=".StubMediaRoute2ProviderService"
- android:exported="true">
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.MediaRoute2ProviderService" />
+ <action android:name="android.media.MediaRoute2ProviderService"/>
</intent-filter>
</service>
- <receiver android:name="android.media.cts.MediaButtonReceiver" />
+ <receiver android:name="android.media.cts.MediaButtonReceiver"/>
</application>
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.media.cts"
- android:label="CTS tests of android.media">
+ android:targetPackage="android.media.cts"
+ android:label="CTS tests of android.media">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/media/res/raw/audio_with_metadata.mp3 b/tests/tests/media/res/raw/audio_with_metadata.mp3
new file mode 100644
index 0000000..04f65bc
--- /dev/null
+++ b/tests/tests/media/res/raw/audio_with_metadata.mp3
Binary files differ
diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index 11aeb5e..d3ef002 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -37,6 +37,7 @@
import static android.media.AudioManager.VIBRATE_TYPE_RINGER;
import static android.provider.Settings.System.SOUND_EFFECTS_ENABLED;
+import android.app.INotificationManager;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.BroadcastReceiver;
@@ -50,6 +51,7 @@
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.MicrophoneInfo;
+import android.os.ServiceManager;
import android.os.Vibrator;
import android.platform.test.annotations.AppModeFull;
import android.provider.Settings;
@@ -88,13 +90,13 @@
// But DND access is disabled completely on low ram devices,
// so completely skip those tests here.
// These tests are migrated to CTS verifier tests to ensure test coverage.
- private boolean mSupportNotificationPolicyAccess;
private Context mContext;
private int mOriginalRingerMode;
private Map<Integer, Integer> mOriginalStreamVolumes = new HashMap<>();
private NotificationManager.Policy mOriginalNotificationPolicy;
private int mOriginalZen;
private boolean mDoNotCheckUnmute;
+ private boolean mAppsBypassingDnd;
@Override
protected void setUp() throws Exception {
@@ -104,6 +106,7 @@
mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
mNm = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+ mAppsBypassingDnd = NotificationManager.getService().areChannelsBypassingDnd();
mHasVibrator = (vibrator != null) && vibrator.hasVibrator();
mUseFixedVolume = mContext.getResources().getBoolean(
Resources.getSystem().getIdentifier("config_useFixedVolume", "bool", "android"));
@@ -142,7 +145,6 @@
mContext.getPackageName(), getInstrumentation(), false);
}
-
// Check original mirchrophone mute/unmute status
mDoNotCheckUnmute = false;
if (mAudioManager.isMicrophoneMute()) {
@@ -1198,9 +1200,15 @@
assertTrue("Alarm stream should be muted",
mAudioManager.isStreamMute(AudioManager.STREAM_ALARM));
- // Test requires that the phone's default state has no channels that can bypass dnd
- assertTrue("Ringer stream should be muted",
- mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ // if channels cannot bypass DND, the Ringer stream should be muted, else it
+ // shouldn't be muted
+ if (!mAppsBypassingDnd) {
+ assertTrue("Ringer stream should be muted",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ } else {
+ assertFalse("Ringer stream shouldn't be muted b/c channels can bypass DND",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ }
} finally {
setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
}
@@ -1233,9 +1241,15 @@
assertTrue("Alarm stream should be muted",
mAudioManager.isStreamMute(AudioManager.STREAM_ALARM));
- // Test requires that the phone's default state has no channels that can bypass dnd
- assertTrue("Ringer stream should be muted",
- mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ // if channels cannot bypass DND, the Ringer stream should be muted, else it
+ // shouldn't be muted
+ if (!mAppsBypassingDnd) {
+ assertTrue("Ringer stream should be muted",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ } else {
+ assertFalse("Ringer stream shouldn't be muted b/c channels can bypass DND",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ }
} finally {
setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
}
@@ -1303,10 +1317,8 @@
mAudioManager.isStreamMute(AudioManager.STREAM_SYSTEM));
assertTrue("Alarm stream should be muted",
mAudioManager.isStreamMute(AudioManager.STREAM_ALARM));
-
- // Test requires that the phone's default state has no channels that can bypass dnd
- assertTrue("Ringer stream should be muted",
- mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ assertTrue("Ringer stream should be muted",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
} finally {
setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
}
@@ -1340,9 +1352,15 @@
assertFalse("Alarm stream should not be muted",
mAudioManager.isStreamMute(AudioManager.STREAM_ALARM));
- // Test requires that the phone's default state has no channels that can bypass dnd
- assertTrue("Ringer stream should be muted",
- mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ // if channels cannot bypass DND, the Ringer stream should be muted, else it
+ // shouldn't be muted
+ if (!mAppsBypassingDnd) {
+ assertTrue("Ringer stream should be muted",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ } else {
+ assertFalse("Ringer stream shouldn't be muted b/c channels can bypass DND",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ }
} finally {
setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
}
@@ -1430,8 +1448,16 @@
mAudioManager.isStreamMute(AudioManager.STREAM_SYSTEM));
assertTrue("Alarm stream should still be muted",
mAudioManager.isStreamMute(AudioManager.STREAM_ALARM));
- assertTrue("Ringer stream should now be muted",
- mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+
+ // if channels cannot bypass DND, the Ringer stream should be muted, else it
+ // shouldn't be muted
+ if (!mAppsBypassingDnd) {
+ assertTrue("Ringer stream should be muted",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ } else {
+ assertFalse("Ringer stream shouldn't be muted b/c channels can bypass DND",
+ mAudioManager.isStreamMute(AudioManager.STREAM_RING));
+ }
} finally {
setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
mNm.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackOffloadTest.java b/tests/tests/media/src/android/media/cts/AudioTrackOffloadTest.java
index b804ac2..d850008 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackOffloadTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackOffloadTest.java
@@ -32,6 +32,8 @@
import java.io.InputStream;
import java.util.concurrent.Executor;
+import static org.testng.Assert.assertThrows;
+
@NonMediaMainlineTest
public class AudioTrackOffloadTest extends CtsAndroidTestCase {
private static final String TAG = "AudioTrackOffloadTest";
@@ -39,6 +41,8 @@
private static final int BUFFER_SIZE_SEC = 3;
private static final int PRESENTATION_END_TIMEOUT_MS = 8 * 1000; // 8s
+ private static final int AUDIOTRACK_DEFAULT_SAMPLE_RATE = 44100;
+ private static final int AUDIOTRACK_DEFAULT_CHANNEL_MASK = AudioFormat.CHANNEL_OUT_STEREO;
private static final AudioAttributes DEFAULT_ATTR = new AudioAttributes.Builder().build();
@@ -70,54 +74,69 @@
public void testMP3AudioTrackOffload() throws Exception {
testAudioTrackOffload(R.raw.sine1khzs40dblong,
- /* bitRateInkbps= */ 192,
- getAudioFormatWithEncoding(AudioFormat.ENCODING_MP3));
+ /* bitRateInkbps= */ 192,
+ getAudioFormatWithEncoding(AudioFormat.ENCODING_MP3));
}
public void testOpusAudioTrackOffload() throws Exception {
testAudioTrackOffload(R.raw.testopus,
- /* bitRateInkbps= */ 118, // Average
- getAudioFormatWithEncoding(AudioFormat.ENCODING_OPUS));
+ /* bitRateInkbps= */ 118, // Average
+ getAudioFormatWithEncoding(AudioFormat.ENCODING_OPUS));
}
- /** Test offload of an audio resource that MUST be at least 3sec long. */
+ private AudioTrack getOffloadAudioTrack(@RawRes int audioRes, int bitRateInkbps,
+ AudioFormat audioFormat) {
+ if (!AudioManager.isOffloadedPlaybackSupported(audioFormat, DEFAULT_ATTR)) {
+ Log.i(TAG, "skipping testAudioTrackOffload as offload encoding "
+ + audioFormat.getEncoding() + " is not supported");
+ // cannot test if offloading is not supported
+ return null;
+ }
+
+ int bufferSizeInBytes = bitRateInkbps * 1000 * BUFFER_SIZE_SEC / 8;
+ // format is offloadable, test playback head is progressing
+ AudioTrack track = new AudioTrack.Builder()
+ .setAudioAttributes(DEFAULT_ATTR)
+ .setAudioFormat(audioFormat)
+ .setTransferMode(AudioTrack.MODE_STREAM)
+ .setBufferSizeInBytes(bufferSizeInBytes)
+ .setOffloadedPlayback(true)
+ .build();
+ assertNotNull("Couldn't create offloaded AudioTrack", track);
+ assertEquals("Unexpected track sample rate", AUDIOTRACK_DEFAULT_SAMPLE_RATE,
+ track.getSampleRate());
+ assertEquals("Unexpected track channel mask", AUDIOTRACK_DEFAULT_CHANNEL_MASK,
+ track.getChannelConfiguration());
+ return track;
+ }
+
+ /**
+ * Test offload of an audio resource that MUST be at least 3sec long.
+ */
private void testAudioTrackOffload(@RawRes int audioRes, int bitRateInkbps,
AudioFormat audioFormat) throws Exception {
AudioTrack track = null;
- int bufferSizeInBytes3sec = bitRateInkbps * 1024 * 3 / 8;
try (AssetFileDescriptor audioToOffload = getContext().getResources()
.openRawResourceFd(audioRes);
InputStream audioInputStream = audioToOffload.createInputStream()) {
- if (!AudioManager.isOffloadedPlaybackSupported(audioFormat, DEFAULT_ATTR)) {
- Log.i(TAG, "skipping testAudioTrackOffload as offload encoding "
- + audioFormat.getEncoding() + " is not supported");
- // cannot test if offloading is not supported
+ track = getOffloadAudioTrack(audioRes, bitRateInkbps, audioFormat);
+ if (track == null) {
return;
}
- // format is offloadable, test playback head is progressing
- track = new AudioTrack.Builder()
- .setAudioAttributes(DEFAULT_ATTR)
- .setAudioFormat(audioFormat)
- .setTransferMode(AudioTrack.MODE_STREAM)
- .setBufferSizeInBytes(bufferSizeInBytes3sec)
- .setOffloadedPlayback(true).build();
- assertNotNull("Couldn't create offloaded AudioTrack", track);
- assertEquals("Unexpected track sample rate", 44100, track.getSampleRate());
- assertEquals("Unexpected track channel config", AudioFormat.CHANNEL_OUT_STEREO,
- track.getChannelConfiguration());
-
try {
track.registerStreamEventCallback(mExec, null);
fail("Shouldn't be able to register null StreamEventCallback");
- } catch (Exception e) { }
+ } catch (Exception e) {
+ }
track.registerStreamEventCallback(mExec, mCallback);
+ int bufferSizeInBytes3sec = bitRateInkbps * 1000 * 3 / 8;
final byte[] data = new byte[bufferSizeInBytes3sec];
final int read = audioInputStream.read(data);
assertEquals("Could not read enough audio from the resource file",
- bufferSizeInBytes3sec, read);
+ bufferSizeInBytes3sec, read);
track.play();
int written = 0;
@@ -129,13 +148,18 @@
}
written += wrote;
}
+
try {
Thread.sleep(1 * 1000);
- synchronized(mPresEndLock) {
+ synchronized (mPresEndLock) {
+ track.setOffloadEndOfStream();
+
track.stop();
mPresEndLock.safeWait(PRESENTATION_END_TIMEOUT_MS);
}
- } catch (InterruptedException e) { fail("Error while sleeping"); }
+ } catch (InterruptedException e) {
+ fail("Error while sleeping");
+ }
synchronized (mEventCallbackLock) {
assertTrue("onDataRequest not called", mCallback.mDataRequestCount > 0);
}
@@ -153,14 +177,78 @@
track.unregisterStreamEventCallback(mCallback);
track.release();
}
+ };
+ }
+
+ private AudioTrack allocNonOffloadAudioTrack() {
+ // Attrributes the AudioTrack are irrelevant in this case. We just need to provide
+ // an AudioTrack that IS NOT offloaded so that we can demonstrate failure.
+ AudioTrack track = new AudioTrack.Builder()
+ .setBufferSizeInBytes(2048/*arbitrary*/)
+ .build();
+
+ assert(track != null);
+ return track;
+ }
+
+ // Arbitrary values..
+ private static final int TEST_DELAY = 50;
+ private static final int TEST_PADDING = 100;
+ public void testOffloadPadding() {
+ AudioTrack track =
+ getOffloadAudioTrack(R.raw.sine1khzs40dblong,
+ /* bitRateInkbps= */ 192,
+ getAudioFormatWithEncoding(AudioFormat.ENCODING_MP3));
+ if (track == null) {
+ return;
}
+
+ assertTrue(track.getOffloadPadding() >= 0);
+
+ track.setOffloadDelayPadding(0 /*delayInFrames*/, 0 /*paddingInFrames*/);
+
+ int offloadDelay;
+ offloadDelay = track.getOffloadDelay();
+ assertEquals(0, offloadDelay);
+
+ int padding = track.getOffloadPadding();
+ assertEquals(0, padding);
+
+ track.setOffloadDelayPadding(
+ TEST_DELAY /*delayInFrames*/,
+ TEST_PADDING /*paddingInFrames*/);
+ offloadDelay = track.getOffloadDelay();
+ assertEquals(TEST_DELAY, offloadDelay);
+ padding = track.getOffloadPadding();
+ assertEquals(TEST_PADDING, padding);
+ }
+
+ public void testIsOffloadedPlayback() {
+ // non-offloaded case
+ AudioTrack nonOffloadTrack = allocNonOffloadAudioTrack();
+ assertFalse(nonOffloadTrack.isOffloadedPlayback());
+
+ // offloaded case
+ AudioTrack offloadTrack =
+ getOffloadAudioTrack(R.raw.sine1khzs40dblong,
+ /* bitRateInkbps= */ 192,
+ getAudioFormatWithEncoding(AudioFormat.ENCODING_MP3));
+ assertTrue(offloadTrack.isOffloadedPlayback());
+ }
+
+ public void testSetOffloadEndOfStreamWithNonOffloadedTrack() {
+ // Non-offload case
+ AudioTrack nonOffloadTrack = allocNonOffloadAudioTrack();
+ assertFalse(nonOffloadTrack.isOffloadedPlayback());
+ org.testng.Assert.assertThrows(IllegalStateException.class,
+ () -> nonOffloadTrack.setOffloadEndOfStream());
}
private static AudioFormat getAudioFormatWithEncoding(int encoding) {
return new AudioFormat.Builder()
.setEncoding(encoding)
- .setSampleRate(44100)
- .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO)
+ .setSampleRate(AUDIOTRACK_DEFAULT_SAMPLE_RATE)
+ .setChannelMask(AUDIOTRACK_DEFAULT_CHANNEL_MASK)
.build();
}
diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java
index 8c90275..727f251 100644
--- a/tests/tests/media/src/android/media/cts/DecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTest.java
@@ -316,6 +316,7 @@
sampleRate,
channelCount);
codec.configure(desiredFormat, null, null, 0);
+ codec.start();
Log.d(TAG, "codec: " + codecInfo.getName() +
" sample rate: " + sampleRate +
diff --git a/tests/tests/media/src/android/media/cts/MediaActivityTest.java b/tests/tests/media/src/android/media/cts/MediaActivityTest.java
index 6e6658b..8cbe255 100644
--- a/tests/tests/media/src/android/media/cts/MediaActivityTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaActivityTest.java
@@ -33,6 +33,7 @@
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
+import android.util.Log;
import android.view.KeyEvent;
import androidx.test.InstrumentationRegistry;
@@ -55,7 +56,7 @@
import java.util.concurrent.TimeUnit;
/**
- * Test media activity which has called {@link Activity#setMediaController}.
+ * Test {@link MediaSessionTestActivity} which has called {@link Activity#setMediaController}.
*/
@NonMediaMainlineTest
@LargeTest
@@ -140,7 +141,13 @@
for (int stream : mStreamVolumeMap.keySet()) {
int volume = mStreamVolumeMap.get(stream);
- mAudioManager.setStreamVolume(stream, volume, 0);
+ try {
+ mAudioManager.setStreamVolume(stream, volume, /* flag= */ 0);
+ } catch (SecurityException e) {
+ Log.w(TAG, "Failed to restore volume. The test probably had changed DnD mode"
+ + ", stream=" + stream + ", originalVolume="
+ + volume + ", currentVolume=" + mAudioManager.getStreamVolume(stream));
+ }
}
}
diff --git a/tests/tests/media/src/android/media/cts/MediaExtractorTest.java b/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
index 167619c..d4df722 100644
--- a/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
@@ -453,7 +453,7 @@
}
}
- // Not all devices support AC4
+ // Not all devices support AC4.
if (ac4TrackIndex == -1) {
List<AudioPresentation> presentations =
mExtractor.getAudioPresentations(0 /*trackIndex*/);
diff --git a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
index 79a6818..b8817fe 100644
--- a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
@@ -145,6 +145,39 @@
return ds;
}
+ public void testAudioMetadata() {
+ setDataSourceCallback(R.raw.audio_with_metadata);
+
+ assertEquals("Title was other than expected",
+ "Chimey Phone",
+ mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE));
+
+ assertEquals("Artist was other than expected",
+ "Some artist",
+ mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ARTIST));
+
+ assertNull("Album artist was unexpectedly present",
+ mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUMARTIST));
+
+ assertNull("Author was unexpectedly present",
+ mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_AUTHOR));
+
+ assertNull("Composer was unexpectedly present",
+ mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_COMPOSER));
+
+ assertEquals("Number of tracks was other than expected",
+ "1",
+ mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_NUM_TRACKS));
+
+ assertEquals("Has audio was other than expected",
+ "yes",
+ mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_AUDIO));
+
+ assertEquals("Mime type was other than expected",
+ "audio/mpeg",
+ mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE));
+ }
+
public void test3gppMetadata() {
setDataSourceCallback(R.raw.testvideo);
diff --git a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
index cef3d82..cc1d3fb 100644
--- a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
@@ -577,10 +577,26 @@
MediaUtils.skipTest("no camera");
return;
}
+
+ int width;
+ int height;
+
mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
+ // Try to get camera profile for QUALITY_LOW; if unavailable,
+ // set the video size to default value.
+ CamcorderProfile profile = CamcorderProfile.get(
+ 0 /* cameraId */, CamcorderProfile.QUALITY_LOW);
+ if (profile != null) {
+ width = profile.videoFrameWidth;
+ height = profile.videoFrameHeight;
+ } else {
+ width = VIDEO_WIDTH;
+ height = VIDEO_HEIGHT;
+ }
+ mMediaRecorder.setVideoSize(width, height);
mMediaRecorder.setOutputFile(mOutFile);
long maxFileSize = MAX_FILE_SIZE * 10;
recordMedia(maxFileSize, mOutFile);
@@ -993,6 +1009,8 @@
}
long fileSize = 128 * 1024;
long tolerance = 50 * 1024;
+ int width;
+ int height;
List<String> recordFileList = new ArrayList<String>();
mFileIndex = 0;
@@ -1098,7 +1116,18 @@
mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
- mMediaRecorder.setVideoSize(VIDEO_WIDTH, VIDEO_HEIGHT);
+ // Try to get camera profile for QUALITY_LOW; if unavailable,
+ // set the video size to default value.
+ CamcorderProfile profile = CamcorderProfile.get(
+ 0 /* cameraId */, CamcorderProfile.QUALITY_LOW);
+ if (profile != null) {
+ width = profile.videoFrameWidth;
+ height = profile.videoFrameHeight;
+ } else {
+ width = VIDEO_WIDTH;
+ height = VIDEO_HEIGHT;
+ }
+ mMediaRecorder.setVideoSize(width, height);
mMediaRecorder.setVideoEncodingBitRate(256000);
mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
mMediaRecorder.setMaxFileSize(fileSize);
diff --git a/tests/tests/mediastress/AndroidManifest.xml b/tests/tests/mediastress/AndroidManifest.xml
index 81d8a00..157cd3c 100644
--- a/tests/tests/mediastress/AndroidManifest.xml
+++ b/tests/tests/mediastress/AndroidManifest.xml
@@ -15,41 +15,42 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.mediastress.cts">
+ package="android.mediastress.cts">
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
- <application
- android:requestLegacyExternalStorage="true">
- <uses-library android:name="android.test.runner" />
+ <application android:requestLegacyExternalStorage="true">
+ <uses-library android:name="android.test.runner"/>
<activity android:label="@string/app_name"
- android:name="android.mediastress.cts.MediaFrameworkTest"
- android:screenOrientation="landscape"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+ android:name="android.mediastress.cts.MediaFrameworkTest"
+ android:screenOrientation="landscape"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.mediastress.cts.NativeMediaActivity"
- android:label="NativeMedia" />
+ android:label="NativeMedia"/>
</application>
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
+ <uses-sdk android:minSdkVersion="29"
+ android:targetSdkVersion="29"/>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.mediastress.cts"
- android:label="Media stress tests InstrumentationRunner" >
+ android:targetPackage="android.mediastress.cts"
+ android:label="Media stress tests InstrumentationRunner">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/tests/midi/AndroidManifest.xml b/tests/tests/midi/AndroidManifest.xml
index c82bb32..6e7bce9 100755
--- a/tests/tests/midi/AndroidManifest.xml
+++ b/tests/tests/midi/AndroidManifest.xml
@@ -16,33 +16,32 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.midi.cts">
+ package="android.midi.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
- <uses-feature android:name="android.software.midi" android:required="true"/>
+ <uses-feature android:name="android.software.midi"
+ android:required="true"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name="com.android.midi.MidiEchoTestService"
- android:permission="android.permission.BIND_MIDI_DEVICE_SERVICE">
+ android:permission="android.permission.BIND_MIDI_DEVICE_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.midi.MidiDeviceService" />
+ <action android:name="android.media.midi.MidiDeviceService"/>
</intent-filter>
<meta-data android:name="android.media.midi.MidiDeviceService"
- android:resource="@xml/echo_device_info" />
+ android:resource="@xml/echo_device_info"/>
</service>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS MIDI tests"
- android:targetPackage="android.midi.cts" >
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS MIDI tests"
+ android:targetPackage="android.midi.cts">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/midi/TEST_MAPPING b/tests/tests/midi/TEST_MAPPING
new file mode 100644
index 0000000..af15405
--- /dev/null
+++ b/tests/tests/midi/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsMidiTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/multiuser/TEST_MAPPING b/tests/tests/multiuser/TEST_MAPPING
new file mode 100644
index 0000000..4c38300
--- /dev/null
+++ b/tests/tests/multiuser/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsMultiUserTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/nativemedia/sl/TEST_MAPPING b/tests/tests/nativemedia/sl/TEST_MAPPING
new file mode 100644
index 0000000..e2f65df
--- /dev/null
+++ b/tests/tests/nativemedia/sl/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNativeMediaSlTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/nativemedia/xa/TEST_MAPPING b/tests/tests/nativemedia/xa/TEST_MAPPING
new file mode 100644
index 0000000..e73b66e
--- /dev/null
+++ b/tests/tests/nativemedia/xa/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNativeMediaXaTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/nativemidi/AndroidManifest.xml b/tests/tests/nativemidi/AndroidManifest.xml
index 1275ea0..f89d012 100755
--- a/tests/tests/nativemidi/AndroidManifest.xml
+++ b/tests/tests/nativemidi/AndroidManifest.xml
@@ -16,38 +16,37 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.nativemidi.cts">
+ package="android.nativemidi.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
- <uses-feature android:name="android.software.midi" android:required="true"/>
+ <uses-feature android:name="android.software.midi"
+ android:required="true"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name="com.android.midi.MidiEchoTestService"
- android:permission="android.permission.BIND_MIDI_DEVICE_SERVICE">
+ android:permission="android.permission.BIND_MIDI_DEVICE_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.midi.MidiDeviceService" />
+ <action android:name="android.media.midi.MidiDeviceService"/>
</intent-filter>
<meta-data android:name="android.media.midi.MidiDeviceService"
- android:resource="@xml/echo_device_info" />
+ android:resource="@xml/echo_device_info"/>
</service>
<!--
<activity android:name="android.nativemidi.cts.NativeMidiEchoTest"
- android:label="NativeMidiEchoTest"/>
- -->
+ android:label="NativeMidiEchoTest"/>
+ -->
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS Native MIDI tests"
- android:targetPackage="android.nativemidi.cts" >
- <meta-data
- android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS Native MIDI tests"
+ android:targetPackage="android.nativemidi.cts">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/ndef/TEST_MAPPING b/tests/tests/ndef/TEST_MAPPING
new file mode 100644
index 0000000..6cd1292
--- /dev/null
+++ b/tests/tests/ndef/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNdefTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/net/TEST_MAPPING b/tests/tests/net/TEST_MAPPING
index 3162e22..9167c98 100644
--- a/tests/tests/net/TEST_MAPPING
+++ b/tests/tests/net/TEST_MAPPING
@@ -1,6 +1,6 @@
{
// TODO: move to mainline-presubmit once supported
- "postsubmit": [
+ "presubmit": [
{
"name": "CtsNetTestCasesLatestSdk",
"options": [
diff --git a/tests/tests/net/api23Test/AndroidManifest.xml b/tests/tests/net/api23Test/AndroidManifest.xml
index 4889660..69ee0dd 100644
--- a/tests/tests/net/api23Test/AndroidManifest.xml
+++ b/tests/tests/net/api23Test/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.net.cts.api23test">
+ package="android.net.cts.api23test">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -26,20 +26,20 @@
<uses-permission android:name="android.permission.INTERNET" />
<application android:usesCleartextTraffic="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <receiver android:name=".ConnectivityReceiver">
+ <receiver android:name=".ConnectivityReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+ <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.net.cts.api23test"
- android:label="CTS tests of android.net">
+ android:targetPackage="android.net.cts.api23test"
+ android:label="CTS tests of android.net">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/net/appForApi23/AndroidManifest.xml b/tests/tests/net/appForApi23/AndroidManifest.xml
index ed4cedb..158b9c4 100644
--- a/tests/tests/net/appForApi23/AndroidManifest.xml
+++ b/tests/tests/net/appForApi23/AndroidManifest.xml
@@ -16,32 +16,32 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.net.cts.appForApi23">
+ package="android.net.cts.appForApi23">
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
<application>
- <receiver android:name=".ConnectivityReceiver">
+ <receiver android:name=".ConnectivityReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+ <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
</intent-filter>
<intent-filter>
- <action android:name="android.net.cts.appForApi23.getWifiConnectivityActionCount" />
+ <action android:name="android.net.cts.appForApi23.getWifiConnectivityActionCount"/>
</intent-filter>
</receiver>
<activity android:name=".ConnectivityListeningActivity"
- android:label="ConnectivityListeningActivity"
- android:exported="true">
+ android:label="ConnectivityListeningActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/tests/tests/netpermission/internetpermission/AndroidManifest.xml b/tests/tests/netpermission/internetpermission/AndroidManifest.xml
index 23b7c0a..45ef5bd 100644
--- a/tests/tests/netpermission/internetpermission/AndroidManifest.xml
+++ b/tests/tests/netpermission/internetpermission/AndroidManifest.xml
@@ -16,12 +16,13 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.networkpermission.internetpermission.cts">
+ package="android.networkpermission.internetpermission.cts">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.networkpermission.internetpermission.cts.InternetPermissionTest"
- android:label="InternetPermissionTest">
+ android:label="InternetPermissionTest"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
@@ -30,21 +31,20 @@
</application>
<!--
- The CTS stubs package cannot be used as the target application here,
- since that requires many permissions to be set. Instead, specify this
- package itself as the target and include any stub activities needed.
+ The CTS stubs package cannot be used as the target application here,
+ since that requires many permissions to be set. Instead, specify this
+ package itself as the target and include any stub activities needed.
- This test package uses the default InstrumentationTestRunner, because
- the InstrumentationCtsTestRunner is only available in the stubs
- package. That runner cannot be added to this package either, since it
- relies on hidden APIs.
- -->
+ This test package uses the default InstrumentationTestRunner, because
+ the InstrumentationCtsTestRunner is only available in the stubs
+ package. That runner cannot be added to this package either, since it
+ relies on hidden APIs.
+ -->
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.networkpermission.internetpermission.cts"
- android:label="CTS tests for INTERNET permissions">
+ android:targetPackage="android.networkpermission.internetpermission.cts"
+ android:label="CTS tests for INTERNET permissions">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/netpermission/internetpermission/TEST_MAPPING b/tests/tests/netpermission/internetpermission/TEST_MAPPING
new file mode 100644
index 0000000..60877f4
--- /dev/null
+++ b/tests/tests/netpermission/internetpermission/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetTestCasesInternetPermission"
+ }
+ ]
+}
diff --git a/tests/tests/netpermission/updatestatspermission/AndroidManifest.xml b/tests/tests/netpermission/updatestatspermission/AndroidManifest.xml
index a4eca82..6babe8f 100644
--- a/tests/tests/netpermission/updatestatspermission/AndroidManifest.xml
+++ b/tests/tests/netpermission/updatestatspermission/AndroidManifest.xml
@@ -16,20 +16,21 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.networkpermission.updatestatspermission.cts">
+ package="android.networkpermission.updatestatspermission.cts">
<!--
- This CTS test is designed to test that an unprivileged app cannot get the
- UPDATE_DEVICE_STATS permission even if it specified it in the manifest. the
- UPDATE_DEVICE_STATS permission is a signature|privileged permission that CTS
- test cannot have.
- -->
- <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
- <uses-permission android:name="android.permission.INTERNET" />
+ This CTS test is designed to test that an unprivileged app cannot get the
+ UPDATE_DEVICE_STATS permission even if it specified it in the manifest. the
+ UPDATE_DEVICE_STATS permission is a signature|privileged permission that CTS
+ test cannot have.
+ -->
+ <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.networkpermission.updatestatspermission.cts.UpdateStatsPermissionTest"
- android:label="UpdateStatsPermissionTest">
+ android:label="UpdateStatsPermissionTest"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
@@ -38,21 +39,20 @@
</application>
<!--
- The CTS stubs package cannot be used as the target application here,
- since that requires many permissions to be set. Instead, specify this
- package itself as the target and include any stub activities needed.
+ The CTS stubs package cannot be used as the target application here,
+ since that requires many permissions to be set. Instead, specify this
+ package itself as the target and include any stub activities needed.
- This test package uses the default InstrumentationTestRunner, because
- the InstrumentationCtsTestRunner is only available in the stubs
- package. That runner cannot be added to this package either, since it
- relies on hidden APIs.
- -->
+ This test package uses the default InstrumentationTestRunner, because
+ the InstrumentationCtsTestRunner is only available in the stubs
+ package. That runner cannot be added to this package either, since it
+ relies on hidden APIs.
+ -->
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.networkpermission.updatestatspermission.cts"
- android:label="CTS tests for UPDATE_DEVICE_STATS permissions">
+ android:targetPackage="android.networkpermission.updatestatspermission.cts"
+ android:label="CTS tests for UPDATE_DEVICE_STATS permissions">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/netpermission/updatestatspermission/TEST_MAPPING b/tests/tests/netpermission/updatestatspermission/TEST_MAPPING
new file mode 100644
index 0000000..6d6dfe0
--- /dev/null
+++ b/tests/tests/netpermission/updatestatspermission/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetTestCasesUpdateStatsPermission"
+ }
+ ]
+}
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-false/TEST_MAPPING b/tests/tests/netsecpolicy/usescleartexttraffic-false/TEST_MAPPING
new file mode 100644
index 0000000..43b85e9
--- /dev/null
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-false/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecPolicyUsesCleartextTrafficFalseTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/TEST_MAPPING b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/TEST_MAPPING
new file mode 100644
index 0000000..4b9bb16
--- /dev/null
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-attributes/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-attributes/TEST_MAPPING
new file mode 100644
index 0000000..49aaca1
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-attributes/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigAttributeTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/TEST_MAPPING
new file mode 100644
index 0000000..b4cf9c0
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigBasicDomainConfigTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/TEST_MAPPING
new file mode 100644
index 0000000..021dd45
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigPrePCleartextTrafficTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/TEST_MAPPING
new file mode 100644
index 0000000..c015f28
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigCleartextTrafficTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/TEST_MAPPING
new file mode 100644
index 0000000..1c0ace3
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigBasicDebugDisabledTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/TEST_MAPPING
new file mode 100644
index 0000000..8bfb01a
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigBasicDebugEnabledTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/TEST_MAPPING
new file mode 100644
index 0000000..9aaae09
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigDownloadManagerTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/TEST_MAPPING
new file mode 100644
index 0000000..8786f17
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigInvalidPinTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/TEST_MAPPING
new file mode 100644
index 0000000..904eda5
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigNestedDomainConfigTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/TEST_MAPPING b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/TEST_MAPPING
new file mode 100644
index 0000000..8462e93
--- /dev/null
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsNetSecConfigResourcesSrcTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/neuralnetworks/benchmark/AndroidManifest.xml b/tests/tests/neuralnetworks/benchmark/AndroidManifest.xml
index 2a5df64..0e96960 100644
--- a/tests/tests/neuralnetworks/benchmark/AndroidManifest.xml
+++ b/tests/tests/neuralnetworks/benchmark/AndroidManifest.xml
@@ -15,21 +15,21 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.nn.benchmark.cts">
+ package="com.android.nn.benchmark.cts">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-sdk android:minSdkVersion="27"/>
<application android:name=".NNAccuracyApplication">
- <activity android:name=".NNAccuracyActivity">
+ <activity android:name=".NNAccuracyActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
</application>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.nn.benchmark.cts"
- android:label="CTS tests of NNAPI accuracy benchmark"/>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.nn.benchmark.cts"
+ android:label="CTS tests of NNAPI accuracy benchmark"/>
</manifest>
diff --git a/tests/tests/neuralnetworks/tflite_delegate/Android.mk b/tests/tests/neuralnetworks/tflite_delegate/Android.mk
index 091a070..0170048 100644
--- a/tests/tests/neuralnetworks/tflite_delegate/Android.mk
+++ b/tests/tests/neuralnetworks/tflite_delegate/Android.mk
@@ -62,7 +62,7 @@
LOCAL_WHOLE_STATIC_LIBRARIES := CtsTfliteNnapiDelegateTests_static
LOCAL_SHARED_LIBRARIES := libandroid liblog libneuralnetworks
-LOCAL_STATIC_LIBRARIES := libgtest_ndk_c++ libtflite_static
+LOCAL_STATIC_LIBRARIES := libgtest_ndk_c++ libgmock_ndk libtflite_static
LOCAL_CTS_TEST_PACKAGE := android.neuralnetworks
# Tag this module as a cts test artifact
diff --git a/tests/tests/notificationlegacy/notificationlegacy27/TEST_MAPPING b/tests/tests/notificationlegacy/notificationlegacy27/TEST_MAPPING
new file mode 100644
index 0000000..b540596
--- /dev/null
+++ b/tests/tests/notificationlegacy/notificationlegacy27/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsLegacyNotification27TestCases"
+ }
+ ]
+}
diff --git a/tests/tests/opengl/AndroidManifest.xml b/tests/tests/opengl/AndroidManifest.xml
index 7b645aa..a7a09b7 100644
--- a/tests/tests/opengl/AndroidManifest.xml
+++ b/tests/tests/opengl/AndroidManifest.xml
@@ -13,61 +13,57 @@
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.opengl.cts"
- android:versionCode="1"
- android:versionName="1.0" >
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.opengl.cts"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<uses-feature android:glEsVersion="0x00020000"/>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.opengl.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.opengl.cts">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
- <application
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:hardwareAccelerated="false" >
+ <application android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:hardwareAccelerated="false">
- <activity
- android:label="@string/app_name"
- android:name="android.opengl.cts.OpenGLES20ActivityOne">
+ <activity android:label="@string/app_name"
+ android:name="android.opengl.cts.OpenGLES20ActivityOne">
</activity>
- <activity
- android:label="@string/app_name"
- android:name="android.opengl.cts.OpenGLES20ActivityTwo">
+ <activity android:label="@string/app_name"
+ android:name="android.opengl.cts.OpenGLES20ActivityTwo">
</activity>
- <uses-library android:name="android.test.runner" />
- <activity
- android:name="android.opengl.cts.OpenGLES20NativeActivityOne"
- android:label="@string/app_name" />
- <activity
- android:name="android.opengl.cts.OpenGLES20NativeActivityTwo"
- android:label="@string/app_name" />
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name="android.opengl.cts.OpenGLES20NativeActivityOne"
+ android:label="@string/app_name"/>
+ <activity android:name="android.opengl.cts.OpenGLES20NativeActivityTwo"
+ android:label="@string/app_name"/>
<activity android:name="android.opengl.cts.CompressedTextureCtsActivity"
- android:label="CompressedTextureCtsActivity"
- android:screenOrientation="nosensor"
- android:hardwareAccelerated="true">
+ android:label="CompressedTextureCtsActivity"
+ android:screenOrientation="nosensor"
+ android:hardwareAccelerated="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.opengl.cts.EglConfigCtsActivity"
- android:configChanges="keyboardHidden|orientation|screenSize|uiMode"
- android:hardwareAccelerated="true"/>
+ android:configChanges="keyboardHidden|orientation|screenSize|uiMode"
+ android:hardwareAccelerated="true"/>
<activity android:name="android.opengl.cts.GLSurfaceViewCtsActivity"
- android:label="GLSurfaceViewCts"
- android:hardwareAccelerated="true"/>
+ android:label="GLSurfaceViewCts"
+ android:hardwareAccelerated="true"/>
<activity android:name="android.opengl.cts.OpenGlEsVersionCtsActivity"
- android:hardwareAccelerated="true"/>
+ android:hardwareAccelerated="true"/>
</application>
diff --git a/tests/tests/openglperf/AndroidManifest.xml b/tests/tests/openglperf/AndroidManifest.xml
index 5ccdc1e..8573455 100644
--- a/tests/tests/openglperf/AndroidManifest.xml
+++ b/tests/tests/openglperf/AndroidManifest.xml
@@ -13,42 +13,43 @@
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.openglperf.cts"
- android:versionCode="1"
- android:versionName="1.0" >
- <uses-feature android:glEsVersion="0x00020000" android:required="true" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.GET_TASKS" />
- <uses-permission android:name="android.permission.REORDER_TASKS" />
- <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.openglperf.cts"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+ <uses-feature android:glEsVersion="0x00020000"
+ android:required="true"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.GET_TASKS"/>
+ <uses-permission android:name="android.permission.REORDER_TASKS"/>
+ <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
<!-- Two activities are used -->
- <instrumentation
- android:targetPackage="com.replica.replicaisland"
- android:name="androidx.test.runner.AndroidJUnitRunner" >
+ <instrumentation android:targetPackage="com.replica.replicaisland"
+ android:name="androidx.test.runner.AndroidJUnitRunner">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
- <instrumentation
- android:targetPackage="android.openglperf.cts"
- android:name="androidx.test.runner.AndroidJUnitRunner">
+ <instrumentation android:targetPackage="android.openglperf.cts"
+ android:name="androidx.test.runner.AndroidJUnitRunner">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.openglperf.cts.GlPlanetsActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.openglperf.cts.TextureTestActivity"
- android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize"/>
</application>
</manifest>
diff --git a/tests/tests/os/AndroidManifest.xml b/tests/tests/os/AndroidManifest.xml
index 5a53fa5..4b565f0 100644
--- a/tests/tests/os/AndroidManifest.xml
+++ b/tests/tests/os/AndroidManifest.xml
@@ -16,153 +16,160 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.os.cts">
+ package="android.os.cts">
<permission android:name="android.os.cts.permission.TEST_GRANTED"
- android:protectionLevel="normal"
- android:label="@string/permlab_testGranted"
- android:description="@string/permdesc_testGranted">
- <meta-data android:name="android.os.cts.string" android:value="foo" />
- <meta-data android:name="android.os.cts.boolean" android:value="true" />
- <meta-data android:name="android.os.cts.integer" android:value="100" />
- <meta-data android:name="android.os.cts.color" android:value="#ff000000" />
- <meta-data android:name="android.os.cts.float" android:value="100.1" />
- <meta-data android:name="android.os.cts.reference" android:resource="@xml/metadata" />
+ android:protectionLevel="normal"
+ android:label="@string/permlab_testGranted"
+ android:description="@string/permdesc_testGranted">
+ <meta-data android:name="android.os.cts.string"
+ android:value="foo"/>
+ <meta-data android:name="android.os.cts.boolean"
+ android:value="true"/>
+ <meta-data android:name="android.os.cts.integer"
+ android:value="100"/>
+ <meta-data android:name="android.os.cts.color"
+ android:value="#ff000000"/>
+ <meta-data android:name="android.os.cts.float"
+ android:value="100.1"/>
+ <meta-data android:name="android.os.cts.reference"
+ android:resource="@xml/metadata"/>
</permission>
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.VIBRATE" />
- <uses-permission android:name="android.permission.ACCESS_VIBRATOR_STATE" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
+ <uses-permission android:name="android.permission.VIBRATE"/>
+ <uses-permission android:name="android.permission.ACCESS_VIBRATOR_STATE"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
<uses-permission android:name="android.permission.READ_SMS"/>
<uses-permission android:name="android.permission.WRITE_SMS"/>
- <uses-permission android:name="android.permission.CALL_PHONE" />
- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
- <uses-permission android:name="android.permission.DEVICE_POWER" />
- <uses-permission android:name="android.permission.POWER_SAVER" />
- <uses-permission android:name="android.permission.INSTALL_DYNAMIC_SYSTEM" />
- <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES" />
+ <uses-permission android:name="android.permission.CALL_PHONE"/>
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+ <uses-permission android:name="android.permission.DEVICE_POWER"/>
+ <uses-permission android:name="android.permission.POWER_SAVER"/>
+ <uses-permission android:name="android.permission.INSTALL_DYNAMIC_SYSTEM"/>
+ <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES"/>
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
- <uses-permission android:name="android.os.cts.permission.TEST_GRANTED" />
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+ <uses-permission android:name="android.os.cts.permission.TEST_GRANTED"/>
- <application
- android:usesCleartextTraffic="true"
- android:requestLegacyExternalStorage="true">
+ <application android:usesCleartextTraffic="true"
+ android:requestLegacyExternalStorage="true">
<activity android:name="android.os.cts.LaunchpadActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:multiprocess="true">
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:multiprocess="true">
</activity>
<activity android:name="android.os.cts.AliasActivityStub">
<meta-data android:name="android.os.alias"
- android:resource="@xml/alias" />
+ android:resource="@xml/alias"/>
</activity>
<activity android:name="android.os.cts.CountDownTimerTestStub"
- android:label="CountDownTimerTestStub">
+ android:label="CountDownTimerTestStub"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity android:name="android.os.cts.SimpleTestActivity" />
+ <activity android:name="android.os.cts.SimpleTestActivity"/>
- <service
- android:name="android.os.cts.ParcelFileDescriptorPeer$Red"
- android:process=":red"
- android:exported="true" />
- <service
- android:name="android.os.cts.ParcelFileDescriptorPeer$Blue"
- android:process=":blue"
- android:exported="true" />
- <service
- android:name="android.os.cts.CrossProcessExceptionService"
- android:process=":green"
- android:exported="true" />
- <service
- android:name="android.os.cts.SharedMemoryService"
- android:process=":sharedmem"
- android:exported="false" />
- <service
- android:name="android.os.cts.ParcelExceptionService"
- android:process=":remote"
- android:exported="true" />
- <service
- android:name="android.os.cts.ParcelTest$ParcelObjectFreeService"
- android:process=":remote"
- android:exported="true" />
+ <service android:name="android.os.cts.ParcelFileDescriptorPeer$Red"
+ android:process=":red"
+ android:exported="true"/>
+ <service android:name="android.os.cts.ParcelFileDescriptorPeer$Blue"
+ android:process=":blue"
+ android:exported="true"/>
+ <service android:name="android.os.cts.CrossProcessExceptionService"
+ android:process=":green"
+ android:exported="true"/>
+ <service android:name="android.os.cts.SharedMemoryService"
+ android:process=":sharedmem"
+ android:exported="false"/>
+ <service android:name="android.os.cts.ParcelExceptionService"
+ android:process=":remote"
+ android:exported="true"/>
+ <service android:name="android.os.cts.ParcelTest$ParcelObjectFreeService"
+ android:process=":remote"
+ android:exported="true"/>
- <service android:name="android.os.cts.LocalService">
+ <service android:name="android.os.cts.LocalService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.os.cts.activity.SERVICE_LOCAL" />
+ <action android:name="android.os.cts.activity.SERVICE_LOCAL"/>
</intent-filter>
- <meta-data android:name="android.os.cts.string" android:value="foo" />
- <meta-data android:name="android.os.cts.boolean" android:value="true" />
- <meta-data android:name="android.os.cts.integer" android:value="100" />
- <meta-data android:name="android.os.cts.color" android:value="#ff000000" />
- <meta-data android:name="android.os.cts.float" android:value="100.1" />
- <meta-data android:name="android.os.cts.reference" android:resource="@xml/metadata" />
+ <meta-data android:name="android.os.cts.string"
+ android:value="foo"/>
+ <meta-data android:name="android.os.cts.boolean"
+ android:value="true"/>
+ <meta-data android:name="android.os.cts.integer"
+ android:value="100"/>
+ <meta-data android:name="android.os.cts.color"
+ android:value="#ff000000"/>
+ <meta-data android:name="android.os.cts.float"
+ android:value="100.1"/>
+ <meta-data android:name="android.os.cts.reference"
+ android:resource="@xml/metadata"/>
</service>
<service android:name="android.os.cts.LocalGrantedService"
- android:permission="android.os.cts.permission.TEST_GRANTED">
+ android:permission="android.os.cts.permission.TEST_GRANTED"
+ android:exported="true">
<intent-filter>
- <action android:name="android.os.cts.activity.SERVICE_LOCAL_GRANTED" />
+ <action android:name="android.os.cts.activity.SERVICE_LOCAL_GRANTED"/>
</intent-filter>
</service>
<service android:name="android.os.cts.LocalDeniedService"
- android:permission="android.os.cts.permission.TEST_DENIED">
+ android:permission="android.os.cts.permission.TEST_DENIED"
+ android:exported="true">
<intent-filter>
- <action android:name="android.os.cts.activity.SERVICE_LOCAL_DENIED" />
+ <action android:name="android.os.cts.activity.SERVICE_LOCAL_DENIED"/>
</intent-filter>
</service>
<service android:name="android.os.cts.EmptyService"
- android:process=":remote">
+ android:process=":remote"
+ android:exported="true">
<intent-filter>
- <action
- android:name="android.os.cts.IEmptyService" />
- <action
- android:name="android.os.REMOTESERVICE" />
+ <action android:name="android.os.cts.IEmptyService"/>
+ <action android:name="android.os.REMOTESERVICE"/>
</intent-filter>
</service>
<service android:name="android.os.cts.CtsRemoteService"
- android:process=":remote">
+ android:process=":remote"
+ android:exported="true">
<intent-filter>
- <action
- android:name="android.os.cts.ISecondary" />
- <action
- android:name="android.os.REMOTESERVICE" />
+ <action android:name="android.os.cts.ISecondary"/>
+ <action android:name="android.os.REMOTESERVICE"/>
</intent-filter>
</service>
<service android:name="android.os.cts.SeccompTest$IsolatedService"
- android:isolatedProcess="true">
+ android:isolatedProcess="true">
</service>
<service android:name="android.os.cts.MessengerService"
- android:process=":messengerService">
+ android:process=":messengerService">
</service>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.os.cts"
- android:label="CTS tests of android.os">
+ android:targetPackage="android.os.cts"
+ android:label="CTS tests of android.os">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/tests/os/src/android/os/cts/VibratorTest.java b/tests/tests/os/src/android/os/cts/VibratorTest.java
index 278bea3..459aaa2 100644
--- a/tests/tests/os/src/android/os/cts/VibratorTest.java
+++ b/tests/tests/os/src/android/os/cts/VibratorTest.java
@@ -19,6 +19,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
@@ -36,6 +38,8 @@
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
+import java.util.concurrent.Executors;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -234,8 +238,8 @@
public void testVibratorStateCallback() throws Exception {
final UiAutomation ui = InstrumentationRegistry.getInstrumentation().getUiAutomation();
ui.adoptShellPermissionIdentity("android.permission.ACCESS_VIBRATOR_STATE");
- // Add listener1
- mVibrator.addVibratorStateListener(mListener1);
+ // Add listener1 on executor
+ mVibrator.addVibratorStateListener(Executors.newSingleThreadExecutor(), mListener1);
// Add listener2 on main thread.
mVibrator.addVibratorStateListener(mListener2);
verify(mListener1, timeout(CALLBACK_TIMEOUT_MILLIS)
@@ -251,14 +255,26 @@
verify(mListener2, timeout(CALLBACK_TIMEOUT_MILLIS)
.times(1)).onVibratorStateChanged(true);
- reset(mListener1);
- reset(mListener2);
- // Remove listener1
- mVibrator.removeVibratorStateListener(mListener1);
- mVibrator.removeVibratorStateListener(mListener2);
+ verify(mListener1, timeout(CALLBACK_TIMEOUT_MILLIS)
+ .times(1)).onVibratorStateChanged(false);
+ verify(mListener2, timeout(CALLBACK_TIMEOUT_MILLIS)
+ .times(1)).onVibratorStateChanged(false);
mVibrator.cancel();
assertIsVibrating(false);
+
+ reset(mListener1);
+ reset(mListener2);
+ // Remove listener1 & listener2
+ mVibrator.removeVibratorStateListener(mListener1);
+ mVibrator.removeVibratorStateListener(mListener2);
+
+ mVibrator.vibrate(1000);
+ assertIsVibrating(true);
+ verify(mListener1, timeout(CALLBACK_TIMEOUT_MILLIS).times(0))
+ .onVibratorStateChanged(anyBoolean());
+ verify(mListener2, timeout(CALLBACK_TIMEOUT_MILLIS).times(0))
+ .onVibratorStateChanged(anyBoolean());
}
private static void sleep(long millis) {
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/AndroidManifest.xml b/tests/tests/packageinstaller/adminpackageinstaller/AndroidManifest.xml
index 3867e9f..4cdcdaa 100755
--- a/tests/tests/packageinstaller/adminpackageinstaller/AndroidManifest.xml
+++ b/tests/tests/packageinstaller/adminpackageinstaller/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2017 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
@@ -14,35 +15,37 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.packageinstaller.admin.cts" >
+ package="android.packageinstaller.admin.cts">
- <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
- <application android:label="Cts Admin Package Installer Test" android:testOnly="true">
+ <application android:label="Cts Admin Package Installer Test"
+ android:testOnly="true">
<uses-library android:name="android.test.runner"/>
- <receiver
- android:name=".BasicAdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ <receiver android:name=".BasicAdminReceiver"
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
- android:resource="@xml/device_admin" />
+ android:resource="@xml/device_admin"/>
<intent-filter>
- <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
</intent-filter>
</receiver>
- <activity android:name=".LauncherActivity">
+ <activity android:name=".LauncherActivity"
+ android:exported="true">
<intent-filter android:priority="-999">
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.HOME"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:functionalTest="true"
- android:targetPackage="android.packageinstaller.admin.cts"
- android:label="External App Sources Tests"/>
+ android:functionalTest="true"
+ android:targetPackage="android.packageinstaller.admin.cts"
+ android:label="External App Sources Tests"/>
</manifest>
diff --git a/tests/tests/packageinstaller/atomicinstall/src/com/android/tests/atomicinstall/AtomicInstallTest.java b/tests/tests/packageinstaller/atomicinstall/src/com/android/tests/atomicinstall/AtomicInstallTest.java
index 8c1623d..1758e8d 100644
--- a/tests/tests/packageinstaller/atomicinstall/src/com/android/tests/atomicinstall/AtomicInstallTest.java
+++ b/tests/tests/packageinstaller/atomicinstall/src/com/android/tests/atomicinstall/AtomicInstallTest.java
@@ -147,7 +147,8 @@
try (PackageInstaller.Session childSession =
openPackageInstallerSession(childSessionId)) {
try {
- childSession.commit(LocalIntentSender.getIntentSender());
+ LocalIntentSender sender = new LocalIntentSender();
+ childSession.commit(sender.getIntentSender());
fail("Should not be able to commit a child session!");
} catch (IllegalStateException e) {
// ignore
@@ -172,8 +173,9 @@
}
}
- parentSession.commit(LocalIntentSender.getIntentSender());
- assertStatusSuccess(LocalIntentSender.getIntentSenderResult());
+ LocalIntentSender sender = new LocalIntentSender();
+ parentSession.commit(sender.getIntentSender());
+ assertStatusSuccess(sender.getResult());
}
}
diff --git a/tests/tests/packageinstaller/emptytestapp/AndroidManifest.xml b/tests/tests/packageinstaller/emptytestapp/AndroidManifest.xml
index 09af39e..389f858 100644
--- a/tests/tests/packageinstaller/emptytestapp/AndroidManifest.xml
+++ b/tests/tests/packageinstaller/emptytestapp/AndroidManifest.xml
@@ -19,7 +19,8 @@
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26"/>
- <application android:hasCode="false"
+ <application android:forceQueryable="true"
+ android:hasCode="false"
android:label="Empty Test App"
/>
diff --git a/tests/tests/packagewatchdog/TEST_MAPPING b/tests/tests/packagewatchdog/TEST_MAPPING
new file mode 100644
index 0000000..17e84ff
--- /dev/null
+++ b/tests/tests/packagewatchdog/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsPackageWatchdogTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/permission/AndroidManifest.xml b/tests/tests/permission/AndroidManifest.xml
index 4169ca2..e559076 100644
--- a/tests/tests/permission/AndroidManifest.xml
+++ b/tests/tests/permission/AndroidManifest.xml
@@ -16,42 +16,44 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.permission.cts" android:targetSandboxVersion="2">
+ package="android.permission.cts"
+ android:targetSandboxVersion="2">
<!-- for android.permission.cts.PermissionGroupChange -->
<permission android:name="android.permission.cts.B"
- android:protectionLevel="dangerous"
- android:label="@string/perm_b"
- android:permissionGroup="android.permission.cts.groupB"
- android:description="@string/perm_b" />
+ android:protectionLevel="dangerous"
+ android:label="@string/perm_b"
+ android:permissionGroup="android.permission.cts.groupB"
+ android:description="@string/perm_b"/>
<!-- for android.permission.cts.PermissionGroupChange -->
<permission android:name="android.permission.cts.C"
- android:protectionLevel="dangerous"
- android:label="@string/perm_c"
- android:permissionGroup="android.permission.cts.groupC"
- android:description="@string/perm_c" />
+ android:protectionLevel="dangerous"
+ android:label="@string/perm_c"
+ android:permissionGroup="android.permission.cts.groupC"
+ android:description="@string/perm_c"/>
<!-- for android.permission.cts.LocationAccessCheckTest -->
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<!-- for android.permission.cts.PermissionGroupChange -->
<permission-group android:description="@string/perm_group_b"
- android:label="@string/perm_group_b"
- android:name="android.permission.cts.groupB" />
+ android:label="@string/perm_group_b"
+ android:name="android.permission.cts.groupB"/>
<!-- for android.permission.cts.PermissionGroupChange -->
<permission-group android:description="@string/perm_group_c"
- android:label="@string/perm_group_c"
- android:name="android.permission.cts.groupC" />
+ android:label="@string/perm_group_c"
+ android:name="android.permission.cts.groupC"/>
- <uses-permission android:name="android.permission.INJECT_EVENTS" />
- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.INJECT_EVENTS"/>
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.permission.cts.PermissionStubActivity"
- android:label="PermissionStubActivity">
+ android:label="PermissionStubActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
@@ -59,30 +61,29 @@
</activity>
<service android:name=".NotificationListener"
- android:exported="true"
- android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+ android:exported="true"
+ android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
<intent-filter>
- <action android:name="android.service.notification.NotificationListenerService" />
+ <action android:name="android.service.notification.NotificationListenerService"/>
</intent-filter>
</service>
</application>
<!--
- The CTS stubs package cannot be used as the target application here,
- since that requires many permissions to be set. Instead, specify this
- package itself as the target and include any stub activities needed.
+ The CTS stubs package cannot be used as the target application here,
+ since that requires many permissions to be set. Instead, specify this
+ package itself as the target and include any stub activities needed.
- This test package uses the default InstrumentationTestRunner, because
- the InstrumentationCtsTestRunner is only available in the stubs
- package. That runner cannot be added to this package either, since it
- relies on hidden APIs.
- -->
+ This test package uses the default InstrumentationTestRunner, because
+ the InstrumentationCtsTestRunner is only available in the stubs
+ package. That runner cannot be added to this package either, since it
+ relies on hidden APIs.
+ -->
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.permission.cts"
- android:label="CTS tests of android.permission">
+ android:targetPackage="android.permission.cts"
+ android:label="CTS tests of android.permission">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/permission/AndroidTest.xml b/tests/tests/permission/AndroidTest.xml
index 80becf34..decdd24 100644
--- a/tests/tests/permission/AndroidTest.xml
+++ b/tests/tests/permission/AndroidTest.xml
@@ -46,6 +46,7 @@
<option name="push" value="CtsAppThatRequestsLocationPermission22.apk->/data/local/tmp/cts/permissions/CtsAppThatRequestsLocationPermission22.apk" />
<option name="push" value="CtsAppThatRequestsStoragePermission29.apk->/data/local/tmp/cts/permissions/CtsAppThatRequestsStoragePermission29.apk" />
<option name="push" value="CtsAppThatRequestsStoragePermission28.apk->/data/local/tmp/cts/permissions/CtsAppThatRequestsStoragePermission28.apk" />
+ <option name="push" value="CtsAppThatRequestsLocationAndBackgroundPermission28.apk->/data/local/tmp/cts/permissions/CtsAppThatRequestsLocationAndBackgroundPermission28.apk" />
<option name="push" value="CtsAppThatRequestsLocationAndBackgroundPermission29.apk->/data/local/tmp/cts/permissions/CtsAppThatRequestsLocationAndBackgroundPermission29.apk" />
<option name="push" value="CtsAppThatAccessesLocationOnCommand.apk->/data/local/tmp/cts/permissions/CtsAppThatAccessesLocationOnCommand.apk" />
<option name="push" value="AppThatDoesNotHaveBgLocationAccess.apk->/data/local/tmp/cts/permissions/AppThatDoesNotHaveBgLocationAccess.apk" />
diff --git a/tests/tests/permission/AppThatAccessesLocationOnCommand/AndroidManifest.xml b/tests/tests/permission/AppThatAccessesLocationOnCommand/AndroidManifest.xml
index e735330..5162a7c 100644
--- a/tests/tests/permission/AppThatAccessesLocationOnCommand/AndroidManifest.xml
+++ b/tests/tests/permission/AppThatAccessesLocationOnCommand/AndroidManifest.xml
@@ -16,18 +16,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.permission.cts.appthataccesseslocation"
- android:versionCode="1">
+ package="android.permission.cts.appthataccesseslocation"
+ android:versionCode="1">
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<application android:label="CtsLocationAccess">
- <service android:name=".AccessLocationOnCommand">
+ <service android:name=".AccessLocationOnCommand"
+ android:exported="true">
<intent-filter>
- <action android:name="android.permission.cts.accesslocation" />
+ <action android:name="android.permission.cts.accesslocation"/>
</intent-filter>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp b/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp
new file mode 100644
index 0000000..56bcf8c
--- /dev/null
+++ b/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp
@@ -0,0 +1,27 @@
+//
+// 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_helper_app {
+ name: "CtsAppThatRequestsLocationAndBackgroundPermission28",
+ defaults: ["cts_defaults"],
+ sdk_version: "current",
+ // Tag this module as a cts test artifact
+ test_suites: [
+ "cts",
+ "vts10",
+ "general-tests",
+ ],
+}
diff --git a/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission28/AndroidManifest.xml b/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission28/AndroidManifest.xml
new file mode 100644
index 0000000..626ee3d
--- /dev/null
+++ b/tests/tests/permission/AppThatRequestLocationAndBackgroundPermission28/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?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.permission.cts.appthatrequestpermission"
+ android:versionCode="3">
+
+ <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
+
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+ <!-- The ACCESS_BACKGROUND_LOCATION was added for API 29. But apps targeting lower APK levels
+ can still request it to signal that they are aware of this new behavior -->
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
+ <application />
+</manifest>
+
diff --git a/tests/tests/permission/AppThatRunsRationaleTests/AndroidManifest.xml b/tests/tests/permission/AppThatRunsRationaleTests/AndroidManifest.xml
index cede468..b8e0144 100644
--- a/tests/tests/permission/AppThatRunsRationaleTests/AndroidManifest.xml
+++ b/tests/tests/permission/AppThatRunsRationaleTests/AndroidManifest.xml
@@ -16,17 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.permission.cts.appthatrunsrationaletests">
+ package="android.permission.cts.appthatrunsrationaletests">
- <uses-permission android:name="android.permission.READ_CONTACTS" />
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
<application android:label="CtsRationaleTests">
- <activity android:name=".TestActivity">
+ <activity android:name=".TestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="CtsRationalTests.intent.action.Launch" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="CtsRationalTests.intent.action.Launch"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/tests/tests/permission/sdk28/AndroidManifest.xml b/tests/tests/permission/sdk28/AndroidManifest.xml
index 7390f36..1dfeb2a 100644
--- a/tests/tests/permission/sdk28/AndroidManifest.xml
+++ b/tests/tests/permission/sdk28/AndroidManifest.xml
@@ -16,16 +16,17 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.permission.cts.sdk28">
+ package="android.permission.cts.sdk28">
<uses-sdk android:minSdkVersion="3"
- android:targetSdkVersion="28"
- android:maxSdkVersion="28" />
+ android:targetSdkVersion="28"
+ android:maxSdkVersion="28"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.permission.cts.PermissionStubActivity"
- android:label="PermissionStubActivity">
+ android:label="PermissionStubActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
@@ -34,21 +35,20 @@
</application>
<!--
- The CTS stubs package cannot be used as the target application here,
- since that requires many permissions to be set. Instead, specify this
- package itself as the target and include any stub activities needed.
+ The CTS stubs package cannot be used as the target application here,
+ since that requires many permissions to be set. Instead, specify this
+ package itself as the target and include any stub activities needed.
- This test package uses the default InstrumentationTestRunner, because
- the InstrumentationCtsTestRunner is only available in the stubs
- package. That runner cannot be added to this package either, since it
- relies on hidden APIs.
- -->
+ This test package uses the default InstrumentationTestRunner, because
+ the InstrumentationCtsTestRunner is only available in the stubs
+ package. That runner cannot be added to this package either, since it
+ relies on hidden APIs.
+ -->
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.permission.cts.sdk28"
- android:label="CTS tests of legacy android permissions as of API 28">
+ android:targetPackage="android.permission.cts.sdk28"
+ android:label="CTS tests of legacy android permissions as of API 28">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/permission/sdk28/TEST_MAPPING b/tests/tests/permission/sdk28/TEST_MAPPING
new file mode 100644
index 0000000..b98bbaf
--- /dev/null
+++ b/tests/tests/permission/sdk28/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsPermissionTestCasesSdk28"
+ }
+ ]
+}
diff --git a/tests/tests/permission/src/android/permission/cts/SplitPermissionTest.java b/tests/tests/permission/src/android/permission/cts/SplitPermissionTest.java
index b53bf6a..0d1cb99 100644
--- a/tests/tests/permission/src/android/permission/cts/SplitPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/SplitPermissionTest.java
@@ -84,6 +84,8 @@
TMP_DIR + "CtsAppThatRequestsLocationPermission28.apk";
private static final String APK_LOCATION_22 =
TMP_DIR + "CtsAppThatRequestsLocationPermission22.apk";
+ private static final String APK_LOCATION_BACKGROUND_28 =
+ TMP_DIR + "CtsAppThatRequestsLocationAndBackgroundPermission28.apk";
private static final String APK_LOCATION_BACKGROUND_29 =
TMP_DIR + "CtsAppThatRequestsLocationAndBackgroundPermission29.apk";
private static final String APK_SHARED_UID_LOCATION_29 =
@@ -482,6 +484,28 @@
}
/**
+ * An implicit permission should get revoked when the app gets updated and now requests the
+ * permission. This even happens if the app is not targeting the SDK the permission was split
+ * in.
+ */
+ @Test
+ public void newPermissionGetRevokedOnUpgradeBeforeSplitSDK() throws Exception {
+ install(APK_LOCATION_28);
+
+ // Background permission can only be granted together with foreground permission
+ grantPermission(APP_PKG, ACCESS_COARSE_LOCATION);
+ grantPermission(APP_PKG, ACCESS_BACKGROUND_LOCATION);
+
+ // Background location was introduced in SDK 29. Hence an app targeting 28 is usually
+ // unaware of this permission. If the app declares that it is aware by adding the permission
+ // in the manifest the permission will get revoked. This allows the app to request the
+ // permission from the user.
+ install(APK_LOCATION_BACKGROUND_28);
+
+ assertPermissionRevoked(ACCESS_BACKGROUND_LOCATION);
+ }
+
+ /**
* An implicit permission should <u>not</u> get revoked when the app gets updated as pre-M apps
* cannot deal with revoked permissions. Hence only the user should ever explicitly do that.
*/
diff --git a/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java b/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
index 99fdadb..7de6be5 100755
--- a/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
+++ b/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
@@ -24,6 +24,7 @@
import static android.Manifest.permission.READ_CONTACTS;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import static android.Manifest.permission.READ_PHONE_STATE;
+import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;
import static android.Manifest.permission.WRITE_CALL_LOG;
import static android.Manifest.permission.WRITE_CONTACTS;
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
@@ -56,10 +57,6 @@
private static final int NO_TARGET = Build.VERSION_CODES.CUR_DEVELOPMENT + 1;
- // Redefined here since it's only present in the system API surface.
- private static final String READ_PRIVILEGED_PHONE_STATE =
- "android.permission.READ_PRIVILEGED_PHONE_STATE";
-
private List<SplitPermissionInfo> mSplitPermissions;
@Before
diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml
index 3627195..3a64eca 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -99,7 +99,6 @@
<protected-broadcast android:name="android.intent.action.LOAD_DATA" />
<protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />
- <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGING" />
<protected-broadcast android:name="android.os.action.DEVICE_IDLE_MODE_CHANGED" />
<protected-broadcast android:name="android.os.action.POWER_SAVE_WHITELIST_CHANGED" />
<protected-broadcast android:name="android.os.action.POWER_SAVE_TEMP_WHITELIST_CHANGED" />
@@ -4434,10 +4433,6 @@
<permission android:name="android.permission.MANAGE_BIOMETRIC_DIALOG"
android:protectionLevel="signature" />
- <!-- Allows an app to reset face authentication attempt counter. Reserved for the system. @hide -->
- <permission android:name="android.permission.RESET_FACE_LOCKOUT"
- android:protectionLevel="signature" />
-
<!-- Allows an application to control keyguard. Only allowed for system processes.
@hide -->
<permission android:name="android.permission.CONTROL_KEYGUARD"
@@ -5024,6 +5019,7 @@
android:relinquishTaskIdentity="true"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
android:process=":ui"
+ android:exported="true"
android:visibleToInstantApps="true">
<intent-filter>
<action android:name="android.intent.action.CHOOSER" />
@@ -5135,6 +5131,7 @@
<activity android:name="com.android.internal.app.ShutdownActivity"
android:permission="android.permission.SHUTDOWN"
android:theme="@style/Theme.NoDisplay"
+ android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="com.android.internal.intent.action.REQUEST_SHUTDOWN" />
@@ -5156,6 +5153,7 @@
android:enabled="false"
android:process=":ui"
android:systemUserOnly="true"
+ android:exported="true"
android:theme="@style/Theme.Translucent.NoTitleBar">
<intent-filter android:priority="-100">
<action android:name="android.intent.action.MAIN" />
@@ -5168,6 +5166,7 @@
<activity android:name="com.android.internal.app.ConfirmUserCreationActivity"
android:excludeFromRecents="true"
android:process=":ui"
+ android:exported="true"
android:theme="@style/Theme.Dialog.Confirmation">
<intent-filter android:priority="1000">
<action android:name="android.os.action.CREATE_USER" />
@@ -5207,6 +5206,7 @@
</activity>
<receiver android:name="com.android.server.BootReceiver"
+ android:exported="true"
android:systemUserOnly="true">
<intent-filter android:priority="1000">
<action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -5214,6 +5214,7 @@
</receiver>
<receiver android:name="com.android.server.updates.CertPinInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_PINS" />
@@ -5222,6 +5223,7 @@
</receiver>
<receiver android:name="com.android.server.updates.IntentFirewallInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_INTENT_FIREWALL" />
@@ -5230,6 +5232,7 @@
</receiver>
<receiver android:name="com.android.server.updates.SmsShortCodesInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_SMS_SHORT_CODES" />
@@ -5238,6 +5241,7 @@
</receiver>
<receiver android:name="com.android.server.updates.NetworkWatchlistInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_NETWORK_WATCHLIST" />
@@ -5246,6 +5250,7 @@
</receiver>
<receiver android:name="com.android.server.updates.ApnDbInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="com.android.internal.intent.action.UPDATE_APN_DB" />
@@ -5254,6 +5259,7 @@
</receiver>
<receiver android:name="com.android.server.updates.CarrierProvisioningUrlsInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS" />
@@ -5262,6 +5268,7 @@
</receiver>
<receiver android:name="com.android.server.updates.CertificateTransparencyLogInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_CT_LOGS" />
@@ -5270,6 +5277,7 @@
</receiver>
<receiver android:name="com.android.server.updates.LangIdInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_LANG_ID" />
@@ -5278,6 +5286,7 @@
</receiver>
<receiver android:name="com.android.server.updates.SmartSelectionInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_SMART_SELECTION" />
@@ -5286,6 +5295,7 @@
</receiver>
<receiver android:name="com.android.server.updates.ConversationActionsInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.intent.action.UPDATE_CONVERSATION_ACTIONS" />
@@ -5294,6 +5304,7 @@
</receiver>
<receiver android:name="com.android.server.updates.CarrierIdInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.os.action.UPDATE_CARRIER_ID_DB" />
@@ -5302,6 +5313,7 @@
</receiver>
<receiver android:name="com.android.server.updates.EmergencyNumberDbInstallReceiver"
+ android:exported="true"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.os.action.UPDATE_EMERGENCY_NUMBER_DB" />
@@ -5310,6 +5322,7 @@
</receiver>
<receiver android:name="com.android.server.MasterClearReceiver"
+ android:exported="true"
android:permission="android.permission.MASTER_CLEAR">
<intent-filter
android:priority="100" >
@@ -5326,6 +5339,7 @@
</receiver>
<receiver android:name="com.android.server.WallpaperUpdateReceiver"
+ android:exported="true"
android:permission="android.permission.RECEIVE_DEVICE_CUSTOMIZATION_READY">
<intent-filter>
<action android:name="android.intent.action.DEVICE_CUSTOMIZATION_READY"/>
@@ -5418,7 +5432,8 @@
android:permission="android.permission.BIND_JOB_SERVICE">
</service>
- <service android:name="com.android.server.pm.PackageManagerShellCommandDataLoader">
+ <service android:name="com.android.server.pm.PackageManagerShellCommandDataLoader"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.LOAD_DATA" />
</intent-filter>
diff --git a/tests/tests/permission2/res/raw/automotive_android_manifest.xml b/tests/tests/permission2/res/raw/automotive_android_manifest.xml
index dd37ac9..b9d182c 100644
--- a/tests/tests/permission2/res/raw/automotive_android_manifest.xml
+++ b/tests/tests/permission2/res/raw/automotive_android_manifest.xml
@@ -350,135 +350,125 @@
android:label="@string/car_permission_label_set_car_vendor_category_10"
android:description="@string/car_permission_desc_set_car_vendor_category_10"/>
- <permission
- android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_label_audio_volume"
- android:description="@string/car_permission_desc_audio_volume" />
+ <permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_label_audio_volume"
+ android:description="@string/car_permission_desc_audio_volume"/>
- <permission
- android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_label_audio_settings"
- android:description="@string/car_permission_desc_audio_settings" />
+ <permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_label_audio_settings"
+ android:description="@string/car_permission_desc_audio_settings"/>
- <permission
- android:name="android.car.permission.RECEIVE_CAR_AUDIO_DUCKING_EVENTS"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_label_receive_ducking"
- android:description="@string/car_permission_desc_receive_ducking" />
+ <permission android:name="android.car.permission.RECEIVE_CAR_AUDIO_DUCKING_EVENTS"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_label_receive_ducking"
+ android:description="@string/car_permission_desc_receive_ducking"/>
- <permission
- android:name="android.car.permission.BIND_INSTRUMENT_CLUSTER_RENDERER_SERVICE"
- android:protectionLevel="signature"
- android:label="@string/car_permission_label_bind_instrument_cluster_rendering"
- android:description="@string/car_permission_desc_bind_instrument_cluster_rendering"/>
+ <permission android:name="android.car.permission.BIND_INSTRUMENT_CLUSTER_RENDERER_SERVICE"
+ android:protectionLevel="signature"
+ android:label="@string/car_permission_label_bind_instrument_cluster_rendering"
+ android:description="@string/car_permission_desc_bind_instrument_cluster_rendering"/>
- <permission
- android:name="android.car.permission.BIND_CAR_INPUT_SERVICE"
- android:protectionLevel="signature"
- android:label="@string/car_permission_label_bind_input_service"
- android:description="@string/car_permission_desc_bind_input_service"/>
+ <permission android:name="android.car.permission.BIND_CAR_INPUT_SERVICE"
+ android:protectionLevel="signature"
+ android:label="@string/car_permission_label_bind_input_service"
+ android:description="@string/car_permission_desc_bind_input_service"/>
- <permission
- android:name="android.car.permission.CAR_DISPLAY_IN_CLUSTER"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_car_display_in_cluster"
- android:description="@string/car_permission_desc_car_display_in_cluster" />
+ <permission android:name="android.car.permission.CAR_DISPLAY_IN_CLUSTER"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_car_display_in_cluster"
+ android:description="@string/car_permission_desc_car_display_in_cluster"/>
- <permission
- android:name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_car_cluster_control"
- android:description="@string/car_permission_desc_car_cluster_control" />
+ <permission android:name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_car_cluster_control"
+ android:description="@string/car_permission_desc_car_cluster_control"/>
- <permission
- android:name="android.car.permission.CAR_HANDLE_USB_AOAP_DEVICE"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_label_car_handle_usb_aoap_device"
- android:description="@string/car_permission_desc_car_handle_usb_aoap_device" />
+ <permission android:name="android.car.permission.CAR_HANDLE_USB_AOAP_DEVICE"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_label_car_handle_usb_aoap_device"
+ android:description="@string/car_permission_desc_car_handle_usb_aoap_device"/>
- <permission
- android:name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_label_car_ux_restrictions_configuration"
- android:description="@string/car_permission_desc_car_ux_restrictions_configuration" />
+ <permission android:name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_label_car_ux_restrictions_configuration"
+ android:description="@string/car_permission_desc_car_ux_restrictions_configuration"/>
- <permission
- android:name="android.car.permission.STORAGE_MONITORING"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_label_storage_monitoring"
- android:description="@string/car_permission_desc_storage_monitoring" />
+ <permission android:name="android.car.permission.STORAGE_MONITORING"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_label_storage_monitoring"
+ android:description="@string/car_permission_desc_storage_monitoring"/>
- <permission
- android:name="android.car.permission.CAR_ENROLL_TRUST"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_label_enroll_trust"
- android:description="@string/car_permission_desc_enroll_trust" />
+ <permission android:name="android.car.permission.CAR_ENROLL_TRUST"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_label_enroll_trust"
+ android:description="@string/car_permission_desc_enroll_trust"/>
- <permission
- android:name="android.car.permission.CAR_TEST_SERVICE"
- android:protectionLevel="system|signature"
- android:label="@string/car_permission_label_car_test_service"
- android:description="@string/car_permission_desc_car_test_service" />
+ <permission android:name="android.car.permission.CAR_TEST_SERVICE"
+ android:protectionLevel="system|signature"
+ android:label="@string/car_permission_label_car_test_service"
+ android:description="@string/car_permission_desc_car_test_service"/>
- <uses-permission android:name="android.permission.CALL_PHONE" />
- <uses-permission android:name="android.permission.DEVICE_POWER" />
- <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS" />
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
- <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" />
- <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />
- <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE" />
- <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
- <uses-permission android:name="android.permission.READ_CALL_LOG" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.REAL_GET_TASKS" />
- <uses-permission android:name="android.permission.REBOOT" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.REMOVE_TASKS" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
- <uses-permission android:name="android.permission.BLUETOOTH" />
- <uses-permission android:name="android.permission.MANAGE_USERS" />
- <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" />
+ <uses-permission android:name="android.permission.CALL_PHONE"/>
+ <uses-permission android:name="android.permission.DEVICE_POWER"/>
+ <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+ <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"/>
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING"/>
+ <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
+ <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.REAL_GET_TASKS"/>
+ <uses-permission android:name="android.permission.REBOOT"/>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+ <uses-permission android:name="android.permission.REMOVE_TASKS"/>
+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-permission android:name="android.permission.BLUETOOTH"/>
+ <uses-permission android:name="android.permission.MANAGE_USERS"/>
+ <uses-permission android:name="android.permission.LOCATION_HARDWARE"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT"/>
<application android:label="@string/app_title"
- android:directBootAware="true"
- android:allowBackup="false"
- android:persistent="true">
+ android:directBootAware="true"
+ android:allowBackup="false"
+ android:persistent="true">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name=".CarService"
- android:singleUser="true">
+ android:singleUser="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.car.ICar" />
+ <action android:name="android.car.ICar"/>
</intent-filter>
</service>
- <service android:name=".PerUserCarService" android:exported="false" />
+ <service android:name=".PerUserCarService"
+ android:exported="false"/>
- <service
- android:name="com.android.car.trust.CarBleTrustAgent"
- android:permission="android.permission.BIND_TRUST_AGENT"
- android:singleUser="true">
+ <service android:name="com.android.car.trust.CarBleTrustAgent"
+ android:permission="android.permission.BIND_TRUST_AGENT"
+ android:singleUser="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.trust.TrustAgentService" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.service.trust.TrustAgentService"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<!-- Warning: the meta data must be included if the service is direct boot aware.
- If not included, the device will crash before boot completes. Rendering the
- device unusable. -->
+ If not included, the device will crash before boot completes. Rendering the
+ device unusable. -->
<meta-data android:name="android.service.trust.trustagent"
- android:resource="@xml/car_trust_agent"/>
+ android:resource="@xml/car_trust_agent"/>
</service>
<activity android:name="com.android.car.pm.ActivityBlockingActivity"
- android:excludeFromRecents="true"
- android:theme="@android:style/Theme.Translucent.NoTitleBar"
- android:exported="false"
- android:launchMode="singleTask">
+ android:excludeFromRecents="true"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"
+ android:exported="false"
+ android:launchMode="singleTask">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/print/AndroidManifest.xml b/tests/tests/print/AndroidManifest.xml
index b3c3f59..746f970 100644
--- a/tests/tests/print/AndroidManifest.xml
+++ b/tests/tests/print/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
Copyright (C) 2014 The Android Open Source Project
@@ -17,72 +16,66 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.print.cts" android:targetSandboxVersion="2">
+ package="android.print.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
- <application android:allowBackup="false" >
+ <application android:allowBackup="false">
<uses-library android:name="android.test.runner"/>
- <activity
- android:name="android.print.test.PrintDocumentActivity"
- android:configChanges="mnc|mnc|touchscreen|navigation|screenLayout|screenSize|smallestScreenSize|orientation|locale|keyboard|keyboardHidden|fontScale|uiMode|layoutDirection|density"
- android:theme="@style/NoAnimation" />
+ <activity android:name="android.print.test.PrintDocumentActivity"
+ android:configChanges="mnc|mnc|touchscreen|navigation|screenLayout|screenSize|smallestScreenSize|orientation|locale|keyboard|keyboardHidden|fontScale|uiMode|layoutDirection|density"
+ android:theme="@style/NoAnimation"/>
- <service
- android:name="android.print.test.services.FirstPrintService"
- android:permission="android.permission.BIND_PRINT_SERVICE">
+ <service android:name="android.print.test.services.FirstPrintService"
+ android:permission="android.permission.BIND_PRINT_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.printservice.PrintService" />
+ <action android:name="android.printservice.PrintService"/>
</intent-filter>
- <meta-data
- android:name="android.printservice"
- android:resource="@xml/printservice">
+ <meta-data android:name="android.printservice"
+ android:resource="@xml/printservice">
</meta-data>
</service>
- <service
- android:name="android.print.test.services.SecondPrintService"
- android:permission="android.permission.BIND_PRINT_SERVICE">
+ <service android:name="android.print.test.services.SecondPrintService"
+ android:permission="android.permission.BIND_PRINT_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.printservice.PrintService" />
+ <action android:name="android.printservice.PrintService"/>
</intent-filter>
- <meta-data
- android:name="android.printservice"
- android:resource="@xml/printservice">
+ <meta-data android:name="android.printservice"
+ android:resource="@xml/printservice">
</meta-data>
</service>
- <activity
- android:name="android.print.test.services.SettingsActivity"
- android:theme="@style/NoAnimation"
- android:exported="true">
+ <activity android:name="android.print.test.services.SettingsActivity"
+ android:theme="@style/NoAnimation"
+ android:exported="true">
</activity>
- <activity
- android:name="android.print.test.services.AddPrintersActivity"
- android:theme="@style/NoAnimation"
- android:exported="true">
+ <activity android:name="android.print.test.services.AddPrintersActivity"
+ android:theme="@style/NoAnimation"
+ android:exported="true">
</activity>
- <activity
- android:name="android.print.test.services.InfoActivity"
- android:theme="@style/NoAnimation"
- android:exported="true">
+ <activity android:name="android.print.test.services.InfoActivity"
+ android:theme="@style/NoAnimation"
+ android:exported="true">
</activity>
- <activity
- android:name="android.print.test.services.CustomPrintOptionsActivity"
- android:permission="android.permission.START_PRINT_SERVICE_CONFIG_ACTIVITY"
- android:exported="true"
- android:theme="@style/NoAnimationTranslucent">
+ <activity android:name="android.print.test.services.CustomPrintOptionsActivity"
+ android:permission="android.permission.START_PRINT_SERVICE_CONFIG_ACTIVITY"
+ android:exported="true"
+ android:theme="@style/NoAnimationTranslucent">
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.print.cts"
- android:label="Tests for the print APIs."/>
+ android:targetPackage="android.print.cts"
+ android:label="Tests for the print APIs."/>
</manifest>
diff --git a/tests/tests/print/ExternalPrintService/AndroidManifest.xml b/tests/tests/print/ExternalPrintService/AndroidManifest.xml
index ff480c1..15100f0 100644
--- a/tests/tests/print/ExternalPrintService/AndroidManifest.xml
+++ b/tests/tests/print/ExternalPrintService/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2018 The Android Open Source Project
@@ -15,19 +16,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.print.cts.externalservice" >
+ package="android.print.cts.externalservice">
- <application android:allowBackup="false" >
- <service
- android:name=".ExternalService"
- android:permission="android.permission.BIND_PRINT_SERVICE">
+ <application android:allowBackup="false">
+ <service android:name=".ExternalService"
+ android:permission="android.permission.BIND_PRINT_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.printservice.PrintService" />
+ <action android:name="android.printservice.PrintService"/>
</intent-filter>
- <meta-data
- android:name="android.printservice"
- android:resource="@xml/printservice">
+ <meta-data android:name="android.printservice"
+ android:resource="@xml/printservice">
</meta-data>
</service>
</application>
diff --git a/tests/tests/print/TEST_MAPPING b/tests/tests/print/TEST_MAPPING
new file mode 100644
index 0000000..325edcd
--- /dev/null
+++ b/tests/tests/print/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsPrintTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/provider/AndroidManifest.xml b/tests/tests/provider/AndroidManifest.xml
index 84d2528..7139333 100644
--- a/tests/tests/provider/AndroidManifest.xml
+++ b/tests/tests/provider/AndroidManifest.xml
@@ -16,119 +16,121 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.provider.cts">
+ package="android.provider.cts">
- <uses-sdk android:targetSdkVersion="28" />
+ <uses-sdk android:targetSdkVersion="28"/>
<!-- This is required for android.provider.cts.media.MediaStore_MetadataKeysTest
- when upgrading targetSdkVersion to R+
+ when upgrading targetSdkVersion to R+
<queries>
<intent>
- <action android:name="android.provider.action.REVIEW" />
+ <action android:name="android.provider.action.REVIEW"
+ />
</intent>
</queries> -->
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
- <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
- <uses-permission android:name="android.permission.USE_CREDENTIALS" />
- <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
- <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
- <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
- <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL" />
- <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
- <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
- <uses-permission android:name="android.permission.WRITE_CONTACTS" />
- <uses-permission android:name="android.permission.READ_CALL_LOG" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.WRITE_SMS" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+ <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>
+ <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
+ <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"/>
+ <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
+ <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+ <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.WRITE_SMS"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<application>
<uses-library android:name="android.test.runner"/>
<activity android:name="android.provider.cts.BrowserStubActivity"
- android:label="BrowserStubActivity">
+ android:label="BrowserStubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<service android:name=".MockInputMethodService"
- android:label="UserDictionaryInputMethodTestService"
- android:permission="android.permission.BIND_INPUT_METHOD">
+ android:label="UserDictionaryInputMethodTestService"
+ android:permission="android.permission.BIND_INPUT_METHOD"
+ android:exported="true">
<intent-filter>
- <action android:name="android.view.InputMethod" />
+ <action android:name="android.view.InputMethod"/>
</intent-filter>
<meta-data android:name="android.view.im"
- android:resource="@xml/method" />
+ android:resource="@xml/method"/>
</service>
<provider android:name="android.provider.cts.MockFontProvider"
- android:authorities="android.provider.fonts.cts.font"
- android:exported="false"
- android:multiprocess="true" />
+ android:authorities="android.provider.fonts.cts.font"
+ android:exported="false"
+ android:multiprocess="true"/>
<provider android:name="android.provider.cts.TestSRSProvider"
- android:authorities="android.provider.cts.TestSRSProvider"
- android:exported="false" />
+ android:authorities="android.provider.cts.TestSRSProvider"
+ android:exported="false"/>
- <service
- android:name="android.provider.cts.contacts.StubInCallService"
- android:permission="android.permission.BIND_INCALL_SERVICE">
+ <service android:name="android.provider.cts.contacts.StubInCallService"
+ android:permission="android.permission.BIND_INCALL_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.telecom.InCallService"/>
</intent-filter>
- <meta-data
- android:name="android.telecom.IN_CALL_SERVICE_UI"
- android:value="true"/>
+ <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI"
+ android:value="true"/>
</service>
- <activity android:name="android.provider.cts.contacts.StubDialerActivity">
+ <activity android:name="android.provider.cts.contacts.StubDialerActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:mimeType="vnd.android.cursor.item/phone" />
- <data android:mimeType="vnd.android.cursor.item/person" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:mimeType="vnd.android.cursor.item/phone"/>
+ <data android:mimeType="vnd.android.cursor.item/person"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="voicemail" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="voicemail"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="tel" />
+ <action android:name="android.intent.action.VIEW"/>
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="tel"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.provider.cts"
- android:label="CTS tests of android.provider">
+ android:targetPackage="android.provider.cts"
+ android:label="CTS tests of android.provider">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/provider/app/GalleryTestApp/AndroidManifest.xml b/tests/tests/provider/app/GalleryTestApp/AndroidManifest.xml
index 24eb5e0..13b423d 100644
--- a/tests/tests/provider/app/GalleryTestApp/AndroidManifest.xml
+++ b/tests/tests/provider/app/GalleryTestApp/AndroidManifest.xml
@@ -15,18 +15,19 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.provider.apps.cts.gallerytestapp">
+ package="android.provider.apps.cts.gallerytestapp">
<application>
<service android:name=".ReviewPrewarmService"/>
- <activity android:name=".ReviewActivity">
+ <activity android:name=".ReviewActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.action.REVIEW" />
- <data android:scheme="content" />
+ <action android:name="android.provider.action.REVIEW"/>
+ <data android:scheme="content"/>
</intent-filter>
<meta-data android:name="android.media.review_gallery_prewarm_service"
- android:value="android.provider.apps.cts.gallerytestapp.ReviewPrewarmService"/>
+ android:value="android.provider.apps.cts.gallerytestapp.ReviewPrewarmService"/>
</activity>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/tests/renderscript/TEST_MAPPING b/tests/tests/renderscript/TEST_MAPPING
new file mode 100644
index 0000000..b49b9d0
--- /dev/null
+++ b/tests/tests/renderscript/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsRenderscriptTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/renderscriptlegacy/TEST_MAPPING b/tests/tests/renderscriptlegacy/TEST_MAPPING
new file mode 100644
index 0000000..b5083ba
--- /dev/null
+++ b/tests/tests/renderscriptlegacy/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsRenderscriptLegacyTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/resolverservice/TEST_MAPPING b/tests/tests/resolverservice/TEST_MAPPING
new file mode 100644
index 0000000..bab3685
--- /dev/null
+++ b/tests/tests/resolverservice/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsResolverServiceTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/resourcesloader/TEST_MAPPING b/tests/tests/resourcesloader/TEST_MAPPING
new file mode 100644
index 0000000..9ebc996
--- /dev/null
+++ b/tests/tests/resourcesloader/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsResourcesLoaderTests"
+ }
+ ]
+}
diff --git a/tests/tests/role/CtsRoleTestApp/AndroidManifest.xml b/tests/tests/role/CtsRoleTestApp/AndroidManifest.xml
index 742db92..93f984a 100644
--- a/tests/tests/role/CtsRoleTestApp/AndroidManifest.xml
+++ b/tests/tests/role/CtsRoleTestApp/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2018 The Android Open Source Project
~
@@ -16,91 +15,90 @@
~ limitations under the License.
-->
-<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.app.role.cts.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.app.role.cts.app">
- <uses-permission android:name="android.permission.SEND_SMS" />
+ <uses-permission android:name="android.permission.SEND_SMS"/>
<application android:label="CtsRoleTestApp">
- <activity
- android:name=".RequestRoleActivity"
- android:exported="true" />
+ <activity android:name=".RequestRoleActivity"
+ android:exported="true"/>
- <activity
- android:name=".IsRoleHeldActivity"
- android:exported="true" />
+ <activity android:name=".IsRoleHeldActivity"
+ android:exported="true"/>
- <activity
- android:name=".ChangeDefaultDialerActivity"
- android:exported="true" />
+ <activity android:name=".ChangeDefaultDialerActivity"
+ android:exported="true"/>
- <activity
- android:name=".ChangeDefaultSmsActivity"
- android:exported="true" />
+ <activity android:name=".ChangeDefaultSmsActivity"
+ android:exported="true"/>
<!-- Dialer -->
- <activity android:name=".DialerDialActivity">
+ <activity android:name=".DialerDialActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
+ <action android:name="android.intent.action.DIAL"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
+ <action android:name="android.intent.action.DIAL"/>
<category android:name="android.intent.category.DEFAULT"/>
- <data android:scheme="tel" />
+ <data android:scheme="tel"/>
</intent-filter>
</activity>
<!-- Sms -->
- <activity android:name=".SmsSendToActivity">
+ <activity android:name=".SmsSendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="smsto" />
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="smsto"/>
</intent-filter>
</activity>
- <service
- android:name=".SmsRespondViaMessageService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
+ <service android:name=".SmsRespondViaMessageService"
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="smsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="smsto"/>
</intent-filter>
</service>
- <receiver
- android:name=".SmsDelieverReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ <receiver android:name=".SmsDelieverReceiver"
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
- <receiver
- android:name=".SmsWapPushDelieverReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ <receiver android:name=".SmsWapPushDelieverReceiver"
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<!-- Browser -->
- <activity android:name=".BrowserActivity">
+ <activity android:name=".BrowserActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.BROWSABLE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="http" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="http"/>
</intent-filter>
</activity>
<!-- Assistant -->
- <activity android:name=".AssistantActivity">
+ <activity android:name=".AssistantActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.ASSIST" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.ASSIST"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/role/CtsRoleTestApp28/AndroidManifest.xml b/tests/tests/role/CtsRoleTestApp28/AndroidManifest.xml
index 032d94d..f3ba473 100644
--- a/tests/tests/role/CtsRoleTestApp28/AndroidManifest.xml
+++ b/tests/tests/role/CtsRoleTestApp28/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright (C) 2019 The Android Open Source Project
~
@@ -16,67 +15,67 @@
~ limitations under the License.
-->
-<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.app.role.cts.app28">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.app.role.cts.app28">
- <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>
+ <uses-sdk android:minSdkVersion="28"
+ android:targetSdkVersion="28"/>
- <uses-permission android:name="android.permission.SEND_SMS" />
+ <uses-permission android:name="android.permission.SEND_SMS"/>
<application android:label="CtsRoleTestApp28">
- <activity
- android:name=".ChangeDefaultDialerActivity"
- android:exported="true" />
+ <activity android:name=".ChangeDefaultDialerActivity"
+ android:exported="true"/>
- <activity
- android:name=".ChangeDefaultSmsActivity"
- android:exported="true" />
+ <activity android:name=".ChangeDefaultSmsActivity"
+ android:exported="true"/>
<!-- Dialer -->
- <activity android:name=".DialerDialActivity">
+ <activity android:name=".DialerDialActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
+ <action android:name="android.intent.action.DIAL"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
+ <action android:name="android.intent.action.DIAL"/>
<category android:name="android.intent.category.DEFAULT"/>
- <data android:scheme="tel" />
+ <data android:scheme="tel"/>
</intent-filter>
</activity>
<!-- Sms -->
- <activity android:name=".SmsSendToActivity">
+ <activity android:name=".SmsSendToActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="smsto" />
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="smsto"/>
</intent-filter>
</activity>
- <service
- android:name=".SmsRespondViaMessageService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
+ <service android:name=".SmsRespondViaMessageService"
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="smsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="smsto"/>
</intent-filter>
</service>
- <receiver
- android:name=".SmsDelieverReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ <receiver android:name=".SmsDelieverReceiver"
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
- <receiver
- android:name=".SmsWapPushDelieverReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ <receiver android:name=".SmsWapPushDelieverReceiver"
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
</application>
diff --git a/tests/tests/rsblas/TEST_MAPPING b/tests/tests/rsblas/TEST_MAPPING
new file mode 100644
index 0000000..5772971
--- /dev/null
+++ b/tests/tests/rsblas/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsRsBlasTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/rscpp/TEST_MAPPING b/tests/tests/rscpp/TEST_MAPPING
new file mode 100644
index 0000000..469d1b7
--- /dev/null
+++ b/tests/tests/rscpp/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsRsCppTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/sax/TEST_MAPPING b/tests/tests/sax/TEST_MAPPING
new file mode 100644
index 0000000..f8c149d
--- /dev/null
+++ b/tests/tests/sax/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsSaxTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/secure_element/omapi/TEST_MAPPING b/tests/tests/secure_element/omapi/TEST_MAPPING
new file mode 100644
index 0000000..d3a6ad9
--- /dev/null
+++ b/tests/tests/secure_element/omapi/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsOmapiTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/security/AndroidManifest.xml b/tests/tests/security/AndroidManifest.xml
index ad23b07..340fb90 100644
--- a/tests/tests/security/AndroidManifest.xml
+++ b/tests/tests/security/AndroidManifest.xml
@@ -16,77 +16,76 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.security.cts">
+ package="android.security.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
- <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
+ <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<!-- For FileIntegrityManager -->
- <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<application android:usesCleartextTraffic="true">
- <uses-library android:name="android.test.runner" />
- <uses-library android:name="org.apache.http.legacy" android:required="false" />
+ <uses-library android:name="android.test.runner"/>
+ <uses-library android:name="org.apache.http.legacy"
+ android:required="false"/>
<service android:name="android.security.cts.SeccompDeathTestService"
- android:process=":death_test_service"
- android:isolatedProcess="true"
- android:exported="true"/>
+ android:process=":death_test_service"
+ android:isolatedProcess="true"
+ android:exported="true"/>
<service android:name="android.security.cts.IsolatedService"
- android:process=":Isolated"
- android:isolatedProcess="true"/>
+ android:process=":Isolated"
+ android:isolatedProcess="true"/>
<service android:name="android.security.cts.activity.SecureRandomService"
- android:process=":secureRandom"/>
- <activity
- android:name="android.security.cts.MotionEventTestActivity"
- android:label="Test MotionEvent">
+ android:process=":secureRandom"/>
+ <activity android:name="android.security.cts.MotionEventTestActivity"
+ android:label="Test MotionEvent"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity
- android:name="android.security.cts.BinderExploitTest$CVE_2019_2213_Activity"
- android:label="Test Binder Exploit Race Condition activity">
+ <activity android:name="android.security.cts.BinderExploitTest$CVE_2019_2213_Activity"
+ android:label="Test Binder Exploit Race Condition activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity
- android:name="android.security.cts.NanoAppBundleTest$FailActivity"
- android:label="Test Nano AppBundle customized failure catch activity">
+ <activity android:name="android.security.cts.NanoAppBundleTest$FailActivity"
+ android:label="Test Nano AppBundle customized failure catch activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RUN" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.RUN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <service
- android:name="android.security.cts.NanoAppBundleTest$AuthenticatorService"
- android:enabled="true"
- android:exported="true">
+ <service android:name="android.security.cts.NanoAppBundleTest$AuthenticatorService"
+ android:enabled="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accounts.AccountAuthenticator" />
+ <action android:name="android.accounts.AccountAuthenticator"/>
</intent-filter>
- <meta-data
- android:name="android.accounts.AccountAuthenticator"
- android:resource="@xml/authenticator" />
+ <meta-data android:name="android.accounts.AccountAuthenticator"
+ android:resource="@xml/authenticator"/>
</service>
- <activity
- android:name="android.security.cts.SkiaJpegDecodingActivity"
- android:label="Test overflow in libskia JPG processing">
+ <activity android:name="android.security.cts.SkiaJpegDecodingActivity"
+ android:label="Test overflow in libskia JPG processing"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
@@ -94,28 +93,28 @@
</activity>
<receiver android:name="com.android.cts.install.lib.LocalIntentSender"
- android:exported="true" />
+ android:exported="true"/>
<receiver android:name="android.security.cts.PackageVerificationsBroadcastReceiver"
- android:permission="android.permission.BIND_PACKAGE_VERIFIER" >
+ android:permission="android.permission.BIND_PACKAGE_VERIFIER"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_NEEDS_VERIFICATION"/>
- <data android:mimeType="application/vnd.android.package-archive" />
+ <data android:mimeType="application/vnd.android.package-archive"/>
</intent-filter>
</receiver>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.security.cts"
- android:label="CTS tests of android.security.cts">
+ android:targetPackage="android.security.cts"
+ android:label="CTS tests of android.security.cts">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.security.cts"
- android:label="CTS tests of android.security.cts">
+ android:targetPackage="android.security.cts"
+ android:label="CTS tests of android.security.cts">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CrashParserRunListener" />
+ android:value="com.android.cts.runner.CrashParserRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/security/testdata/packageinstallertestapp.xml b/tests/tests/security/testdata/packageinstallertestapp.xml
index 7c35c11..5e6e066 100644
--- a/tests/tests/security/testdata/packageinstallertestapp.xml
+++ b/tests/tests/security/testdata/packageinstallertestapp.xml
@@ -16,21 +16,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.security.cts.packageinstallertestapp"
- android:versionCode="1"
- android:versionName="1.0" >
+ package="android.security.cts.packageinstallertestapp"
+ android:versionCode="1"
+ android:versionName="1.0">
<package-verifier android:name="android.security.cts"
- android:publicKey="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3rB8dYLa9mhYe9GICodUFVdjzh00SsfzpdMZ4UGIGF6VY/7D/TCdT5vjdXOdOQtsQnM/nZSgUPgBVX8RObm4/PRix68rdl2J58/LstcqdG6EaExb5hPUzHUuvOfd+p+IP+0SFEuRrWeGsmkzvdnxC2ZZjzEpE8UNDS8EtC2qULkF0cAGcHdHsjlktXRvn4FO+RN1GW6yxs8mOyCabNHASe3AynYFa894Iamu99+RK51+3iyw+u4cVUeVPH3CzJ2Pu1PyqT+9l4gKUbw0gfC6D0/PNEfxe4RPrtn3Z8+ES8+jXPjBLLaMTpT9dFcP25kBwNLiV0MJdTOdZ3f30urtJQIDAQAB" />
+ android:publicKey="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3rB8dYLa9mhYe9GICodUFVdjzh00SsfzpdMZ4UGIGF6VY/7D/TCdT5vjdXOdOQtsQnM/nZSgUPgBVX8RObm4/PRix68rdl2J58/LstcqdG6EaExb5hPUzHUuvOfd+p+IP+0SFEuRrWeGsmkzvdnxC2ZZjzEpE8UNDS8EtC2qULkF0cAGcHdHsjlktXRvn4FO+RN1GW6yxs8mOyCabNHASe3AynYFa894Iamu99+RK51+3iyw+u4cVUeVPH3CzJ2Pu1PyqT+9l4gKUbw0gfC6D0/PNEfxe4RPrtn3Z8+ES8+jXPjBLLaMTpT9dFcP25kBwNLiV0MJdTOdZ3f30urtJQIDAQAB"/>
- <uses-sdk android:minSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="19"/>
<application android:label="PackageInstallerTest Test App">
- <activity android:name="android.security.cts.packageinstallertestapp.MainActivity">
+ <activity android:name="android.security.cts.packageinstallertestapp.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/selinux/selinuxTargetSdk29/TEST_MAPPING b/tests/tests/selinux/selinuxTargetSdk29/TEST_MAPPING
new file mode 100644
index 0000000..fa4a8c1
--- /dev/null
+++ b/tests/tests/selinux/selinuxTargetSdk29/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsSelinuxTargetSdk29TestCases"
+ }
+ ]
+}
diff --git a/tests/tests/sharesheet/AndroidManifest.xml b/tests/tests/sharesheet/AndroidManifest.xml
index 5723d51..ae11600 100644
--- a/tests/tests/sharesheet/AndroidManifest.xml
+++ b/tests/tests/sharesheet/AndroidManifest.xml
@@ -16,65 +16,65 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.sharesheet.cts">
+ package="android.sharesheet.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<!-- Allows test to query for all installed apps, needed to test excluding components -->
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<!-- Needed permission and android:requestLegacyExternalStorage to dump screenshots in case of
- failure -->
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+ failure -->
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
- <application
- android:requestLegacyExternalStorage="true"
- android:label="@string/test_app_label">
+ <application android:requestLegacyExternalStorage="true"
+ android:label="@string/test_app_label">
- <uses-library android:name="android.test.runner" />
-
- <activity android:name=".CtsSharesheetDeviceActivity">
+ <uses-library android:name="android.test.runner"/>
+
+ <activity android:name=".CtsSharesheetDeviceActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="test/cts" />
+ <action android:name="android.intent.action.SEND"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="test/cts"/>
</intent-filter>
<!-- Used to provide Sharing Shortcuts -->
<meta-data android:name="android.app.shortcuts"
- android:resource="@xml/shortcuts"/>
+ android:resource="@xml/shortcuts"/>
<meta-data android:name="android.service.chooser.chooser_target_service"
- android:value=".CtsSharesheetChooserTargetService"/>
+ android:value=".CtsSharesheetChooserTargetService"/>
</activity>
<service android:name=".CtsSharesheetChooserTargetService"
- android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
+ android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.service.chooser.ChooserTargetService" />
+ <action android:name="android.service.chooser.ChooserTargetService"/>
</intent-filter>
</service>
<activity-alias android:name=".ExtraInitialIntentTestActivity"
- android:label="@string/test_extra_initial_intents_label"
- android:targetActivity=".CtsSharesheetDeviceActivity"/>
+ android:label="@string/test_extra_initial_intents_label"
+ android:targetActivity=".CtsSharesheetDeviceActivity"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.sharesheet.cts"
- android:label="CTS tests of android.sharesheet">
+ android:targetPackage="android.sharesheet.cts"
+ android:label="CTS tests of android.sharesheet">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/sharesheet/packages/AndroidManifest-ActivityLabelTester.xml b/tests/tests/sharesheet/packages/AndroidManifest-ActivityLabelTester.xml
index 9da4a37..635907c 100644
--- a/tests/tests/sharesheet/packages/AndroidManifest-ActivityLabelTester.xml
+++ b/tests/tests/sharesheet/packages/AndroidManifest-ActivityLabelTester.xml
@@ -16,21 +16,23 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.sharesheet.cts.packages">
+ package="android.sharesheet.cts.packages">
<application android:label="App A">
- <activity android:name=".LabelTestActivity" android:label="Activity A">
+ <activity android:name=".LabelTestActivity"
+ android:label="Activity A"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="test/cts" />
+ <action android:name="android.intent.action.SEND"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="test/cts"/>
</intent-filter>
</activity>
@@ -38,4 +40,3 @@
</application>
</manifest>
-
diff --git a/tests/tests/sharesheet/packages/AndroidManifest-ExcludeTester.xml b/tests/tests/sharesheet/packages/AndroidManifest-ExcludeTester.xml
index ca2e79e..24b8762 100644
--- a/tests/tests/sharesheet/packages/AndroidManifest-ExcludeTester.xml
+++ b/tests/tests/sharesheet/packages/AndroidManifest-ExcludeTester.xml
@@ -16,21 +16,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.sharesheet.cts.packages">
+ package="android.sharesheet.cts.packages">
<application android:label="Bl Label">
- <activity android:name=".LabelTestActivity">
+ <activity android:name=".LabelTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="test/cts" />
+ <action android:name="android.intent.action.SEND"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="test/cts"/>
</intent-filter>
</activity>
@@ -38,4 +39,3 @@
</application>
</manifest>
-
diff --git a/tests/tests/sharesheet/packages/AndroidManifest-IntentFilterLabelTester.xml b/tests/tests/sharesheet/packages/AndroidManifest-IntentFilterLabelTester.xml
index 1169b49..6450034 100644
--- a/tests/tests/sharesheet/packages/AndroidManifest-IntentFilterLabelTester.xml
+++ b/tests/tests/sharesheet/packages/AndroidManifest-IntentFilterLabelTester.xml
@@ -16,21 +16,23 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.sharesheet.cts.packages">
+ package="android.sharesheet.cts.packages">
<application android:label="App If">
- <activity android:name=".LabelTestActivity" android:label="Activity If">
+ <activity android:name=".LabelTestActivity"
+ android:label="Activity If"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter android:label="IntentFilter If">
- <action android:name="android.intent.action.SEND" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="test/cts" />
+ <action android:name="android.intent.action.SEND"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:mimeType="test/cts"/>
</intent-filter>
</activity>
@@ -38,4 +40,3 @@
</application>
</manifest>
-
diff --git a/tests/tests/shortcutmanager/AndroidManifest.xml b/tests/tests/shortcutmanager/AndroidManifest.xml
index 29b2e83..05e6ef7 100755
--- a/tests/tests/shortcutmanager/AndroidManifest.xml
+++ b/tests/tests/shortcutmanager/AndroidManifest.xml
@@ -13,54 +13,57 @@
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.content.pm.cts.shortcutmanager"
- android:sharedUserId="android.content.pm.cts.shortcutmanager.packages">
+ package="android.content.pm.cts.shortcutmanager"
+ android:sharedUserId="android.content.pm.cts.shortcutmanager.packages">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="android.content.pm.cts.shortcutmanager.MyActivity" />
+ <activity android:name="android.content.pm.cts.shortcutmanager.MyActivity"/>
<activity-alias android:name="non_main"
- android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity" >
+ android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity">
</activity-alias>
<activity-alias android:name="disabled_main"
- android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity"
- android:enabled="false">
+ android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="main"
- android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity">
+ android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="main_shortcut_config"
- android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity">
+ android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.CREATE_SHORTCUT" />
+ <action android:name="android.intent.action.CREATE_SHORTCUT"/>
</intent-filter>
</activity-alias>
<!-- It's not exporeted, but should still be launchable. -->
<activity android:name="android.content.pm.cts.shortcutmanager.ShortcutLaunchedActivity"
- android:exported="false"/>
+ android:exported="false"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.content.pm.cts.shortcutmanager"
- android:label="CTS tests for ShortcutManager">
+ android:targetPackage="android.content.pm.cts.shortcutmanager"
+ android:label="CTS tests for ShortcutManager">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml b/tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml
index ec688fe..4b7dcd9 100755
--- a/tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml
+++ b/tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml
@@ -16,40 +16,43 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.content.pm.cts.shortcutmanager.packages"
- android:sharedUserId="android.content.pm.cts.shortcutmanager.packages">
+ package="android.content.pm.cts.shortcutmanager.packages"
+ android:sharedUserId="android.content.pm.cts.shortcutmanager.packages">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="Launcher">
+ <activity android:name="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.HOME"/>
</intent-filter>
</activity>
<activity-alias android:name="Launcher2"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.HOME"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="Launcher3"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.HOME"/>
</intent-filter>
</activity-alias>
- <activity android:name="ShortcutConfirmPin">
+ <activity android:name="ShortcutConfirmPin"
+ android:exported="true">
<intent-filter>
- <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
+ <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/AndroidManifest.xml b/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/AndroidManifest.xml
index 90d0df5..72f7bd4 100755
--- a/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/AndroidManifest.xml
+++ b/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/AndroidManifest.xml
@@ -16,18 +16,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.content.pm.cts.shortcutmanager.packages">
+ package="android.content.pm.cts.shortcutmanager.packages">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="Launcher">
+ <activity android:name="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.HOME"/>
</intent-filter>
</activity>
</application>
</manifest>
-
diff --git a/tests/tests/shortcutmanager/packages/packagemanifest/AndroidManifest.xml b/tests/tests/shortcutmanager/packages/packagemanifest/AndroidManifest.xml
index a5a0060..0baaaab 100755
--- a/tests/tests/shortcutmanager/packages/packagemanifest/AndroidManifest.xml
+++ b/tests/tests/shortcutmanager/packages/packagemanifest/AndroidManifest.xml
@@ -16,143 +16,166 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.content.pm.cts.shortcutmanager.packages"
- android:sharedUserId="android.content.pm.cts.shortcutmanager.packages">
+ package="android.content.pm.cts.shortcutmanager.packages"
+ android:sharedUserId="android.content.pm.cts.shortcutmanager.packages">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="Launcher"
- android:enabled="true">
+ android:enabled="true"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.HOME"/>
</intent-filter>
</activity>
<activity-alias android:name="Launcher2"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="Launcher3"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="Launcher4"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="Launcher5"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="Launcher_no_main_1"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="Launcher_no_main_2"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias android:name="Launcher_manifest_1"
- android:enabled="false"
- android:targetActivity="Launcher">
+ android:enabled="false"
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts1"/>
+ <meta-data android:name="android.app.shortcuts"
+ android:resource="@xml/shortcuts1"/>
</activity-alias>
<activity-alias android:name="Launcher_manifest_2"
- android:enabled="false"
- android:targetActivity="Launcher">
+ android:enabled="false"
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts2"/>
+ <meta-data android:name="android.app.shortcuts"
+ android:resource="@xml/shortcuts2"/>
</activity-alias>
<activity-alias android:name="Launcher_manifest_3"
- android:enabled="false"
- android:targetActivity="Launcher">
+ android:enabled="false"
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts3"/>
+ <meta-data android:name="android.app.shortcuts"
+ android:resource="@xml/shortcuts3"/>
</activity-alias>
<activity-alias android:name="Launcher_manifest_4a"
- android:enabled="false"
- android:targetActivity="Launcher">
+ android:enabled="false"
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts4a"/>
+ <meta-data android:name="android.app.shortcuts"
+ android:resource="@xml/shortcuts4a"/>
</activity-alias>
<activity-alias android:name="Launcher_manifest_4b"
- android:enabled="false"
- android:targetActivity="Launcher">
+ android:enabled="false"
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts4b"/>
+ <meta-data android:name="android.app.shortcuts"
+ android:resource="@xml/shortcuts4b"/>
</activity-alias>
<activity-alias android:name="Launcher_manifest_error_1"
- android:enabled="false"
- android:targetActivity="Launcher">
+ android:enabled="false"
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_error_1"/>
+ <meta-data android:name="android.app.shortcuts"
+ android:resource="@xml/shortcut_error_1"/>
</activity-alias>
<activity-alias android:name="Launcher_manifest_error_2"
- android:enabled="false"
- android:targetActivity="Launcher">
+ android:enabled="false"
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_error_2"/>
+ <meta-data android:name="android.app.shortcuts"
+ android:resource="@xml/shortcut_error_2"/>
</activity-alias>
<activity-alias android:name="Launcher_manifest_error_3"
- android:enabled="false"
- android:targetActivity="Launcher">
+ android:enabled="false"
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
- <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_error_3"/>
+ <meta-data android:name="android.app.shortcuts"
+ android:resource="@xml/shortcut_error_3"/>
</activity-alias>
</application>
</manifest>
diff --git a/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/AndroidManifest.xml b/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/AndroidManifest.xml
index cd30602..65271c1 100755
--- a/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/AndroidManifest.xml
+++ b/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/AndroidManifest.xml
@@ -16,21 +16,23 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.content.pm.cts.shortcutmanager.packages">
+ package="android.content.pm.cts.shortcutmanager.packages">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="Launcher" android:enabled="true" android:exported="false">
+ <activity android:name="Launcher"
+ android:enabled="true"
+ android:exported="false">
</activity>
<activity-alias android:name="HomeActivity"
- android:targetActivity="Launcher">
+ android:targetActivity="Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
</application>
</manifest>
-
diff --git a/tests/tests/simpleperf/CtsSimpleperfDebuggableApp/AndroidManifest.xml b/tests/tests/simpleperf/CtsSimpleperfDebuggableApp/AndroidManifest.xml
index 348c7b4..6a831b6 100644
--- a/tests/tests/simpleperf/CtsSimpleperfDebuggableApp/AndroidManifest.xml
+++ b/tests/tests/simpleperf/CtsSimpleperfDebuggableApp/AndroidManifest.xml
@@ -15,16 +15,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.simpleperf.debuggable">
+ package="com.android.simpleperf.debuggable">
<application android:debuggable="true">
- <activity
- android:label="simpleperf"
- android:name="com.android.simpleperf.debuggable.MainActivity">
+ <activity android:label="simpleperf"
+ android:name="com.android.simpleperf.debuggable.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <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
+</manifest>
diff --git a/tests/tests/simpleperf/CtsSimpleperfProfileableApp/AndroidManifest.xml b/tests/tests/simpleperf/CtsSimpleperfProfileableApp/AndroidManifest.xml
index d87d10e..a8ff37b 100644
--- a/tests/tests/simpleperf/CtsSimpleperfProfileableApp/AndroidManifest.xml
+++ b/tests/tests/simpleperf/CtsSimpleperfProfileableApp/AndroidManifest.xml
@@ -15,16 +15,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.simpleperf.profileable">
+ package="com.android.simpleperf.profileable">
<application>
- <profileable android:shell="true" />
- <activity
- android:label="simpleperf"
- android:name="com.android.simpleperf.profileable.MainActivity">
+ <profileable android:shell="true"/>
+ <activity android:label="simpleperf"
+ android:name="com.android.simpleperf.profileable.MainActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/slice/AndroidManifest.xml b/tests/tests/slice/AndroidManifest.xml
index 6eb21eb..58d51d0 100644
--- a/tests/tests/slice/AndroidManifest.xml
+++ b/tests/tests/slice/AndroidManifest.xml
@@ -16,45 +16,46 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.slice.cts">
+ package="android.slice.cts">
- <uses-permission android:name="android.permission.BIND_SLICE" />
+ <uses-permission android:name="android.permission.BIND_SLICE"/>
<application android:label="Android TestCase"
- android:icon="@drawable/size_48x48"
- android:maxRecents="1"
- android:multiArch="true"
- android:supportsRtl="true"
- android:debuggable="true">
- <uses-library android:name="android.test.runner" />
+ android:icon="@drawable/size_48x48"
+ android:maxRecents="1"
+ android:multiArch="true"
+ android:supportsRtl="true"
+ android:debuggable="true">
+ <uses-library android:name="android.test.runner"/>
<provider android:name=".SliceProvider"
- android:authorities="android.slice.cts"
- android:process=":slice_process" />
+ android:authorities="android.slice.cts"
+ android:process=":slice_process"/>
<provider android:name=".LocalSliceProvider"
- android:authorities="android.slice.cts.local">
+ android:authorities="android.slice.cts.local">
<intent-filter>
- <action android:name="android.slice.cts.action.TEST_ACTION" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.app.slice.category.SLICE" />
+ <action android:name="android.slice.cts.action.TEST_ACTION"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.app.slice.category.SLICE"/>
</intent-filter>
</provider>
- <activity android:name=".Launcher">
+ <activity android:name=".Launcher"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.HOME"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.slice.cts"
- android:label="CTS tests of android.slice">
+ android:targetPackage="android.slice.cts"
+ android:label="CTS tests of android.slice">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/tests/slice/src/android/slice/cts/SliceProviderTest.java b/tests/tests/slice/src/android/slice/cts/SliceProviderTest.java
index b890447..fda2576 100644
--- a/tests/tests/slice/src/android/slice/cts/SliceProviderTest.java
+++ b/tests/tests/slice/src/android/slice/cts/SliceProviderTest.java
@@ -19,7 +19,6 @@
import android.content.pm.PackageManager;
import androidx.test.InstrumentationRegistry;
import android.content.Context;
-
import android.app.slice.Slice;
import android.app.slice.SliceSpec;
import android.content.ContentResolver;
@@ -35,7 +34,6 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-
import static org.junit.Assume.assumeFalse;
@RunWith(AndroidJUnit4.class)
diff --git a/tests/tests/speech/AndroidManifest.xml b/tests/tests/speech/AndroidManifest.xml
index f3b4d0f..d19dea0 100755
--- a/tests/tests/speech/AndroidManifest.xml
+++ b/tests/tests/speech/AndroidManifest.xml
@@ -16,27 +16,27 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.speech.tts.cts">
+ package="android.speech.tts.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <service android:name="android.speech.tts.cts.StubTextToSpeechService">
+ <service android:name="android.speech.tts.cts.StubTextToSpeechService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TTS_SERVICE" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.TTS_SERVICE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.speech.tts.cts"
- android:label="CTS tests of android.speech">
+ android:targetPackage="android.speech.tts.cts"
+ android:label="CTS tests of android.speech">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/speech/src/android/speech/tts/cts/StubTextToSpeechService.java b/tests/tests/speech/src/android/speech/tts/cts/StubTextToSpeechService.java
index 4665644..e6e06d6 100644
--- a/tests/tests/speech/src/android/speech/tts/cts/StubTextToSpeechService.java
+++ b/tests/tests/speech/src/android/speech/tts/cts/StubTextToSpeechService.java
@@ -48,28 +48,42 @@
public StubTextToSpeechService() {
supportedLanguages.add(new Locale("eng"));
- supportedCountries.add(new Locale("eng", "USA"));
- supportedCountries.add(new Locale("eng", "GBR"));
- GBFallbacks.add(new Locale("eng", "NZL"));
+ supportedCountries.add(new Locale("eng", "US"));
+ supportedCountries.add(new Locale("eng", "GB"));
+ GBFallbacks.add(new Locale("eng", "NZ"));
}
@Override
protected String[] onGetLanguage() {
- return new String[] { "eng", "USA", "" };
+ return new String[] { "eng", "US", "" };
}
@Override
protected int onIsLanguageAvailable(String lang, String country, String variant) {
+ country = convertISO3CountryToISO2(country);
if (supportedCountries.contains(new Locale(lang, country))) {
return TextToSpeech.LANG_COUNTRY_AVAILABLE;
}
if (supportedLanguages.contains(new Locale(lang))) {
return TextToSpeech.LANG_AVAILABLE;
}
-
+
return TextToSpeech.LANG_NOT_SUPPORTED;
}
+ private String convertISO3CountryToISO2(String iso3Country) {
+ switch (iso3Country.toUpperCase()) {
+ case "USA":
+ return "US";
+ case "GBR":
+ return "GB";
+ case "NZL":
+ return "NZ";
+ default:
+ return iso3Country;
+ }
+ }
+
@Override
protected int onLoadLanguage(String lang, String country, String variant) {
return onIsLanguageAvailable(lang, country, variant);
diff --git a/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechServiceTest.java b/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechServiceTest.java
index addd14e..869b7e4 100644
--- a/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechServiceTest.java
+++ b/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechServiceTest.java
@@ -15,6 +15,8 @@
*/
package android.speech.tts.cts;
+import android.media.AudioAttributes;
+import android.net.Uri;
import android.os.Bundle;
import android.os.ConditionVariable;
import android.os.Environment;
@@ -27,6 +29,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.List;
+import java.util.Locale;
/**
* Tests for {@link android.speech.tts.TextToSpeechService} using StubTextToSpeechService.
@@ -34,6 +37,8 @@
public class TextToSpeechServiceTest extends AndroidTestCase {
private static final String UTTERANCE = "text to speech cts test";
private static final String SAMPLE_FILE_NAME = "mytts.wav";
+ private static final String EARCON_UTTERANCE = "testEarcon";
+ private static final String SPEECH_UTTERANCE = "testSpeech";
private TextToSpeechWrapper mTts;
@@ -206,6 +211,82 @@
}
}
+ public void testAddPlayEarcon() throws Exception {
+ File sampleFile = new File(getContext().getExternalFilesDir(null), SAMPLE_FILE_NAME);
+ try {
+ generateSampleAudio(sampleFile);
+
+ Uri sampleUri = Uri.fromFile(sampleFile);
+ assertEquals(getTts().addEarcon(EARCON_UTTERANCE, sampleFile), TextToSpeech.SUCCESS);
+
+ int result = getTts().playEarcon(EARCON_UTTERANCE,
+ TextToSpeech.QUEUE_FLUSH, createParamsBundle(EARCON_UTTERANCE), EARCON_UTTERANCE);
+
+ verifyAddPlay(result, mTts, EARCON_UTTERANCE);
+ } finally {
+ sampleFile.delete();
+ }
+ }
+
+ public void testAddPlaySpeech() throws Exception {
+ File sampleFile = new File(getContext().getExternalFilesDir(null), SAMPLE_FILE_NAME);
+ try {
+ generateSampleAudio(sampleFile);
+
+ Uri sampleUri = Uri.fromFile(sampleFile);
+ assertEquals(getTts().addSpeech(SPEECH_UTTERANCE, sampleFile), TextToSpeech.SUCCESS);
+
+ int result = getTts().speak(SPEECH_UTTERANCE,
+ TextToSpeech.QUEUE_FLUSH, createParamsBundle(SPEECH_UTTERANCE), SPEECH_UTTERANCE);
+
+ verifyAddPlay(result, mTts, SPEECH_UTTERANCE);
+ } finally {
+ sampleFile.delete();
+ }
+ }
+
+ public void testSetLanguage() {
+ TextToSpeech tts = getTts();
+
+ assertEquals(tts.setLanguage(null), TextToSpeech.LANG_NOT_SUPPORTED);
+ assertEquals(tts.setLanguage(new Locale("en", "US")), TextToSpeech.LANG_COUNTRY_AVAILABLE);
+ assertEquals(tts.setLanguage(new Locale("en")), TextToSpeech.LANG_AVAILABLE);
+ assertEquals(tts.setLanguage(new Locale("es", "US")), TextToSpeech.LANG_NOT_SUPPORTED);
+ }
+
+ public void testAddAudioAttributes() {
+ TextToSpeech tts = getTts();
+ AudioAttributes attr =
+ new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build();
+
+ assertEquals(tts.setAudioAttributes(null), TextToSpeech.ERROR);
+ assertEquals(tts.setAudioAttributes(attr), TextToSpeech.SUCCESS);
+ }
+
+ private void generateSampleAudio(File sampleFile) throws Exception {
+ assertFalse(sampleFile.exists());
+
+ ParcelFileDescriptor fileDescriptor = ParcelFileDescriptor.open(sampleFile,
+ ParcelFileDescriptor.MODE_WRITE_ONLY
+ | ParcelFileDescriptor.MODE_CREATE
+ | ParcelFileDescriptor.MODE_TRUNCATE);
+
+ Bundle params = createParamsBundle("mocktofile");
+
+ int result =
+ getTts().synthesizeToFile(
+ UTTERANCE, params, fileDescriptor,
+ params.getString(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID));
+
+ verifySynthesisFile(result, mTts, sampleFile);
+ }
+
+ private void verifyAddPlay(int result, TextToSpeechWrapper mTts, String utterance)
+ throws Exception {
+ assertEquals(TextToSpeech.SUCCESS, result);
+ assertTrue(mTts.waitForComplete(utterance));
+ }
+
private HashMap<String, String> createParams(String utteranceId) {
HashMap<String, String> params = new HashMap<>();
params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, utteranceId);
diff --git a/tests/tests/systemui/AndroidManifest.xml b/tests/tests/systemui/AndroidManifest.xml
index c7732c2..9ff7f3e 100644
--- a/tests/tests/systemui/AndroidManifest.xml
+++ b/tests/tests/systemui/AndroidManifest.xml
@@ -16,33 +16,33 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.systemui.cts"
- android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.INJECT_EVENTS" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+ package="android.systemui.cts"
+ android:targetSandboxVersion="2">
+ <uses-permission android:name="android.permission.INJECT_EVENTS"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
<application android:requestLegacyExternalStorage="true">
<activity android:name=".LightBarActivity"
- android:theme="@android:style/Theme.Material.NoActionBar"
- android:screenOrientation="portrait"></activity>
+ android:theme="@android:style/Theme.Material.NoActionBar"
+ android:screenOrientation="portrait"/>
<activity android:name=".LightBarThemeActivity"
- android:theme="@style/LightBarTheme"
- android:screenOrientation="portrait"></activity>
+ android:theme="@style/LightBarTheme"
+ android:screenOrientation="portrait"/>
<activity android:name=".WindowInsetsActivity"
- android:theme="@android:style/Theme.Material"
- android:screenOrientation="portrait">
+ android:theme="@android:style/Theme.Material"
+ android:screenOrientation="portrait"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.systemui.cts">
+ android:targetPackage="android.systemui.cts">
</instrumentation>
</manifest>
-
diff --git a/tests/tests/telecom/AndroidManifest.xml b/tests/tests/telecom/AndroidManifest.xml
index 5e6a6ee..6a327d9 100644
--- a/tests/tests/telecom/AndroidManifest.xml
+++ b/tests/tests/telecom/AndroidManifest.xml
@@ -15,143 +15,154 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telecom.cts"
- android:sharedUserId="android.telecom.cts">
- <uses-sdk android:minSdkVersion="21" />
- <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
- <uses-permission android:name="android.permission.CALL_PHONE" />
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
- <uses-permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.READ_CALL_LOG" />
- <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
- <uses-permission android:name="android.permission.ACCEPT_HANDOVER" />
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
- <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.WRITE_CONTACTS" />
- <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
- <uses-permission android:name="android.permission.ENTER_CAR_MODE_PRIORITIZED" />
+ package="android.telecom.cts"
+ android:sharedUserId="android.telecom.cts">
+ <uses-sdk android:minSdkVersion="21"/>
+ <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS"/>
+ <uses-permission android:name="android.permission.CALL_PHONE"/>
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
+ <uses-permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+ <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER"/>
+ <uses-permission android:name="android.permission.ACCEPT_HANDOVER"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+ <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+ <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+ <uses-permission android:name="android.permission.ENTER_CAR_MODE_PRIORITIZED"/>
- <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
+ <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name="android.telecom.cts.CtsRemoteConnectionService"
- android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
+ android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.ConnectionService" />
+ <action android:name="android.telecom.ConnectionService"/>
</intent-filter>
</service>
<service android:name="android.telecom.cts.CtsConnectionService"
- android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
+ android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.ConnectionService" />
+ <action android:name="android.telecom.ConnectionService"/>
</intent-filter>
</service>
<service android:name="android.telecom.cts.CtsSelfManagedConnectionService"
- android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
+ android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.ConnectionService" />
+ <action android:name="android.telecom.ConnectionService"/>
</intent-filter>
</service>
<service android:name="android.telecom.cts.MockInCallService"
- android:permission="android.permission.BIND_INCALL_SERVICE" >
+ android:permission="android.permission.BIND_INCALL_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.telecom.InCallService"/>
</intent-filter>
- <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />
- <meta-data android:name="android.telecom.INCLUDE_EXTERNAL_CALLS" android:value="true" />
+ <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI"
+ android:value="true"/>
+ <meta-data android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"
+ android:value="true"/>
</service>
<service android:name="android.telecom.cts.MockCallScreeningService"
- android:permission="android.permission.BIND_SCREENING_SERVICE"
- android:enabled="false" >
+ android:permission="android.permission.BIND_SCREENING_SERVICE"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.telecom.CallScreeningService"/>
</intent-filter>
</service>
<service android:name="android.telecom.cts.CtsPhoneAccountSuggestionService"
- android:permission="android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE"
- android:enabled="false" >
+ android:permission="android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.telecom.PhoneAccountSuggestionService"/>
</intent-filter>
</service>
<service android:name="com.android.compatibility.common.util.BlockedNumberService"
- android:exported="true"
- android:singleUser="true" >
+ android:exported="true"
+ android:singleUser="true">
<intent-filter>
<action android:name="android.telecom.cts.InsertBlockedNumber"/>
<action android:name="android.telecom.cts.DeleteBlockedNumber"/>
</intent-filter>
</service>
- <receiver android:name="android.telecom.cts.MockMissedCallNotificationReceiver">
+ <receiver android:name="android.telecom.cts.MockMissedCallNotificationReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />
+ <action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION"/>
</intent-filter>
</receiver>
- <receiver android:name="android.telecom.cts.MockPhoneAccountChangedReceiver">
+ <receiver android:name="android.telecom.cts.MockPhoneAccountChangedReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.telecom.action.PHONE_ACCOUNT_REGISTERED"/>
<action android:name="android.telecom.action.PHONE_ACCOUNT_UNREGISTERED"/>
</intent-filter>
</receiver>
- <receiver android:name="android.telecom.cts.NewOutgoingCallBroadcastReceiver">
+ <receiver android:name="android.telecom.cts.NewOutgoingCallBroadcastReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.NEW_OUTGOING_CALL"/>
</intent-filter>
</receiver>
- <activity android:name="android.telecom.cts.MockDialerActivity">
+ <activity android:name="android.telecom.cts.MockDialerActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:mimeType="vnd.android.cursor.item/phone" />
- <data android:mimeType="vnd.android.cursor.item/person" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:mimeType="vnd.android.cursor.item/phone"/>
+ <data android:mimeType="vnd.android.cursor.item/person"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="voicemail" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="voicemail"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="tel" />
+ <action android:name="android.intent.action.VIEW"/>
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="tel"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.telecom.cts"
- android:label="CTS tests for android.telecom package">
+ android:targetPackage="android.telecom.cts"
+ android:label="CTS tests for android.telecom package">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/telecom/Api29InCallServiceTestApp/AndroidManifest.xml b/tests/tests/telecom/Api29InCallServiceTestApp/AndroidManifest.xml
index 715e8f7..ab1115e 100644
--- a/tests/tests/telecom/Api29InCallServiceTestApp/AndroidManifest.xml
+++ b/tests/tests/telecom/Api29InCallServiceTestApp/AndroidManifest.xml
@@ -15,34 +15,34 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telecom.cts.api29incallservice"
- android:versionCode="1"
- android:versionName="1.0"
- android:sharedUserId="android.telecom.cts">
+ package="android.telecom.cts.api29incallservice"
+ android:versionCode="1"
+ android:versionName="1.0"
+ android:sharedUserId="android.telecom.cts">
<!-- sdk 15 is the max for read call log -->
<uses-sdk android:minSdkVersion="15"
- android:targetSdkVersion="29" />
+ android:targetSdkVersion="29"/>
<uses-permission android:name="android.permission.READ_CALL_LOG"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
- <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
+ <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
<application android:label="Api29CTSInCallService">
<service android:name=".CtsApi29InCallService"
- android:permission="android.permission.BIND_INCALL_SERVICE"
- android:launchMode="singleInstance"
- android:exported="true">
+ android:permission="android.permission.BIND_INCALL_SERVICE"
+ android:launchMode="singleInstance"
+ android:exported="true">
<!-- indicates it's a non-UI service, required by non-Ui InCallService -->
<intent-filter>
<action android:name="android.telecom.InCallService"/>
</intent-filter>
</service>
<service android:name=".CtsApi29InCallServiceControl"
- android:launchMode="singleInstance">
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action
- android:name="android.telecom.cts.api29incallservice.ACTION_API29_CONTROL"/>
+ <action android:name="android.telecom.cts.api29incallservice.ACTION_API29_CONTROL"/>
</intent-filter>
</service>
</application>
diff --git a/tests/tests/telecom/CallRedirectionServiceTestApp/AndroidManifest.xml b/tests/tests/telecom/CallRedirectionServiceTestApp/AndroidManifest.xml
index ff23b74..b4145ec 100644
--- a/tests/tests/telecom/CallRedirectionServiceTestApp/AndroidManifest.xml
+++ b/tests/tests/telecom/CallRedirectionServiceTestApp/AndroidManifest.xml
@@ -15,20 +15,22 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telecom.cts.redirectiontestapp">
+ package="android.telecom.cts.redirectiontestapp">
<permission android:name="android.telecom.cts.redirectiontestapp.CTS_SERVICE_PERMISSION"
- android.protectionLevel="signature"/>
+ android.protectionLevel="signature"/>
<application android:label="CTSCRTest">
<service android:name=".CtsCallRedirectionService"
- android:permission="android.permission.BIND_CALL_REDIRECTION_SERVICE">
+ android:permission="android.permission.BIND_CALL_REDIRECTION_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.CallRedirectionService" />
+ <action android:name="android.telecom.CallRedirectionService"/>
</intent-filter>
</service>
- <service android:name=".CtsCallRedirectionServiceController">
+ <service android:name=".CtsCallRedirectionServiceController"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.cts.redirectiontestapp.ACTION_CONTROL_CALL_REDIRECTION_SERVICE" />
+ <action android:name="android.telecom.cts.redirectiontestapp.ACTION_CONTROL_CALL_REDIRECTION_SERVICE"/>
</intent-filter>
</service>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/tests/telecom/CallScreeningServiceTestApp/AndroidManifest.xml b/tests/tests/telecom/CallScreeningServiceTestApp/AndroidManifest.xml
index 7428130..679a320 100644
--- a/tests/tests/telecom/CallScreeningServiceTestApp/AndroidManifest.xml
+++ b/tests/tests/telecom/CallScreeningServiceTestApp/AndroidManifest.xml
@@ -15,29 +15,32 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telecom.cts.screeningtestapp">
+ package="android.telecom.cts.screeningtestapp">
<permission android:name="android.telecom.cts.screeningtestapp.CTS_SERVICE_PERMISSION"
- android.protectionLevel="signature"/>
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.REVOKE_RUNTIME_PERMISSIONS" />
- <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS" />
+ android.protectionLevel="signature"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.REVOKE_RUNTIME_PERMISSIONS"/>
+ <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS"/>
<application android:label="CTSCSTest">
<service android:name=".CtsCallScreeningService"
- android:permission="android.permission.BIND_SCREENING_SERVICE">
+ android:permission="android.permission.BIND_SCREENING_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.CallScreeningService" />
+ <action android:name="android.telecom.CallScreeningService"/>
</intent-filter>
</service>
- <service android:name=".CallScreeningServiceControl">
+ <service android:name=".CallScreeningServiceControl"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.cts.screeningtestapp.ACTION_CONTROL_CALL_SCREENING_SERVICE" />
+ <action android:name="android.telecom.cts.screeningtestapp.ACTION_CONTROL_CALL_SCREENING_SERVICE"/>
</intent-filter>
</service>
<activity android:name=".CtsPostCallActivity"
- android:label="CtsPostCallActivity">
+ android:label="CtsPostCallActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.action.POST_CALL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.telecom.action.POST_CALL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
diff --git a/tests/tests/telecom/ThirdPtyInCallServiceTestApp/AndroidManifest.xml b/tests/tests/telecom/ThirdPtyInCallServiceTestApp/AndroidManifest.xml
index eb509ec..910feaa 100644
--- a/tests/tests/telecom/ThirdPtyInCallServiceTestApp/AndroidManifest.xml
+++ b/tests/tests/telecom/ThirdPtyInCallServiceTestApp/AndroidManifest.xml
@@ -15,36 +15,36 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telecom.cts.thirdptyincallservice"
- android:versionCode="1"
- android:versionName="1.0" >
+ package="android.telecom.cts.thirdptyincallservice"
+ android:versionCode="1"
+ android:versionName="1.0">
<!-- sdk 15 is the max for read call log -->
- <uses-sdk android:minSdkVersion="15" />
+ <uses-sdk android:minSdkVersion="15"/>
<uses-permission android:name="android.permission.READ_CALL_LOG"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
- <uses-permission android:name="android.permission.CALL_COMPANION_APP" />
+ <uses-permission android:name="android.permission.CALL_COMPANION_APP"/>
<application android:label="ThirdPtyCTSInCallService">
<service android:name=".CtsThirdPartyInCallService"
- android:permission="android.permission.BIND_INCALL_SERVICE"
- android:launchMode="singleInstance"
- android:exported="true">
+ android:permission="android.permission.BIND_INCALL_SERVICE"
+ android:launchMode="singleInstance"
+ android:exported="true">
<!-- indicates it's a non-UI service, required by non-Ui InCallService -->
<intent-filter>
<action android:name="android.telecom.InCallService"/>
</intent-filter>
<meta-data android:name="android.telecom.IN_CALL_SERVICE_CAR_MODE_UI"
- android:value="true" />
+ android:value="true"/>
<meta-data android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"
- android:value="true" />
+ android:value="true"/>
</service>
<service android:name=".CtsThirdPartyInCallServiceControl"
- android:launchMode="singleInstance">
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action
- android:name="android.telecom.cts.thirdptyincallservice.ACTION_THIRDPTY_CTRL"/>
+ <action android:name="android.telecom.cts.thirdptyincallservice.ACTION_THIRDPTY_CTRL"/>
</intent-filter>
</service>
</application>
diff --git a/tests/tests/telecom/src/android/telecom/cts/OutgoingCallTest.java b/tests/tests/telecom/src/android/telecom/cts/OutgoingCallTest.java
index 8b2ff44..8172dc2 100644
--- a/tests/tests/telecom/src/android/telecom/cts/OutgoingCallTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/OutgoingCallTest.java
@@ -190,6 +190,7 @@
assertEquals(TestUtils.TEST_PHONE_ACCOUNT_HANDLE, conn.getPhoneAccountHandle());
cleanupCalls();
+ CtsConnectionService.tearDown();
setupConnectionService(null, FLAG_REGISTER | FLAG_ENABLE);
mTelecomManager.registerPhoneAccount(TestUtils.TEST_PHONE_ACCOUNT_2);
diff --git a/tests/tests/telecom2/AndroidManifest.xml b/tests/tests/telecom2/AndroidManifest.xml
index 00e58eb..d579152 100644
--- a/tests/tests/telecom2/AndroidManifest.xml
+++ b/tests/tests/telecom2/AndroidManifest.xml
@@ -15,69 +15,71 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telecom2.cts">
- <uses-sdk android:minSdkVersion="21" />
+ package="android.telecom2.cts">
+ <uses-sdk android:minSdkVersion="21"/>
<!--
- This app contains tests to verify Telecom's behavior when the app is missing certain
- permissions.
- -->
+ This app contains tests to verify Telecom's behavior when the app is missing certain
+ permissions.
+ -->
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name="android.telecom.cts.MockConnectionService"
- android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
+ android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.ConnectionService" />
+ <action android:name="android.telecom.ConnectionService"/>
</intent-filter>
</service>
<service android:name="android.telecom.cts.MockInCallService"
- android:permission="android.permission.BIND_INCALL_SERVICE" >
+ android:permission="android.permission.BIND_INCALL_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.telecom.InCallService"/>
</intent-filter>
</service>
- <activity android:name="android.telecom.cts.MockDialerActivity">
+ <activity android:name="android.telecom.cts.MockDialerActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:mimeType="vnd.android.cursor.item/phone" />
- <data android:mimeType="vnd.android.cursor.item/person" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:mimeType="vnd.android.cursor.item/phone"/>
+ <data android:mimeType="vnd.android.cursor.item/person"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="voicemail" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="voicemail"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="tel" />
+ <action android:name="android.intent.action.VIEW"/>
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="tel"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.telecom2.cts"
- android:label="CTS tests for android.telecom package">
+ android:targetPackage="android.telecom2.cts"
+ android:label="CTS tests for android.telecom package">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/telecom2/TEST_MAPPING b/tests/tests/telecom2/TEST_MAPPING
new file mode 100644
index 0000000..b7f7d80
--- /dev/null
+++ b/tests/tests/telecom2/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsTelecomTestCases2"
+ }
+ ]
+}
diff --git a/tests/tests/telecom3/AndroidManifest.xml b/tests/tests/telecom3/AndroidManifest.xml
index c606dcb..351260c 100644
--- a/tests/tests/telecom3/AndroidManifest.xml
+++ b/tests/tests/telecom3/AndroidManifest.xml
@@ -15,73 +15,78 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telecom3.cts">
- <uses-sdk android:minSdkVersion="25" />
- <uses-permission android:name="android.permission.CALL_PHONE" />>
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
- <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
+ package="android.telecom3.cts">
+ <uses-sdk android:minSdkVersion="25"/>
+ <uses-permission android:name="android.permission.CALL_PHONE"/>>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER"/>
+ <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name="android.telecom.cts.CtsSelfManagedConnectionService"
- android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
+ android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telecom.ConnectionService" />
+ <action android:name="android.telecom.ConnectionService"/>
</intent-filter>
</service>
<service android:name="android.telecom.cts.SelfManagedAwareInCallService"
- android:permission="android.permission.BIND_INCALL_SERVICE" >
+ android:permission="android.permission.BIND_INCALL_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.telecom.InCallService"/>
</intent-filter>
- <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />
- <meta-data android:name="android.telecom.INCLUDE_EXTERNAL_CALLS" android:value="true" />
- <meta-data android:name="android.telecom.INCLUDE_SELF_MANAGED_CALLS" android:value="true" />
+ <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI"
+ android:value="true"/>
+ <meta-data android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"
+ android:value="true"/>
+ <meta-data android:name="android.telecom.INCLUDE_SELF_MANAGED_CALLS"
+ android:value="true"/>
</service>
- <activity android:name="android.telecom.cts.MockDialerActivity">
+ <activity android:name="android.telecom.cts.MockDialerActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:mimeType="vnd.android.cursor.item/phone" />
- <data android:mimeType="vnd.android.cursor.item/person" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:mimeType="vnd.android.cursor.item/phone"/>
+ <data android:mimeType="vnd.android.cursor.item/person"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="voicemail" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="voicemail"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="tel" />
+ <action android:name="android.intent.action.VIEW"/>
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="tel"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.telecom3.cts"
- android:label="CTS tests for android.telecom package">
+ android:targetPackage="android.telecom3.cts"
+ android:label="CTS tests for android.telecom package">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/telephony/TestSmsApp/AndroidManifest.xml b/tests/tests/telephony/TestSmsApp/AndroidManifest.xml
index 210a6ee..717437e 100644
--- a/tests/tests/telephony/TestSmsApp/AndroidManifest.xml
+++ b/tests/tests/telephony/TestSmsApp/AndroidManifest.xml
@@ -15,60 +15,62 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephony.cts.sms">
+ package="android.telephony.cts.sms">
<uses-permission android:name="android.permission.READ_SMS"/>
<application android:label="TestSmsApp">
- <activity
- android:name="android.telephony.cts.sms.MainActivity"
- android:exported="true"/>
+ <activity android:name="android.telephony.cts.sms.MainActivity"
+ android:exported="true"/>
<!-- BroadcastReceiver that listens for incoming SMS messages -->
<receiver android:name=".SmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<!-- BroadcastReceiver that listens for incoming MMS messages -->
<receiver android:name=".MmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<!-- Activity that allows the user to send new SMS/MMS messages -->
- <activity android:name=".ComposeSmsActivity" >
+ <activity android:name=".ComposeSmsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
- <!-- Service that delivers messages from the phone "quick response" -->
+ <!-- Service that delivers messages from the phone "quick response"
+ -->
<service android:name=".HeadlessSmsSendService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
- android:exported="true" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/telephony/TestSmsApp22/AndroidManifest.xml b/tests/tests/telephony/TestSmsApp22/AndroidManifest.xml
index de0047d..0413ffc 100644
--- a/tests/tests/telephony/TestSmsApp22/AndroidManifest.xml
+++ b/tests/tests/telephony/TestSmsApp22/AndroidManifest.xml
@@ -15,62 +15,64 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephony.cts.sms23">
+ package="android.telephony.cts.sms23">
<uses-sdk android:targetSdkVersion="22"/>
<uses-permission android:name="android.permission.READ_SMS"/>
<application android:label="TestSmsApp">
- <activity
- android:name="android.telephony.cts.sms23.MainActivity"
- android:exported="true"/>
+ <activity android:name="android.telephony.cts.sms23.MainActivity"
+ android:exported="true"/>
<!-- BroadcastReceiver that listens for incoming SMS messages -->
<receiver android:name=".SmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<!-- BroadcastReceiver that listens for incoming MMS messages -->
<receiver android:name=".MmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<!-- Activity that allows the user to send new SMS/MMS messages -->
- <activity android:name=".ComposeSmsActivity" >
+ <activity android:name=".ComposeSmsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
- <!-- Service that delivers messages from the phone "quick response" -->
+ <!-- Service that delivers messages from the phone "quick response"
+ -->
<service android:name=".HeadlessSmsSendService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
- android:exported="true" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/telephony/TestSmsRetrieverApp/AndroidManifest.xml b/tests/tests/telephony/TestSmsRetrieverApp/AndroidManifest.xml
index 2ac0079f..3b58119 100644
--- a/tests/tests/telephony/TestSmsRetrieverApp/AndroidManifest.xml
+++ b/tests/tests/telephony/TestSmsRetrieverApp/AndroidManifest.xml
@@ -13,16 +13,17 @@
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.telephony.cts.smsretriever">
+ package="android.telephony.cts.smsretriever">
<application android:label="TestSmsRetrieverApp">
- <activity
- android:name="android.telephony.cts.smsretriever.MainActivity"
- android:exported="true"/>
- <receiver android:name="android.telephony.cts.smsretriever.SmsRetrieverBroadcastReceiver">
+ <activity android:name="android.telephony.cts.smsretriever.MainActivity"
+ android:exported="true"/>
+ <receiver android:name="android.telephony.cts.smsretriever.SmsRetrieverBroadcastReceiver"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telephony.cts.action.SMS_RETRIEVED"></action>
+ <action android:name="android.telephony.cts.action.SMS_RETRIEVED"/>
</intent-filter>
</receiver>
</application>
diff --git a/tests/tests/telephony/current/Android.bp b/tests/tests/telephony/current/Android.bp
index 757e051..9b62e24 100644
--- a/tests/tests/telephony/current/Android.bp
+++ b/tests/tests/telephony/current/Android.bp
@@ -32,6 +32,7 @@
"telephony-common",
"android.test.runner",
"android.test.base",
+ "framework-telephony-stubs",
"voip-common",
],
// uncomment when EuiccService tests do not use hidden APIs (Binder instances)
diff --git a/tests/tests/telephony/current/AndroidManifest.xml b/tests/tests/telephony/current/AndroidManifest.xml
index f6b655e..e8b41f0 100644
--- a/tests/tests/telephony/current/AndroidManifest.xml
+++ b/tests/tests/telephony/current/AndroidManifest.xml
@@ -15,108 +15,109 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephony.cts">
+ package="android.telephony.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.WRITE_CONTACTS" />
- <uses-permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.BLUETOOTH" />
- <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
- <uses-permission android:name="android.permission.USE_SIP" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+ <uses-permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.BLUETOOTH"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+ <uses-permission android:name="android.permission.USE_SIP"/>
<uses-permission android:name="android.telephony.embms.cts.permission.TEST_BROADCAST"/>
<uses-permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />
<permission android:name="android.telephony.embms.cts.permission.TEST_BROADCAST"
- android:protectionLevel="signature"/>
+ android:protectionLevel="signature"/>
<application>
<provider android:name="android.telephony.cts.MmsPduProvider"
- android:authorities="telephonyctstest"
- android:grantUriPermissions="true" />
+ android:authorities="telephonyctstest"
+ android:grantUriPermissions="true"/>
<!-- SmsReceiver, MmsReceiver, ComposeSmsActivity, HeadlessSmsSendService together make
- this a valid SmsApplication (that can be set as the default SMS app). Although some of these
- classes don't do anything, they are needed to make this a valid candidate for default SMS
- app. -->
+ this a valid SmsApplication (that can be set as the default SMS app). Although some of these
+ classes don't do anything, they are needed to make this a valid candidate for default SMS
+ app. -->
<!-- BroadcastReceiver that listens for incoming SMS messages -->
<receiver android:name=".SmsReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<!-- BroadcastReceiver that listens for incoming MMS messages -->
<receiver android:name=".MmsReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<!-- Activity that allows the user to send new SMS/MMS messages -->
- <activity android:name=".ComposeSmsActivity" >
+ <activity android:name=".ComposeSmsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
- <!-- Service that delivers messages from the phone "quick response" -->
+ <!-- Service that delivers messages from the phone "quick response"
+ -->
<service android:name=".HeadlessSmsSendService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
- android:exported="true" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
- <service
- android:name="android.telephony.cts.StubInCallService"
- android:permission="android.permission.BIND_INCALL_SERVICE">
+ <service android:name="android.telephony.cts.StubInCallService"
+ android:permission="android.permission.BIND_INCALL_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.telecom.InCallService"/>
</intent-filter>
- <meta-data
- android:name="android.telecom.IN_CALL_SERVICE_UI"
- android:value="true"/>
+ <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI"
+ android:value="true"/>
</service>
- <service
- android:name=".MockVisualVoicemailService"
- android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
- android:exported="true">
+ <service android:name=".MockVisualVoicemailService"
+ android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
+ android:exported="true">
<intent-filter>
<action android:name="android.telephony.VisualVoicemailService"/>
</intent-filter>
</service>
- <service
- android:name=".PermissionlessVisualVoicemailService"
- android:enabled="false"
- android:exported="true">
+ <service android:name=".PermissionlessVisualVoicemailService"
+ android:enabled="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.telephony.VisualVoicemailService"/>
</intent-filter>
@@ -124,61 +125,62 @@
</service>
<service android:name="com.android.compatibility.common.util.BlockedNumberService"
- android:exported="true"
- android:singleUser="true" >
+ android:exported="true"
+ android:singleUser="true">
<intent-filter>
<action android:name="android.telecom.cts.InsertBlockedNumber"/>
<action android:name="android.telecom.cts.DeleteBlockedNumber"/>
</intent-filter>
</service>
- <service
- android:name="android.telephony.euicc.cts.MockEuiccService"
- android:permission="android.permission.BIND_EUICC_SERVICE"
- android:exported="true">
+ <service android:name="android.telephony.euicc.cts.MockEuiccService"
+ android:permission="android.permission.BIND_EUICC_SERVICE"
+ android:exported="true">
<intent-filter android:priority="100">
<action android:name="android.service.euicc.EuiccService"/>
</intent-filter>
</service>
<service android:name="android.telephony.ims.cts.TestImsService"
- android:directBootAware="true"
- android:persistent="true"
- android:permission="android.permission.BIND_IMS_SERVICE">
+ android:directBootAware="true"
+ android:persistent="true"
+ android:permission="android.permission.BIND_IMS_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telephony.ims.ImsService" />
+ <action android:name="android.telephony.ims.ImsService"/>
</intent-filter>
</service>
- <activity android:name="android.telephony.cts.StubDialerActvity">
+ <activity android:name="android.telephony.cts.StubDialerActvity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:mimeType="vnd.android.cursor.item/phone" />
- <data android:mimeType="vnd.android.cursor.item/person" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:mimeType="vnd.android.cursor.item/phone"/>
+ <data android:mimeType="vnd.android.cursor.item/person"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="voicemail" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="voicemail"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <action android:name="android.intent.action.DIAL" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="tel" />
+ <action android:name="android.intent.action.VIEW"/>
+ <action android:name="android.intent.action.DIAL"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="tel"/>
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
@@ -186,41 +188,37 @@
<activity android:name="android.telephony.euicc.cts.EuiccResolutionActivity"/>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- This is the receiver defined by the MBMS api. -->
- <receiver
- android:name="android.telephony.mbms.MbmsDownloadReceiver"
- android:permission="android.telephony.cts.embmstestapp.CTS_DOWNLOAD_PERMISSION"
- android:enabled="true"
- android:exported="true">
+ <receiver android:name="android.telephony.mbms.MbmsDownloadReceiver"
+ android:permission="android.telephony.cts.embmstestapp.CTS_DOWNLOAD_PERMISSION"
+ android:enabled="true"
+ android:exported="true">
</receiver>
- <provider
- android:name="android.telephony.mbms.MbmsTempFileProvider"
- android:authorities="android.telephony.mbms.cts"
- android:exported="false"
- android:grantUriPermissions="true">
+ <provider android:name="android.telephony.mbms.MbmsTempFileProvider"
+ android:authorities="android.telephony.mbms.cts"
+ android:exported="false"
+ android:grantUriPermissions="true">
</provider>
<meta-data android:name="mbms-streaming-service-override"
- android:value="android.telephony.cts.embmstestapp/.CtsStreamingService"/>
+ android:value="android.telephony.cts.embmstestapp/.CtsStreamingService"/>
<meta-data android:name="mbms-download-service-override"
- android:value="android.telephony.cts.embmstestapp/.CtsDownloadService"/>
+ android:value="android.telephony.cts.embmstestapp/.CtsDownloadService"/>
<meta-data android:name="mbms-group-call-service-override"
- android:value="android.telephony.cts.embmstestapp/.CtsGroupCallService"/>
- <meta-data
- android:name="mbms-file-provider-authority"
- android:value="android.telephony.mbms.cts"/>
+ android:value="android.telephony.cts.embmstestapp/.CtsGroupCallService"/>
+ <meta-data android:name="mbms-file-provider-authority"
+ android:value="android.telephony.mbms.cts"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.telephony.cts"
- android:label="CTS tests of android.telephony">
+ android:targetPackage="android.telephony.cts"
+ android:label="CTS tests of android.telephony">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/telephony/current/EmbmsMiddlewareTestApp/AndroidManifest.xml b/tests/tests/telephony/current/EmbmsMiddlewareTestApp/AndroidManifest.xml
index 880faf6..3cb1078 100644
--- a/tests/tests/telephony/current/EmbmsMiddlewareTestApp/AndroidManifest.xml
+++ b/tests/tests/telephony/current/EmbmsMiddlewareTestApp/AndroidManifest.xml
@@ -15,35 +15,37 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephony.cts.embmstestapp">
+ package="android.telephony.cts.embmstestapp">
<permission android:name="android.telephony.cts.embmstestapp.CTS_DOWNLOAD_PERMISSION"
- android.protectionLevel="signature"/>
+ android.protectionLevel="signature"/>
<uses-permission android:name="android.telephony.cts.embms.permission.SEND_EMBMS_INTENTS"/>
<uses-permission android:name="android.telephony.cts.embmstestapp.CTS_DOWNLOAD_PERMISSION"/>
<application android:label="EmbmsCtsMiddleware">
<service android:name="android.telephony.cts.embmstestapp.CtsStreamingService"
- android:launchMode="singleInstance">
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telephony.action.EmbmsStreaming" />
- <action android:name="android.telephony.cts.embmstestapp.ACTION_CONTROL_MIDDLEWARE" />
+ <action android:name="android.telephony.action.EmbmsStreaming"/>
+ <action android:name="android.telephony.cts.embmstestapp.ACTION_CONTROL_MIDDLEWARE"/>
</intent-filter>
</service>
<service android:name="android.telephony.cts.embmstestapp.CtsGroupCallService"
- android:launchMode="singleInstance">
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telephony.action.EmbmsGroupCall" />
- <action android:name="android.telephony.cts.embmstestapp.ACTION_CONTROL_MIDDLEWARE" />
+ <action android:name="android.telephony.action.EmbmsGroupCall"/>
+ <action android:name="android.telephony.cts.embmstestapp.ACTION_CONTROL_MIDDLEWARE"/>
</intent-filter>
</service>
<service android:name="android.telephony.cts.embmstestapp.CtsDownloadService"
- android:launchMode="singleInstance">
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telephony.action.EmbmsDownload" />
- <action android:name="android.telephony.cts.embmstestapp.ACTION_CONTROL_MIDDLEWARE" />
+ <action android:name="android.telephony.action.EmbmsDownload"/>
+ <action android:name="android.telephony.cts.embmstestapp.ACTION_CONTROL_MIDDLEWARE"/>
</intent-filter>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/telephony/current/LocationAccessingApp/AndroidManifest.xml b/tests/tests/telephony/current/LocationAccessingApp/AndroidManifest.xml
index 332d369..e6cdab8 100644
--- a/tests/tests/telephony/current/LocationAccessingApp/AndroidManifest.xml
+++ b/tests/tests/telephony/current/LocationAccessingApp/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephony.cts.locationaccessingapp">
+ package="android.telephony.cts.locationaccessingapp">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -24,11 +24,11 @@
<application android:label="LocationAccessingApp">
<service android:name="android.telephony.cts.locationaccessingapp.CtsLocationAccessService"
- android:launchMode="singleInstance">
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telephony.cts.locationaccessingapp.ACTION_CONTROL" />
+ <action android:name="android.telephony.cts.locationaccessingapp.ACTION_CONTROL"/>
</intent-filter>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/telephony/current/LocationAccessingApp/sdk28/AndroidManifest.xml b/tests/tests/telephony/current/LocationAccessingApp/sdk28/AndroidManifest.xml
index 811d9ce..b51ee76 100644
--- a/tests/tests/telephony/current/LocationAccessingApp/sdk28/AndroidManifest.xml
+++ b/tests/tests/telephony/current/LocationAccessingApp/sdk28/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephony.cts.locationaccessingapp.sdk28">
+ package="android.telephony.cts.locationaccessingapp.sdk28">
<uses-sdk android:targetSdkVersion="28"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -24,11 +24,11 @@
<application android:label="LocationAccessingAppSdk28">
<service android:name="android.telephony.cts.locationaccessingapp.CtsLocationAccessService"
- android:launchMode="singleInstance">
+ android:launchMode="singleInstance"
+ android:exported="true">
<intent-filter>
- <action android:name="android.telephony.cts.locationaccessingapp.ACTION_CONTROL" />
+ <action android:name="android.telephony.cts.locationaccessingapp.ACTION_CONTROL"/>
</intent-filter>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/telephony/current/TestExternalImsServiceApp/AndroidManifest.xml b/tests/tests/telephony/current/TestExternalImsServiceApp/AndroidManifest.xml
index 7062fd4..cf733ab 100644
--- a/tests/tests/telephony/current/TestExternalImsServiceApp/AndroidManifest.xml
+++ b/tests/tests/telephony/current/TestExternalImsServiceApp/AndroidManifest.xml
@@ -16,17 +16,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephony.cts.externalimsservice">
+ package="android.telephony.cts.externalimsservice">
<application>
<service android:name=".TestExternalImsService"
- android:directBootAware="true"
- android:persistent="true">
- <meta-data android:name="override_bind_check" android:value="true" />
+ android:directBootAware="true"
+ android:persistent="true"
+ android:exported="true">
+ <meta-data android:name="override_bind_check"
+ android:value="true"/>
<intent-filter>
- <action android:name="android.telephony.ims.ImsService" />
+ <action android:name="android.telephony.ims.ImsService"/>
</intent-filter>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/PhoneStateListenerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/PhoneStateListenerTest.java
index 06e2b59..0a96a6e 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/PhoneStateListenerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/PhoneStateListenerTest.java
@@ -682,12 +682,8 @@
// Deprecated in R
assertEquals(mPreciseDataConnectionState.getDataConnectionState(),
mPreciseDataConnectionState.getState());
- assertEquals(mPreciseDataConnectionState.getDataConnectionNetworkType(),
- mPreciseDataConnectionState.getNetworkType());
assertEquals(mPreciseDataConnectionState.getDataConnectionFailCause(),
mPreciseDataConnectionState.getLastCauseCode());
- assertEquals(mPreciseDataConnectionState.getDataConnectionLinkProperties(),
- mPreciseDataConnectionState.getLinkProperties());
// Superseded in R by getApnSetting()
mPreciseDataConnectionState.getDataConnectionApnTypeBitMask();
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
index 193f8fb..92cae00 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
@@ -2641,6 +2641,146 @@
return uri;
}
+ @Test
+ public void testThermalDataEnable() {
+ if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+ return;
+ }
+
+ ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+ mTelephonyManager,
+ (tm) -> tm.setDataEnabledWithReason(TelephonyManager.DATA_ENABLED_REASON_THERMAL,
+ false));
+
+ boolean isDataEnabledWithReason = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataEnabledWithReason(
+ TelephonyManager.DATA_ENABLED_REASON_THERMAL));
+ assertFalse(isDataEnabledWithReason);
+
+ boolean isDataConnectionAvailable = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataConnectionAllowed());
+ assertFalse(isDataConnectionAvailable);
+
+ ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+ mTelephonyManager,
+ (tm) -> tm.setDataEnabledWithReason(TelephonyManager.DATA_ENABLED_REASON_THERMAL,
+ true));
+
+ isDataEnabledWithReason = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataEnabledWithReason(
+ TelephonyManager.DATA_ENABLED_REASON_THERMAL));
+ assertTrue(isDataEnabledWithReason);
+
+ isDataConnectionAvailable = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataConnectionAllowed());
+ assertTrue(isDataConnectionAvailable);
+ }
+
+ @Test
+ public void testPolicyDataEnable() {
+ if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+ return;
+ }
+
+ ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+ mTelephonyManager,
+ (tm) -> tm.setDataEnabledWithReason(TelephonyManager.DATA_ENABLED_REASON_POLICY,
+ false));
+
+ boolean isDataEnabledWithReason = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataEnabledWithReason(
+ TelephonyManager.DATA_ENABLED_REASON_POLICY));
+ assertFalse(isDataEnabledWithReason);
+
+ boolean isDataConnectionAvailable = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataConnectionAllowed());
+ assertFalse(isDataConnectionAvailable);
+
+ ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+ mTelephonyManager,
+ (tm) -> tm.setDataEnabledWithReason(TelephonyManager.DATA_ENABLED_REASON_POLICY,
+ true));
+
+ isDataEnabledWithReason = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataEnabledWithReason(
+ TelephonyManager.DATA_ENABLED_REASON_POLICY));
+ assertTrue(isDataEnabledWithReason);
+
+ isDataConnectionAvailable = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataConnectionAllowed());
+ assertTrue(isDataConnectionAvailable);
+ }
+
+ @Test
+ public void testCarrierDataEnable() {
+ if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+ return;
+ }
+
+ ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+ mTelephonyManager,
+ (tm) -> tm.setDataEnabledWithReason(TelephonyManager.DATA_ENABLED_REASON_CARRIER,
+ false));
+
+ waitForMs(100);
+ boolean isDataEnabledWithReason = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataEnabledWithReason(
+ TelephonyManager.DATA_ENABLED_REASON_CARRIER));
+ assertFalse(isDataEnabledWithReason);
+
+ boolean isDataConnectionAvailable = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataConnectionAllowed());
+ assertFalse(isDataConnectionAvailable);
+
+ ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+ mTelephonyManager,
+ (tm) -> tm.setDataEnabledWithReason(TelephonyManager.DATA_ENABLED_REASON_CARRIER,
+ true));
+
+ waitForMs(100);
+ isDataEnabledWithReason = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataEnabledWithReason(
+ TelephonyManager.DATA_ENABLED_REASON_CARRIER));
+ assertTrue(isDataEnabledWithReason);
+ isDataConnectionAvailable = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataConnectionAllowed());
+ assertTrue(isDataConnectionAvailable);
+ }
+
+ @Test
+ public void testUserDataEnable() {
+ if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+ return;
+ }
+
+ ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+ mTelephonyManager,
+ (tm) -> tm.setDataEnabledWithReason(TelephonyManager.DATA_ENABLED_REASON_USER,
+ false));
+
+ boolean isDataEnabledWithReason = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataEnabledWithReason(
+ TelephonyManager.DATA_ENABLED_REASON_USER));
+ assertFalse(isDataEnabledWithReason);
+
+ boolean isDataConnectionAvailable = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataConnectionAllowed());
+ assertFalse(isDataConnectionAvailable);
+
+ ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+ mTelephonyManager,
+ (tm) -> tm.setDataEnabledWithReason(TelephonyManager.DATA_ENABLED_REASON_USER,
+ true));
+
+ isDataEnabledWithReason = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataEnabledWithReason(
+ TelephonyManager.DATA_ENABLED_REASON_USER));
+ assertTrue(isDataEnabledWithReason);
+ isDataConnectionAvailable = ShellIdentityUtils.invokeMethodWithShellPermissions(
+ mTelephonyManager, (tm) -> tm.isDataConnectionAllowed());
+ assertTrue(isDataConnectionAvailable);
+ }
+
/**
* Validate Emergency Number address that only contains the dialable character.
*
@@ -2851,6 +2991,18 @@
return mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM;
}
+ /**
+ * Verify that the phone is supporting the action of setForbiddenPlmn.
+ *
+ * @return whether to proceed the test
+ */
+ private boolean test() {
+ if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+ return false;
+ }
+ return mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM;
+ }
+
private static int makeRadioVersion(int major, int minor) {
if (major < 0 || minor < 0) return 0;
return major * 100 + minor;
diff --git a/tests/tests/telephony/sdk28/TEST_MAPPING b/tests/tests/telephony/sdk28/TEST_MAPPING
new file mode 100644
index 0000000..141ee9e
--- /dev/null
+++ b/tests/tests/telephony/sdk28/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsTelephonySdk28TestCases"
+ }
+ ]
+}
diff --git a/tests/tests/telephony2/TEST_MAPPING b/tests/tests/telephony2/TEST_MAPPING
new file mode 100644
index 0000000..0407667
--- /dev/null
+++ b/tests/tests/telephony2/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsTelephony2TestCases"
+ }
+ ]
+}
diff --git a/tests/tests/telephony2/src/android/telephony2/cts/NoLocationPermissionTest.java b/tests/tests/telephony2/src/android/telephony2/cts/NoLocationPermissionTest.java
new file mode 100644
index 0000000..48d1cc59
--- /dev/null
+++ b/tests/tests/telephony2/src/android/telephony2/cts/NoLocationPermissionTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2019 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.telephony2.cts;
+
+import static android.content.pm.PackageManager.FEATURE_TELEPHONY;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.telephony.CellInfo;
+import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyManager;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+
+@RunWith(AndroidJUnit4.class)
+public class NoLocationPermissionTest {
+
+ private Context mContext;
+
+ @Before
+ public void setUp() throws Exception {
+ mContext = InstrumentationRegistry.getContext();
+ }
+
+ @SuppressWarnings("deprecation")
+ @Test
+ public void testGetCellLocation() {
+ if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
+ return;
+ }
+
+ TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+ assertNotNull(telephonyManager);
+
+ try {
+ telephonyManager.getCellLocation();
+ fail("Should throw SecurityException");
+ } catch (SecurityException e) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testGetAllCellInfo() {
+ if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
+ return;
+ }
+
+ TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+ assertNotNull(telephonyManager);
+
+ try {
+ telephonyManager.getAllCellInfo();
+ fail("Should throw SecurityException");
+ } catch (SecurityException e) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testListenCellLocation() {
+ if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
+ return;
+ }
+
+ TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+ assertNotNull(telephonyManager);
+
+ try {
+ telephonyManager.listen(new PhoneStateListener(Runnable::run),
+ PhoneStateListener.LISTEN_CELL_LOCATION);
+ fail("Should throw SecurityException");
+ } catch (SecurityException e) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testRequestCellInfoUpdate() {
+ if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
+ return;
+ }
+
+ TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+ assertNotNull(telephonyManager);
+
+ try {
+ telephonyManager.requestCellInfoUpdate(Runnable::run,
+ new TelephonyManager.CellInfoCallback() {
+ @Override
+ public void onCellInfo(List<CellInfo> cellInfos) {
+ }
+ });
+ fail("Should throw SecurityException");
+ } catch (SecurityException e) {
+ // expected
+ }
+ }
+}
diff --git a/tests/tests/telephony3/TEST_MAPPING b/tests/tests/telephony3/TEST_MAPPING
new file mode 100644
index 0000000..2bd2449
--- /dev/null
+++ b/tests/tests/telephony3/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsTelephony3TestCases"
+ }
+ ]
+}
diff --git a/tests/tests/telephony4/TEST_MAPPING b/tests/tests/telephony4/TEST_MAPPING
new file mode 100644
index 0000000..8ec0dcf
--- /dev/null
+++ b/tests/tests/telephony4/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsSimRestrictedApisTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/telephonyprovider/AndroidManifest.xml b/tests/tests/telephonyprovider/AndroidManifest.xml
index 9a9e618..e7c5e13 100755
--- a/tests/tests/telephonyprovider/AndroidManifest.xml
+++ b/tests/tests/telephonyprovider/AndroidManifest.xml
@@ -16,77 +16,77 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.telephonyprovider.cts"
- android:targetSandboxVersion="2">
+ package="android.telephonyprovider.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.READ_SMS" />
- <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
- <uses-permission android:name="android.permission.RECEIVE_MMS" />
+ <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_MMS"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<!-- Required to be default SMS app -->
<receiver android:name="android.telephonyprovider.TelephonyProviderSmsDeliverReceiver"
- android:permission="android.permission.BROADCAST_SMS">
+ android:permission="android.permission.BROADCAST_SMS"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.SMS_DELIVER" />
+ <action android:name="android.provider.Telephony.SMS_DELIVER"/>
</intent-filter>
</receiver>
<!-- Required to be default SMS app -->
<receiver android:name="android.telephonyprovider.TelephonyProviderWapPushDeliverReceiver"
- android:permission="android.permission.BROADCAST_WAP_PUSH">
+ android:permission="android.permission.BROADCAST_WAP_PUSH"
+ android:exported="true">
<intent-filter>
- <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
- <data android:mimeType="application/vnd.wap.mms-message" />
+ <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+ <data android:mimeType="application/vnd.wap.mms-message"/>
</intent-filter>
</receiver>
<!-- Required to be default SMS app -->
<service android:name="android.telephonyprovider.TelephonyProviderService"
- android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
- android:exported="true" >
+ android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.RESPOND_VIA_MESSAGE"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</service>
<!-- Required to be default SMS app -->
- <activity
- android:name="android.telephonyprovider.TelephonyProviderActivity"
- android:label="Telephony Provider CTS Test Activity"
- android:windowSoftInputMode="stateHidden">
+ <activity android:name="android.telephonyprovider.TelephonyProviderActivity"
+ android:label="Telephony Provider CTS Test Activity"
+ android:windowSoftInputMode="stateHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.SEND" />
- <action android:name="android.intent.action.SENDTO" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="sms" />
- <data android:scheme="smsto" />
- <data android:scheme="mms" />
- <data android:scheme="mmsto" />
+ <action android:name="android.intent.action.SEND"/>
+ <action android:name="android.intent.action.SENDTO"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="sms"/>
+ <data android:scheme="smsto"/>
+ <data android:scheme="mms"/>
+ <data android:scheme="mmsto"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS telephony provider tests"
- android:targetPackage="android.telephonyprovider.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS telephony provider tests"
+ android:targetPackage="android.telephonyprovider.cts">
</instrumentation>
</manifest>
-
diff --git a/tests/tests/text/Android.bp b/tests/tests/text/Android.bp
index eaf166e..18ec522 100644
--- a/tests/tests/text/Android.bp
+++ b/tests/tests/text/Android.bp
@@ -30,6 +30,7 @@
"mockito-target-minus-junit4",
"androidx.test.rules",
"ub-uiautomator",
+ "junit-params",
],
libs: [
diff --git a/tests/tests/text/AndroidManifest.xml b/tests/tests/text/AndroidManifest.xml
index 0e86c5f..1e1a6d9 100644
--- a/tests/tests/text/AndroidManifest.xml
+++ b/tests/tests/text/AndroidManifest.xml
@@ -16,73 +16,77 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.text.cts"
- android:targetSandboxVersion="2">
+ package="android.text.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<application android:maxRecents="1">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.text.cts.EmojiCtsActivity"
- android:label="AvailableIntentsActivity"
- android:screenOrientation="nosensor"
- android:windowSoftInputMode="stateAlwaysHidden">
+ android:label="AvailableIntentsActivity"
+ android:screenOrientation="nosensor"
+ android:windowSoftInputMode="stateAlwaysHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.text.method.cts.KeyListenerCtsActivity"
- android:label="KeyListenerCtsActivity"
- android:screenOrientation="nosensor"
- android:windowSoftInputMode="stateAlwaysHidden"/>
+ android:label="KeyListenerCtsActivity"
+ android:screenOrientation="nosensor"
+ android:windowSoftInputMode="stateAlwaysHidden"/>
<activity android:name="android.text.method.cts.CtsActivity"
- android:label="CtsActivity"
- android:screenOrientation="nosensor"
- android:windowSoftInputMode="stateAlwaysHidden">
+ android:label="CtsActivity"
+ android:screenOrientation="nosensor"
+ android:windowSoftInputMode="stateAlwaysHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.text.style.cts.URLSpanCtsActivity"
- android:label="URLSpanCtsActivity"
- android:screenOrientation="nosensor">
+ android:label="URLSpanCtsActivity"
+ android:screenOrientation="nosensor"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.text.style.cts.MockURLSpanTestActivity"
- android:label="MockURLSpanTestActivity"
- android:launchMode="singleTask"
- android:alwaysRetainTaskState="true"
- android:configChanges="orientation|keyboardHidden"
- android:screenOrientation="nosensor">
+ android:label="MockURLSpanTestActivity"
+ android:launchMode="singleTask"
+ android:alwaysRetainTaskState="true"
+ android:configChanges="orientation|keyboardHidden"
+ android:screenOrientation="nosensor"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- <data android:scheme="ctstesttext" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+ <data android:scheme="ctstesttext"/>
</intent-filter>
</activity>
- <activity android:name="android.text.cts.MockActivity" />
+ <activity android:name="android.text.cts.MockActivity"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.text.cts"
- android:label="CTS tests of android.text">
+ android:targetPackage="android.text.cts"
+ android:label="CTS tests of android.text">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/tests/text/src/android/text/cts/HtmlTest.java b/tests/tests/text/src/android/text/cts/HtmlTest.java
index 7f785a8..e64e0b3 100644
--- a/tests/tests/text/src/android/text/cts/HtmlTest.java
+++ b/tests/tests/text/src/android/text/cts/HtmlTest.java
@@ -20,7 +20,9 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import android.graphics.Color;
import android.graphics.Typeface;
import android.text.Html;
import android.text.Layout;
@@ -41,15 +43,17 @@
import android.text.style.UnderlineSpan;
import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.junit.Test;
import org.junit.runner.RunWith;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+
@SmallTest
-@RunWith(AndroidJUnit4.class)
+@RunWith(JUnitParamsRunner.class)
public class HtmlTest {
@Test
public void testSingleTagOnWhileString() {
@@ -104,50 +108,104 @@
assertEquals(expected, spanned);
}
+ private static Object[] paramsForTestColor() {
+ return new Object[] {
+ new Object[] { "<font color=\"#00FF00\">something</font>", 0xFF00FF00 },
+ new Object[] { "<font color=\"navy\">NAVY</font>", 0xFF000080 },
+ // By default use the color values from android.graphics.Color instead of HTML/CSS
+ new Object[] { "<font color=\"green\">GREEN</font>", 0xFF00FF00 },
+ new Object[] { "<font color=\"gray\">GRAY</font>", 0xFF888888 },
+ new Object[] { "<font color=\"grey\">GREY</font>", 0xFF888888 },
+ new Object[] { "<font color=\"lightgray\">LIGHTGRAY</font>", 0xFFCCCCCC },
+ new Object[] { "<font color=\"lightgrey\">LIGHTGREY</font>", 0xFFCCCCCC },
+ new Object[] { "<font color=\"darkgray\">DARKGRAY</font>", 0xFF444444 },
+ new Object[] { "<font color=\"darkgrey\">DARKGREY</font>", 0xFF444444 },
+ new Object[] { "<font color=\"Black\">BLACK</font>", Color.BLACK },
+ new Object[] { "<font color=\"RED\">red</font>", Color.RED },
+ new Object[] { "<font color=\"bLUE\">blue</font>", Color.BLUE },
+ new Object[] { "<font color=\"yellow\">YELLOW</font>", Color.YELLOW },
+ new Object[] { "<font color=\"CYAN\">cyan</font>", Color.CYAN },
+ new Object[] { "<font color=\"magenta\">magenta</font>", Color.MAGENTA },
+ new Object[] { "<font color=\"AQUA\">AQUA</font>", 0xFF00FFFF },
+ new Object[] { "<font color=\"fuchsia\">FUCHSIA</font>", 0xFFFF00FF },
+ new Object[] { "<font color=\"lime\">LIME</font>", 0xFF00FF00 },
+ new Object[] { "<font color=\"maroon\">MAROON</font>", 0xFF800000 },
+ new Object[] { "<font color=\"puRPLE\">PURPLE</font>", 0xFF800080 },
+ new Object[] { "<font color=\"olive\">OLIVE</font>", 0xFF808000 },
+ new Object[] { "<font color=\"silver\">SILVER</font>", 0xFFC0C0C0 },
+ new Object[] { "<font color=\"teal\">TEAL</font>", 0xFF008080 },
+ new Object[] { "<font color=\"#FFFFFF\">white</font>", 0xFFFFFFFF },
+
+ // Note that while Color.parseColor requires 6 or 8 hex-digit colors (i.e.
+ // #RRGGBB or #AARRGGBB), Html supports 7 or less. (But in a 7 digit hex-digit
+ // color, the first is ignored.)
+ new Object[] { "<font color=\"#00FFF\">something</font>", 0xFF000FFF }, // [23]
+ new Object[] { "<font color=\"#FF\">blue</font>", 0xFF0000FF },
+ new Object[] { "<font color=\"#FFFFFFF\">7 F's</font>", Color.WHITE },
+ new Object[] { "<font color=\"#FF00FF1\">7 hexigits</font>", 0xFFF00FF1 },
+ new Object[] { "<font color=\"#7F00FF1\">7 hexigits</font>", 0xFFF00FF1 },
+
+ new Object[] { "<font color=\"0xFF0000\">red</font>", 0xFFFF0000 },
+ new Object[] { "<font color=\"0\">zero</font>", 0xFF000000 },
+ new Object[] { "<font color=\"01\">little blue</font>", 0xFF000001 },
+ new Object[] { "<font color=\"+02\">positive blue</font>", 0xFF000002 },
+ new Object[] { "<font color=\"16777215\">decimal white</font>", Color.WHITE },
+ new Object[] { "<font color=\"16777214\">almost white</font>", 0xFFFFFFFE },
+
+ // Beyond 3 bytes rolls over, in decimal, octal, or hex.
+ new Object[] { "<font color=\"16777217\">decimal roll over</font>", 0xFF000001 },
+ new Object[] { "<font color=\"0100000007\">octal roll over</font>", 0xFF000007 },
+ new Object[] { "<font color=\"0x1000002\">hex roll over</font>", 0xFF000002 },
+ };
+ }
+
@Test
- public void testColor() {
+ @Parameters(method = "paramsForTestColor")
+ public void testColor(String html, int expectedColor) {
final Class<ForegroundColorSpan> type = ForegroundColorSpan.class;
- Spanned s = Html.fromHtml("<font color=\"#00FF00\">something</font>");
+ Spanned s = Html.fromHtml(html);
ForegroundColorSpan[] colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFF00FF00, colors[0].getForegroundColor());
+ if (colors.length == 0) {
+ fail("Failed to create a span from " + html);
+ }
+ int actualColor = colors[0].getForegroundColor();
+ assertEquals("Wrong color for " + html + "\nexpected: 0x"
+ + Integer.toHexString(expectedColor) + "\nactual: 0x"
+ + Integer.toHexString(actualColor), expectedColor, actualColor);
+ }
- s = Html.fromHtml("<font color=\"navy\">NAVY</font>");
- colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFF000080, colors[0].getForegroundColor());
+ private static Object[] paramsForTestColorInvalid() {
+ return new Object[]{
+ "<font color=\"gibberish\">something</font>",
+ "<font color=\"WHITE\">doesn't work</font>",
+ "<font color=\"0xFF000000\">alpha not supported</font>",
+ "<font color=\"#88FFFFFF\">another with alpha</font>",
+ "<font color=\"#88FFFFFF00\">too many digits</font>",
+ "<font color=\"0x88FFFFFF00\">too many digits</font>",
+ "<font color=\"08\">not octal</font>",
+ "<font color=\"#GG\">not hex</font>",
+ "<font color=\"#00FF00+\">something</font>",
+ "<font color=\"[]\">brackets</font>",
+ "<font color=\"-01\">negative blue</font>",
+ "<font color=\"4294967000\">too big decimal</font>",
+ "<font color=\"01FFFFFFFF\">too big octal</font>",
+ "<font color=\"#FFFFFFF1\">too big hex</font>",
+ };
+ }
- s = Html.fromHtml("<font color=\"gibberish\">something</font>");
- colors = s.getSpans(0, s.length(), type);
+ @Test
+ @Parameters(method = "paramsForTestColorInvalid")
+ public void testColorInvalid(String html) {
+ final Class<ForegroundColorSpan> type = ForegroundColorSpan.class;
+
+ Spanned s = Html.fromHtml(html);
+ ForegroundColorSpan[] colors = s.getSpans(0, s.length(), type);
+ if (colors.length > 0) {
+ fail("Expected 0 spans from " + html + ". Got the color 0x"
+ + Integer.toHexString(colors[0].getForegroundColor()));
+ }
assertEquals(0, colors.length);
-
- // By default use the color values from android.graphics.Color instead of HTML/CSS
- s = Html.fromHtml("<font color=\"green\">GREEN</font>");
- colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFF00FF00, colors[0].getForegroundColor());
-
- s = Html.fromHtml("<font color=\"gray\">GRAY</font>");
- colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFF888888, colors[0].getForegroundColor());
-
- s = Html.fromHtml("<font color=\"grey\">GREY</font>");
- colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFF888888, colors[0].getForegroundColor());
-
- s = Html.fromHtml("<font color=\"lightgray\">LIGHTGRAY</font>");
- colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFFCCCCCC, colors[0].getForegroundColor());
-
- s = Html.fromHtml("<font color=\"lightgrey\">LIGHTGREY</font>");
- colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFFCCCCCC, colors[0].getForegroundColor());
-
- s = Html.fromHtml("<font color=\"darkgray\">DARKGRAY</font>");
- colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFF444444, colors[0].getForegroundColor());
-
- s = Html.fromHtml("<font color=\"darkgrey\">DARKGREY</font>");
- colors = s.getSpans(0, s.length(), type);
- assertEquals(0xFF444444, colors[0].getForegroundColor());
}
@Test
diff --git a/tests/tests/tv/AndroidManifest.xml b/tests/tests/tv/AndroidManifest.xml
index a3429bb..b8b4ca7 100644
--- a/tests/tests/tv/AndroidManifest.xml
+++ b/tests/tests/tv/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
* Copyright (C) 2014 The Android Open Source Project
*
@@ -17,114 +16,125 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.tv.cts">
+ package="android.tv.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.INJECT_EVENTS" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.INJECT_EVENTS"/>
- <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
+ <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA"/>
<queries>
- <package android:name="com.android.providers.tv" />
+ <package android:name="com.android.providers.tv"/>
</queries>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
- <activity android:name="android.media.tv.cts.TvInputSetupActivityStub">
+ <activity android:name="android.media.tv.cts.TvInputSetupActivityStub"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <activity android:name="android.media.tv.cts.TvInputSettingsActivityStub">
+ <activity android:name="android.media.tv.cts.TvInputSettingsActivityStub"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<service android:name="android.media.tv.cts.StubTunerTvInputService"
- android:permission="android.permission.BIND_TV_INPUT"
- android:label="TV input stub"
- android:icon="@drawable/robot"
- android:process=":tunerTvInputStub">
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:label="TV input stub"
+ android:icon="@drawable/robot"
+ android:process=":tunerTvInputStub"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.tv.TvInputService" />
+ <action android:name="android.media.tv.TvInputService"/>
</intent-filter>
<meta-data android:name="android.media.tv.input"
- android:resource="@xml/stub_tv_input_service" />
+ android:resource="@xml/stub_tv_input_service"/>
</service>
<service android:name="android.media.tv.cts.NoMetadataTvInputService"
- android:permission="android.permission.BIND_TV_INPUT">
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.tv.TvInputService" />
+ <action android:name="android.media.tv.TvInputService"/>
</intent-filter>
</service>
- <service android:name="android.media.tv.cts.NoPermissionTvInputService">
+ <service android:name="android.media.tv.cts.NoPermissionTvInputService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.tv.TvInputService" />
+ <action android:name="android.media.tv.TvInputService"/>
</intent-filter>
<meta-data android:name="android.media.tv.input"
- android:resource="@xml/stub_tv_input_service" />
+ android:resource="@xml/stub_tv_input_service"/>
</service>
<service android:name="android.media.tv.cts.TvInputManagerTest$StubTvInputService2"
- android:permission="android.permission.BIND_TV_INPUT">
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.tv.TvInputService" />
+ <action android:name="android.media.tv.TvInputService"/>
</intent-filter>
<meta-data android:name="android.media.tv.input"
- android:resource="@xml/stub_tv_input_service" />
+ android:resource="@xml/stub_tv_input_service"/>
</service>
<service android:name="android.media.tv.cts.TvInputServiceTest$CountingTvInputService"
- android:permission="android.permission.BIND_TV_INPUT">
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.tv.TvInputService" />
+ <action android:name="android.media.tv.TvInputService"/>
</intent-filter>
<meta-data android:name="android.media.tv.input"
- android:resource="@xml/stub_tv_input_service" />
+ android:resource="@xml/stub_tv_input_service"/>
</service>
<service android:name="android.media.tv.cts.HardwareSessionTest$HardwareProxyTvInputService"
- android:permission="android.permission.BIND_TV_INPUT">
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.tv.TvInputService" />
+ <action android:name="android.media.tv.TvInputService"/>
</intent-filter>
<meta-data android:name="android.media.tv.input"
- android:resource="@xml/stub_tv_input_service" />
+ android:resource="@xml/stub_tv_input_service"/>
</service>
<service android:name="android.media.tv.cts.FaultyTvInputService"
- android:permission="android.permission.BIND_TV_INPUT"
- android:process=":faultyTvInputService">
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:process=":faultyTvInputService"
+ android:exported="true">
<intent-filter>
- <action android:name="android.media.tv.TvInputService" />
+ <action android:name="android.media.tv.TvInputService"/>
</intent-filter>
<meta-data android:name="android.media.tv.input"
- android:resource="@xml/stub_tv_input_service" />
+ android:resource="@xml/stub_tv_input_service"/>
</service>
- <activity android:name="android.media.tv.cts.TvViewStubActivity">
+ <activity android:name="android.media.tv.cts.TvViewStubActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity android:name="android.tv.settings.cts.SettingsLeanbackStubActivity">
+ <activity android:name="android.tv.settings.cts.SettingsLeanbackStubActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.tv.cts"
- android:label="Tests for the TV APIs.">
+ android:targetPackage="android.tv.cts"
+ android:label="Tests for the TV APIs.">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/tests/uiautomation/AndroidManifest.xml b/tests/tests/uiautomation/AndroidManifest.xml
index fdc7457..34d8def 100644
--- a/tests/tests/uiautomation/AndroidManifest.xml
+++ b/tests/tests/uiautomation/AndroidManifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
* Copyright (C) 2014 The Android Open Source Project
*
@@ -17,50 +16,47 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.app.uiautomation.cts"
- android:targetSandboxVersion="2">
+ package="android.app.uiautomation.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
- <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS"/>
<application android:theme="@android:style/Theme.Holo.NoActionBar"
- android:requestLegacyExternalStorage="true">
+ android:requestLegacyExternalStorage="true">
<uses-library android:name="android.test.runner"/>
- <activity
- android:name="android.app.uiautomation.cts.UiAutomationTestFirstActivity"
- android:exported="true">
+ <activity android:name="android.app.uiautomation.cts.UiAutomationTestFirstActivity"
+ android:exported="true">
</activity>
- <activity
- android:name="android.app.uiautomation.cts.UiAutomationTestSecondActivity"
- android:exported="true">
+ <activity android:name="android.app.uiautomation.cts.UiAutomationTestSecondActivity"
+ android:exported="true">
</activity>
- <service
- android:name="android.app.uiautomation.cts.UiAutomationTestA11yService"
- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE" >
+ <service android:name="android.app.uiautomation.cts.UiAutomationTestA11yService"
+ android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+ android:exported="true">
<intent-filter>
- <action android:name="android.accessibilityservice.AccessibilityService" />
+ <action android:name="android.accessibilityservice.AccessibilityService"/>
- <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC" />
+ <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
</intent-filter>
- <meta-data
- android:name="android.accessibilityservice"
- android:resource="@xml/ui_automation_test_a11y_service" />
+ <meta-data android:name="android.accessibilityservice"
+ android:resource="@xml/ui_automation_test_a11y_service"/>
</service>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.app.uiautomation.cts">
+ android:targetPackage="android.app.uiautomation.cts">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/tests/uiautomation/OWNERS b/tests/tests/uiautomation/OWNERS
index a98c458..0600995 100644
--- a/tests/tests/uiautomation/OWNERS
+++ b/tests/tests/uiautomation/OWNERS
@@ -1,3 +1,4 @@
# Bug component: 44215
pweaver@google.com
rhedjao@google.com
+qasid@google.com
diff --git a/tests/tests/uirendering27/TEST_MAPPING b/tests/tests/uirendering27/TEST_MAPPING
index fa55ba8..318d99c 100644
--- a/tests/tests/uirendering27/TEST_MAPPING
+++ b/tests/tests/uirendering27/TEST_MAPPING
@@ -4,4 +4,4 @@
"name": "CtsUiRenderingTestCases27"
}
]
-}
\ No newline at end of file
+}
diff --git a/tests/tests/usb/TEST_MAPPING b/tests/tests/usb/TEST_MAPPING
new file mode 100644
index 0000000..cb22eb9
--- /dev/null
+++ b/tests/tests/usb/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsUsbManagerTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/util/TEST_MAPPING b/tests/tests/util/TEST_MAPPING
new file mode 100644
index 0000000..70f0e93
--- /dev/null
+++ b/tests/tests/util/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsUtilTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/util/src/android/util/cts/InstallUtilTest.java b/tests/tests/util/src/android/util/cts/InstallUtilTest.java
index c3bfe28..59e89aa 100644
--- a/tests/tests/util/src/android/util/cts/InstallUtilTest.java
+++ b/tests/tests/util/src/android/util/cts/InstallUtilTest.java
@@ -177,8 +177,9 @@
assertThat(session).isNotNull();
// Session can be committed directly, but a BroadcastReceiver must be provided.
- session.commit(LocalIntentSender.getIntentSender());
- InstallUtils.assertStatusSuccess(LocalIntentSender.getIntentSenderResult());
+ LocalIntentSender sender = new LocalIntentSender();
+ session.commit(sender.getIntentSender());
+ InstallUtils.assertStatusSuccess(sender.getResult());
// Verify app has been installed
assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
diff --git a/tests/tests/view/AndroidManifest.xml b/tests/tests/view/AndroidManifest.xml
index 174e5dc..6294c84 100644
--- a/tests/tests/view/AndroidManifest.xml
+++ b/tests/tests/view/AndroidManifest.xml
@@ -16,383 +16,416 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.view.cts"
- android:targetSandboxVersion="2">
+ package="android.view.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
- <uses-feature android:name="android.hardware.camera" />
+ <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+ <uses-feature android:name="android.hardware.camera"/>
<application android:label="Android TestCase"
- android:icon="@drawable/size_48x48"
- android:maxRecents="1"
- android:multiArch="true"
- android:supportsRtl="true">
- <uses-library android:name="android.test.runner" />
+ android:icon="@drawable/size_48x48"
+ android:maxRecents="1"
+ android:multiArch="true"
+ android:supportsRtl="true">
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.app.Activity"
- android:label="Empty Activity"
- android:theme="@style/ViewAttributeTestTheme">
+ android:label="Empty Activity"
+ android:theme="@style/ViewAttributeTestTheme"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.ViewStubCtsActivity"
- android:screenOrientation="locked"
- android:label="ViewStubCtsActivity">
+ android:screenOrientation="locked"
+ android:label="ViewStubCtsActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.UsingViewsCtsActivity"
- android:screenOrientation="locked"
- android:label="Using Views Test">
+ android:screenOrientation="locked"
+ android:label="Using Views Test"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.FocusHandlingCtsActivity"
- android:screenOrientation="locked"
- android:label="Focus Handling Test">
+ android:screenOrientation="locked"
+ android:label="Focus Handling Test"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name=".ViewGroupInvalidateChildCtsActivity"
- android:label="ViewGroupCtsActivity"
- android:screenOrientation="locked"
- android:hardwareAccelerated="false">
+ android:label="ViewGroupCtsActivity"
+ android:screenOrientation="locked"
+ android:hardwareAccelerated="false"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.ViewTestCtsActivity"
- android:screenOrientation="locked"
- android:label="ViewTestCtsActivity">
+ android:screenOrientation="locked"
+ android:label="ViewTestCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.ViewLayoutPositionTestCtsActivity"
- android:screenOrientation="locked"
- android:label="ViewTestCtsActivity">
+ android:screenOrientation="locked"
+ android:label="ViewTestCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.animation.cts.AnimationTestCtsActivity"
- android:label="AnimationTestCtsActivity"
- android:screenOrientation="locked"
- android:configChanges="orientation|screenSize">
+ android:label="AnimationTestCtsActivity"
+ android:screenOrientation="locked"
+ android:configChanges="orientation|screenSize"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.animation.cts.GridLayoutAnimCtsActivity"
- android:label="GridLayoutAnimCtsActivity"
- android:screenOrientation="locked"
- android:configChanges="orientation|screenSize">
+ android:label="GridLayoutAnimCtsActivity"
+ android:screenOrientation="locked"
+ android:configChanges="orientation|screenSize"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.animation.cts.LayoutAnimCtsActivity"
- android:label="LayoutAnimCtsActivity"
- android:screenOrientation="locked"
- android:configChanges="orientation|screenSize">
+ android:label="LayoutAnimCtsActivity"
+ android:screenOrientation="locked"
+ android:configChanges="orientation|screenSize"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.TextureViewCtsActivity"
- android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
- android:screenOrientation="locked"
- android:label="TextureViewCtsActivity">
+ android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+ android:screenOrientation="locked"
+ android:label="TextureViewCtsActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.TextureViewCameraActivity"
- android:screenOrientation="locked">
+ android:screenOrientation="locked"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.TextureViewStressTestActivity"
- android:screenOrientation="locked">
+ android:screenOrientation="locked"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.TextureViewSnapshotTestActivity"
- android:screenOrientation="locked">
+ android:screenOrientation="locked"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.PixelCopyVideoSourceActivity"
- android:screenOrientation="locked"
- android:label="PixelCopyVideoSourceActivity" />
+ android:screenOrientation="locked"
+ android:label="PixelCopyVideoSourceActivity"/>
<activity android:name="android.view.cts.PixelCopyGLProducerCtsActivity"
- android:screenOrientation="locked"
- android:label="PixelCopyGLProducerCtsActivity"/>
+ android:screenOrientation="locked"
+ android:label="PixelCopyGLProducerCtsActivity"/>
<activity android:name="android.view.cts.PixelCopyViewProducerActivity"
- android:label="PixelCopyViewProducerActivity"
- android:screenOrientation="portrait"
- android:rotationAnimation="jumpcut"
- android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
- android:configChanges="orientation|screenSize" />
+ android:label="PixelCopyViewProducerActivity"
+ android:screenOrientation="portrait"
+ android:rotationAnimation="jumpcut"
+ android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+ android:configChanges="orientation|screenSize"/>
<activity android:name="android.view.cts.PixelCopyWideGamutViewProducerActivity"
- android:label="PixelCopyWideGamutViewProducerActivity"
- android:screenOrientation="portrait"
- android:rotationAnimation="jumpcut"
- android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
- android:configChanges="orientation|screenSize"
- android:colorMode="wideColorGamut" />
+ android:label="PixelCopyWideGamutViewProducerActivity"
+ android:screenOrientation="portrait"
+ android:rotationAnimation="jumpcut"
+ android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+ android:configChanges="orientation|screenSize"
+ android:colorMode="wideColorGamut"/>
<activity android:name="android.view.cts.PixelCopyViewProducerDialogActivity"
- android:label="PixelCopyViewProducerDialogActivity"
- android:screenOrientation="portrait"
- android:rotationAnimation="jumpcut"
- android:theme="@android:style/Theme.Material.Dialog.NoActionBar"
- android:configChanges="orientation|screenSize" />
+ android:label="PixelCopyViewProducerDialogActivity"
+ android:screenOrientation="portrait"
+ android:rotationAnimation="jumpcut"
+ android:theme="@android:style/Theme.Material.Dialog.NoActionBar"
+ android:configChanges="orientation|screenSize"/>
<activity android:name="android.view.cts.FocusFinderCtsActivity"
- android:screenOrientation="locked"
- android:label="FocusFinderCtsActivity">
+ android:screenOrientation="locked"
+ android:label="FocusFinderCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.GestureDetectorCtsActivity"
- android:label="GestureDetectorCtsActivity"
- android:screenOrientation="locked"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+ android:label="GestureDetectorCtsActivity"
+ android:screenOrientation="locked"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
<activity android:name="android.view.cts.ScaleGestureDetectorCtsActivity"
- android:label="ScaleGestureDetectorCtsActivity"
- android:screenOrientation="locked"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+ android:label="ScaleGestureDetectorCtsActivity"
+ android:screenOrientation="locked"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
<activity android:name="android.view.cts.DisplayRefreshRateCtsActivity"
- android:label="DisplayRefreshRateCtsActivity"/>
+ android:label="DisplayRefreshRateCtsActivity"/>
<activity android:name="android.view.cts.MockActivity"
- android:label="MockActivity"
- android:screenOrientation="locked">
+ android:label="MockActivity"
+ android:screenOrientation="locked">
<meta-data android:name="android.view.merge"
- android:resource="@xml/merge" />
+ android:resource="@xml/merge"/>
</activity>
<activity android:name="android.view.cts.MenuTestActivity"
- android:screenOrientation="locked"
- android:label="MenuTestActivity" />
+ android:screenOrientation="locked"
+ android:label="MenuTestActivity"/>
<activity android:name="android.view.cts.MenuItemCtsActivity"
- android:theme="@android:style/Theme.Material.Light.NoActionBar"
- android:screenOrientation="locked"
- android:label="MenuItemCtsActivity" />
+ android:theme="@android:style/Theme.Material.Light.NoActionBar"
+ android:screenOrientation="locked"
+ android:label="MenuItemCtsActivity"/>
<activity android:name="android.view.cts.ActionModeCtsActivity"
- android:screenOrientation="locked"
- android:label="ActionModeCtsActivity">
+ android:screenOrientation="locked"
+ android:label="ActionModeCtsActivity">
</activity>
<activity android:name="android.view.cts.ViewOverlayCtsActivity"
- android:screenOrientation="locked"
- android:label="ViewOverlayCtsActivity">
+ android:screenOrientation="locked"
+ android:label="ViewOverlayCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.ViewGroupOverlayCtsActivity"
- android:screenOrientation="locked"
- android:label="ViewGroupOverlayCtsActivity">
+ android:screenOrientation="locked"
+ android:label="ViewGroupOverlayCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.SearchEventActivity"
- android:screenOrientation="locked"
- android:label="SearchEventActivity">
+ android:screenOrientation="locked"
+ android:label="SearchEventActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.CtsActivity"
- android:screenOrientation="locked"
- android:label="CtsActivity">
+ android:screenOrientation="locked"
+ android:label="CtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.ContentPaneCtsActivity"
- android:screenOrientation="locked"
- android:label="ContentPaneCtsActivity">
+ android:screenOrientation="locked"
+ android:label="ContentPaneCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.LongPressBackActivity"
- android:screenOrientation="locked"
- android:label="LongPressBackActivity">
+ android:screenOrientation="locked"
+ android:label="LongPressBackActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.KeyEventInjectionActivity"
- android:label="KeyEventInjectionActivity">
+ android:label="KeyEventInjectionActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.surfacevalidator.CapturedActivity"
- android:screenOrientation="locked"
- android:theme="@style/WhiteBackgroundTheme">
+ android:screenOrientation="locked"
+ android:theme="@style/WhiteBackgroundTheme"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.surfacevalidator.CapturedActivityWithResource"
- android:screenOrientation="locked"
- android:theme="@style/WhiteBackgroundTheme">
+ android:screenOrientation="locked"
+ android:theme="@style/WhiteBackgroundTheme"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<service android:name="android.view.cts.surfacevalidator.LocalMediaProjectionService"
- android:foregroundServiceType="mediaProjection"
- android:enabled="true">
+ android:foregroundServiceType="mediaProjection"
+ android:enabled="true">
</service>
<activity android:name="android.view.cts.HoverCtsActivity"
- android:screenOrientation="locked">
+ android:screenOrientation="locked"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.TooltipActivity"
- android:screenOrientation="locked"
- android:label="TooltipActivity">
+ android:screenOrientation="locked"
+ android:label="TooltipActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.PointerCaptureCtsActivity"
- android:screenOrientation="locked"
- android:label="PointerCaptureCtsActivity">
+ android:screenOrientation="locked"
+ android:label="PointerCaptureCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name="android.view.cts.DefaultFocusHighlightCtsActivity">
+ <activity android:name="android.view.cts.DefaultFocusHighlightCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name="android.view.cts.InputEventInterceptTestActivity">
+ <activity android:name="android.view.cts.InputEventInterceptTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <activity android:name="android.view.cts.TouchDelegateTestActivity">
+ <activity android:name="android.view.cts.TouchDelegateTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <activity android:name="android.view.cts.ViewSourceLayoutTestActivity">
+ <activity android:name="android.view.cts.ViewSourceLayoutTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <activity android:name="android.view.cts.SystemGestureExclusionActivity">
+ <activity android:name="android.view.cts.SystemGestureExclusionActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<activity android:name="android.view.cts.ViewAnimationMatrixActivity"
- android:theme="@android:style/Theme.Material.Light.NoActionBar">
+ android:theme="@android:style/Theme.Material.Light.NoActionBar"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <activity android:name="android.view.cts.ViewUnbufferedTestActivity">
+ <activity android:name="android.view.cts.ViewUnbufferedTestActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
- <service
- android:name="android.view.textclassifier.cts.CtsTextClassifierService"
- android:exported="true"
- android:permission="android.permission.BIND_TEXTCLASSIFIER_SERVICE">
+ <service android:name="android.view.textclassifier.cts.CtsTextClassifierService"
+ android:exported="true"
+ android:permission="android.permission.BIND_TEXTCLASSIFIER_SERVICE">
<intent-filter>
<action android:name="android.service.textclassifier.TextClassifierService"/>
</intent-filter>
@@ -400,10 +433,10 @@
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.view.cts"
- android:label="CTS tests of android.view">
+ android:targetPackage="android.view.cts"
+ android:label="CTS tests of android.view">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
diff --git a/tests/tests/view/jni/Android.bp b/tests/tests/view/jni/Android.bp
index 61932fc..0631054 100644
--- a/tests/tests/view/jni/Android.bp
+++ b/tests/tests/view/jni/Android.bp
@@ -22,6 +22,7 @@
srcs: [
"CtsViewJniOnLoad.cpp",
+ "android_view_cts_AInputNativeTest.cpp",
"android_view_cts_ASurfaceControlTest.cpp",
"android_view_cts_ChoreographerNativeTest.cpp",
],
diff --git a/tests/tests/view/jni/CtsViewJniOnLoad.cpp b/tests/tests/view/jni/CtsViewJniOnLoad.cpp
index a6f50ca..34b2f20 100644
--- a/tests/tests/view/jni/CtsViewJniOnLoad.cpp
+++ b/tests/tests/view/jni/CtsViewJniOnLoad.cpp
@@ -20,6 +20,8 @@
extern int register_android_view_cts_ASurfaceControlTest(JNIEnv *);
extern int register_android_view_cts_ChoreographerNativeTest(JNIEnv* env);
+extern int register_android_view_cts_AKeyEventNativeTest(JNIEnv *env);
+extern int register_android_view_cts_AMotionEventNativeTest(JNIEnv *env);
jint JNI_OnLoad(JavaVM *vm, void *) {
JNIEnv *env = NULL;
@@ -32,5 +34,11 @@
if (register_android_view_cts_ChoreographerNativeTest(env)) {
return JNI_ERR;
}
+ if (register_android_view_cts_AKeyEventNativeTest(env)) {
+ return JNI_ERR;
+ }
+ if (register_android_view_cts_AMotionEventNativeTest(env)) {
+ return JNI_ERR;
+ }
return JNI_VERSION_1_4;
}
diff --git a/tests/tests/view/jni/android_view_cts_AInputNativeTest.cpp b/tests/tests/view/jni/android_view_cts_AInputNativeTest.cpp
new file mode 100644
index 0000000..87670c4
--- /dev/null
+++ b/tests/tests/view/jni/android_view_cts_AInputNativeTest.cpp
@@ -0,0 +1,150 @@
+/*
+ * Copyright 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.
+ */
+
+#define LOG_TAG "AInputNativeTest"
+
+#include <jni.h>
+#include <jniAssert.h>
+#include <math.h>
+#include <array>
+#include <cinttypes>
+#include <string>
+
+#include <android/input.h>
+#include <android/log.h>
+#include <nativehelper/JNIHelp.h>
+
+namespace {
+
+static struct MotionEventMethodId {
+ jmethodID getDownTime;
+ jmethodID getEventTime;
+ jmethodID getMetaState;
+ jmethodID getAction;
+ jmethodID getPointerCount;
+ jmethodID getRawX;
+ jmethodID getRawY;
+} gMotionEventMethodIds;
+
+static struct KeyEventMethodId {
+ jmethodID getDownTime;
+ jmethodID getEventTime;
+ jmethodID getAction;
+ jmethodID getKeyCode;
+} gKeyEventMethodIds;
+
+static constexpr int64_t NS_PER_MS = 1000000LL;
+
+void nativeMotionEventTest(JNIEnv *env, jclass /* clazz */, jobject obj) {
+ const AInputEvent *event = AMotionEvent_fromJava(env, obj);
+ jint action = env->CallIntMethod(obj, gMotionEventMethodIds.getAction);
+ jlong downTime = env->CallLongMethod(obj, gMotionEventMethodIds.getDownTime) * NS_PER_MS;
+ jlong eventTime = env->CallLongMethod(obj, gMotionEventMethodIds.getEventTime) * NS_PER_MS;
+ jint metaState = env->CallIntMethod(obj, gMotionEventMethodIds.getMetaState);
+ jint pointerCount = env->CallIntMethod(obj, gMotionEventMethodIds.getPointerCount);
+
+ ASSERT(AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION, "Wrong event type %d.",
+ AInputEvent_getType(event));
+
+ ASSERT(action == AMotionEvent_getAction(event), "Wrong action %d not equal to %d",
+ AMotionEvent_getAction(event), action);
+
+ ASSERT(downTime == AMotionEvent_getDownTime(event),
+ "Wrong downTime %" PRId64 " not equal to %" PRId64, AMotionEvent_getDownTime(event),
+ downTime);
+
+ ASSERT(eventTime == AMotionEvent_getEventTime(event),
+ "Wrong eventTime %" PRId64 " not equal to %" PRId64, AMotionEvent_getEventTime(event),
+ eventTime);
+
+ ASSERT(metaState == AMotionEvent_getMetaState(event), "Wrong metaState %d not equal to %d",
+ AMotionEvent_getMetaState(event), metaState);
+
+ ASSERT(AMotionEvent_getPointerCount(event) == pointerCount,
+ "Wrong pointer count %zu not equal to %d", AMotionEvent_getPointerCount(event),
+ pointerCount);
+
+ for (int i = 0; i < pointerCount; i++) {
+ jfloat rawX = env->CallFloatMethod(obj, gMotionEventMethodIds.getRawX, i);
+ jfloat rawY = env->CallFloatMethod(obj, gMotionEventMethodIds.getRawY, i);
+ ASSERT(fabs(rawX - AMotionEvent_getRawX(event, i)) == 0.0f, "Point X:%f not same as %f",
+ AMotionEvent_getRawX(event, i), rawX);
+
+ ASSERT(fabs(rawY - AMotionEvent_getRawY(event, i)) == 0.0f, "Point Y:%f not same as %f",
+ AMotionEvent_getRawY(event, i), rawY);
+ }
+ AInputEvent_release(event);
+}
+
+void nativeKeyEventTest(JNIEnv *env, jclass /* clazz */, jobject obj) {
+ const AInputEvent *event = AKeyEvent_fromJava(env, obj);
+ jint action = env->CallIntMethod(obj, gKeyEventMethodIds.getAction);
+ jlong downTime = env->CallLongMethod(obj, gKeyEventMethodIds.getDownTime) * NS_PER_MS;
+ jlong eventTime = env->CallLongMethod(obj, gKeyEventMethodIds.getEventTime) * NS_PER_MS;
+ jint keyCode = env->CallIntMethod(obj, gKeyEventMethodIds.getKeyCode);
+
+ ASSERT(AInputEvent_getType(event) == AINPUT_EVENT_TYPE_KEY, "Wrong event type %d.",
+ AInputEvent_getType(event));
+
+ ASSERT(action == AKeyEvent_getAction(event), "Wrong action %d not equal to %d",
+ AKeyEvent_getAction(event), action);
+
+ ASSERT(downTime == AKeyEvent_getDownTime(event),
+ "Wrong downTime %" PRId64 " not equal to %" PRId64, AKeyEvent_getDownTime(event),
+ downTime);
+
+ ASSERT(eventTime == AKeyEvent_getEventTime(event),
+ "Wrong eventTime %" PRId64 " not equal to %" PRId64, AKeyEvent_getEventTime(event),
+ eventTime);
+
+ ASSERT(keyCode == AKeyEvent_getKeyCode(event), "Wrong keyCode %d not equal to %d",
+ AKeyEvent_getAction(event), action);
+
+ AInputEvent_release(event);
+}
+
+const std::array<JNINativeMethod, 1> JNI_METHODS_MOTION = {{
+ {"nativeMotionEventTest", "(Landroid/view/MotionEvent;)V", (void *)nativeMotionEventTest},
+}};
+
+const std::array<JNINativeMethod, 1> JNI_METHODS_KEY = {{
+ {"nativeKeyEventTest", "(Landroid/view/KeyEvent;)V", (void *)nativeKeyEventTest},
+}};
+
+} // anonymous namespace
+
+jint register_android_view_cts_AMotionEventNativeTest(JNIEnv *env) {
+ jclass clazz = env->FindClass("android/view/MotionEvent");
+ gMotionEventMethodIds.getAction = env->GetMethodID(clazz, "getAction", "()I");
+ gMotionEventMethodIds.getMetaState = env->GetMethodID(clazz, "getMetaState", "()I");
+ gMotionEventMethodIds.getDownTime = env->GetMethodID(clazz, "getDownTime", "()J");
+ gMotionEventMethodIds.getEventTime = env->GetMethodID(clazz, "getEventTime", "()J");
+ gMotionEventMethodIds.getPointerCount = env->GetMethodID(clazz, "getPointerCount", "()I");
+ gMotionEventMethodIds.getRawX = env->GetMethodID(clazz, "getRawX", "(I)F");
+ gMotionEventMethodIds.getRawY = env->GetMethodID(clazz, "getRawY", "(I)F");
+ jclass clazzTest = env->FindClass("android/view/cts/MotionEventTest");
+ return env->RegisterNatives(clazzTest, JNI_METHODS_MOTION.data(), JNI_METHODS_MOTION.size());
+}
+
+jint register_android_view_cts_AKeyEventNativeTest(JNIEnv *env) {
+ jclass clazz = env->FindClass("android/view/KeyEvent");
+ gKeyEventMethodIds.getAction = env->GetMethodID(clazz, "getAction", "()I");
+ gKeyEventMethodIds.getKeyCode = env->GetMethodID(clazz, "getKeyCode", "()I");
+ gKeyEventMethodIds.getDownTime = env->GetMethodID(clazz, "getDownTime", "()J");
+ gKeyEventMethodIds.getEventTime = env->GetMethodID(clazz, "getEventTime", "()J");
+ jclass clazzTest = env->FindClass("android/view/cts/KeyEventTest");
+ return env->RegisterNatives(clazzTest, JNI_METHODS_KEY.data(), JNI_METHODS_KEY.size());
+}
diff --git a/tests/tests/view/jni/android_view_cts_ASurfaceControlTest.cpp b/tests/tests/view/jni/android_view_cts_ASurfaceControlTest.cpp
index 3bc8890..6ea343e 100644
--- a/tests/tests/view/jni/android_view_cts_ASurfaceControlTest.cpp
+++ b/tests/tests/view/jni/android_view_cts_ASurfaceControlTest.cpp
@@ -33,32 +33,11 @@
#include <errno.h>
#include <jni.h>
+#include <jniAssert.h>
#include <time.h>
namespace {
-// Raises a java exception
-static void fail(JNIEnv* env, const char* format, ...) {
- va_list args;
-
- va_start(args, format);
- char* msg;
- vasprintf(&msg, format, args);
- va_end(args);
-
- jclass exClass;
- const char* className = "java/lang/AssertionError";
- exClass = env->FindClass(className);
- env->ThrowNew(exClass, msg);
- free(msg);
-}
-
-#define ASSERT(condition, format, args...) \
- if (!(condition)) { \
- fail(env, format, ##args); \
- return; \
- }
-
#define NANOS_PER_SECOND 1000000000LL
int64_t systemTime() {
struct timespec time;
diff --git a/tests/tests/view/jni/jniAssert.h b/tests/tests/view/jni/jniAssert.h
new file mode 100644
index 0000000..eaf9695
--- /dev/null
+++ b/tests/tests/view/jni/jniAssert.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 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.
+ */
+
+#include <jni.h>
+#include <nativehelper/JNIHelp.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+// Raises a java exception
+static void fail(JNIEnv *env, const char *format, ...) {
+ va_list args;
+
+ va_start(args, format);
+ char *msg;
+ vasprintf(&msg, format, args);
+ va_end(args);
+
+ jclass exClass;
+ const char *className = "java/lang/AssertionError";
+ exClass = env->FindClass(className);
+ env->ThrowNew(exClass, msg);
+ free(msg);
+}
+
+#define ASSERT(condition, format, args...) \
+ if (!(condition)) { \
+ fail(env, format, ##args); \
+ return; \
+ }
diff --git a/tests/tests/view/src/android/view/cts/KeyEventTest.java b/tests/tests/view/src/android/view/cts/KeyEventTest.java
index 2f7e1a5..7af97dc 100644
--- a/tests/tests/view/src/android/view/cts/KeyEventTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyEventTest.java
@@ -59,6 +59,12 @@
private long mDownTime;
private long mEventTime;
+ private static native void nativeKeyEventTest(KeyEvent event);
+
+ static {
+ System.loadLibrary("ctsview_jni");
+ }
+
@Before
public void setup() {
mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
@@ -795,6 +801,13 @@
KeyEvent.keyCodeFromString(Integer.toString(KeyEvent.LAST_KEYCODE + 1)));
}
+ @Test
+ public void testNativeConverter() {
+ mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A,
+ 1, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_TOUCHSCREEN);
+ nativeKeyEventTest(mKeyEvent);
+ }
+
// Parcel a KeyEvent, then create a new KeyEvent from this parcel. Return the new KeyEvent
private KeyEvent parcelUnparcel(KeyEvent keyEvent) {
Parcel parcel = Parcel.obtain();
diff --git a/tests/tests/view/src/android/view/cts/MotionEventTest.java b/tests/tests/view/src/android/view/cts/MotionEventTest.java
index 14ccf8b..08fda91 100644
--- a/tests/tests/view/src/android/view/cts/MotionEventTest.java
+++ b/tests/tests/view/src/android/view/cts/MotionEventTest.java
@@ -72,6 +72,12 @@
private static final float DELTA = 0.01f;
private static final float RAW_COORD_TOLERANCE = 0.001f;
+ private static native void nativeMotionEventTest(MotionEvent event);
+
+ static {
+ System.loadLibrary("ctsview_jni");
+ }
+
@Before
public void setup() {
mDownTime = SystemClock.uptimeMillis();
@@ -980,4 +986,11 @@
assertEquals(MotionEvent.CLASSIFICATION_NONE, mMotionEvent1.getClassification());
assertEquals(MotionEvent.CLASSIFICATION_NONE, mMotionEvent2.getClassification());
}
+
+ @Test
+ public void testNativeConverter() {
+ final MotionEvent event = MotionEvent.obtain(mDownTime, mEventTime,
+ MotionEvent.ACTION_MOVE, X_3F, Y_4F, META_STATE);
+ nativeMotionEventTest(event);
+ }
}
diff --git a/tests/tests/voiceinteraction/AndroidManifest.xml b/tests/tests/voiceinteraction/AndroidManifest.xml
index 393d7a8..10f9038 100644
--- a/tests/tests/voiceinteraction/AndroidManifest.xml
+++ b/tests/tests/voiceinteraction/AndroidManifest.xml
@@ -16,37 +16,38 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.voiceinteraction.cts">
+ package="android.voiceinteraction.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="TestStartActivity"
- android:label="Voice Interaction Target">
+ android:label="Voice Interaction Target"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_START_ACTIVITY" />
- <category android:name="android.intent.category.LAUNCHER" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.TEST_START_ACTIVITY"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name="TestLocalInteractionActivity"
- android:label="Local Interaction Activity">
+ android:label="Local Interaction Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_LOCAL_INTERACTION_ACTIVITY" />
+ <action android:name="android.intent.action.TEST_LOCAL_INTERACTION_ACTIVITY"/>
</intent-filter>
</activity>
<receiver android:name="VoiceInteractionTestReceiver"
- android:exported="true" />
+ android:exported="true"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.voiceinteraction.cts"
- android:label="CTS tests of android.voiceinteraction">
+ android:targetPackage="android.voiceinteraction.cts"
+ android:label="CTS tests of android.voiceinteraction">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/voiceinteraction/testapp/AndroidManifest.xml b/tests/tests/voiceinteraction/testapp/AndroidManifest.xml
index c683c66..020ee80 100644
--- a/tests/tests/voiceinteraction/testapp/AndroidManifest.xml
+++ b/tests/tests/voiceinteraction/testapp/AndroidManifest.xml
@@ -16,36 +16,37 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.voiceinteraction.testapp">
+ package="android.voiceinteraction.testapp">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="TestApp"
- android:label="Voice Interaction Test App"
- android:theme="@android:style/Theme.DeviceDefault">
+ android:label="Voice Interaction Test App"
+ android:theme="@android:style/Theme.DeviceDefault"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <category android:name="android.intent.category.VOICE" />
- <data android:scheme="https" />
- <data android:host="android.voiceinteraction.testapp" />
- <data android:path="/TestApp" />
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <category android:name="android.intent.category.VOICE"/>
+ <data android:scheme="https"/>
+ <data android:host="android.voiceinteraction.testapp"/>
+ <data android:path="/TestApp"/>
</intent-filter>
</activity>
<activity android:name=".DirectActionsActivity"
- android:label="Direct actions activity"
- android:exported="true">
+ android:label="Direct actions activity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:scheme="https" />
- <data android:host="android.voiceinteraction.testapp" />
- <data android:path="/DirectActionsActivity" />
- <category android:name="android.intent.category.VOICE" />
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"/>
+ <data android:host="android.voiceinteraction.testapp"/>
+ <data android:path="/DirectActionsActivity"/>
+ <category android:name="android.intent.category.VOICE"/>
</intent-filter>
</activity>
diff --git a/tests/tests/voicesettings/AndroidManifest.xml b/tests/tests/voicesettings/AndroidManifest.xml
index 8be0b80..ba50604 100644
--- a/tests/tests/voicesettings/AndroidManifest.xml
+++ b/tests/tests/voicesettings/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
* Copyright (C) 2015 The Android Open Source Project
*
@@ -15,31 +16,31 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.voicesettings.cts">
+ package="android.voicesettings.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name=".BroadcastTestStartActivity"
- android:label="The Target Activity for VoiceSettings CTS Test">
+ android:label="The Target Activity for VoiceSettings CTS Test"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.TEST_START_ACTIVITY_ZEN_MODE" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_AIRPLANE_MODE" />
- <action android:name="android.intent.action.TEST_START_ACTIVITY_BATTERYSAVER_MODE" />
- <category android:name="android.intent.category.LAUNCHER" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_ZEN_MODE"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_AIRPLANE_MODE"/>
+ <action android:name="android.intent.action.TEST_START_ACTIVITY_BATTERYSAVER_MODE"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.voicesettings.cts"
- android:label="CTS tests of android.voicesettings">
+ android:targetPackage="android.voicesettings.cts"
+ android:label="CTS tests of android.voicesettings">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/voicesettings/TEST_MAPPING b/tests/tests/voicesettings/TEST_MAPPING
new file mode 100644
index 0000000..fe855df
--- /dev/null
+++ b/tests/tests/voicesettings/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsVoiceSettingsTestCases"
+ }
+ ]
+}
diff --git a/tests/tests/voicesettings/service/AndroidManifest.xml b/tests/tests/voicesettings/service/AndroidManifest.xml
index 13671b6..af106f4 100644
--- a/tests/tests/voicesettings/service/AndroidManifest.xml
+++ b/tests/tests/voicesettings/service/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<!--
* Copyright (C) 2015 The Android Open Source Project
*
@@ -15,51 +16,54 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.voicesettings.service">
+ package="android.voicesettings.service">
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<service android:name=".MainInteractionService"
- android:label="CTS test voice interaction service"
- android:permission="android.permission.BIND_VOICE_INTERACTION"
- android:process=":interactor"
- android:exported="true">
+ android:label="CTS test voice interaction service"
+ android:permission="android.permission.BIND_VOICE_INTERACTION"
+ android:process=":interactor"
+ android:exported="true">
<meta-data android:name="android.voice_interaction"
- android:resource="@xml/interaction_service" />
+ android:resource="@xml/interaction_service"/>
<intent-filter>
- <action android:name="android.service.voice.VoiceInteractionService" />
+ <action android:name="android.service.voice.VoiceInteractionService"/>
</intent-filter>
</service>
- <activity android:name=".VoiceInteractionMain" >
+ <activity android:name=".VoiceInteractionMain"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIMAIN_ZEN_MODE_ON" />
- <action android:name="android.intent.action.VIMAIN_ZEN_MODE_OFF" />
- <action android:name="android.intent.action.VIMAIN_AIRPLANE_MODE_ON" />
- <action android:name="android.intent.action.VIMAIN_AIRPLANE_MODE_OFF" />
- <action android:name="android.intent.action.VIMAIN_BATTERYSAVER_MODE_ON" />
- <action android:name="android.intent.action.VIMAIN_BATTERYSAVER_MODE_OFF" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.VIMAIN_ZEN_MODE_ON"/>
+ <action android:name="android.intent.action.VIMAIN_ZEN_MODE_OFF"/>
+ <action android:name="android.intent.action.VIMAIN_AIRPLANE_MODE_ON"/>
+ <action android:name="android.intent.action.VIMAIN_AIRPLANE_MODE_OFF"/>
+ <action android:name="android.intent.action.VIMAIN_BATTERYSAVER_MODE_ON"/>
+ <action android:name="android.intent.action.VIMAIN_BATTERYSAVER_MODE_OFF"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name=".SettingsActivity"
- android:label="Voice Interaction Settings">
+ android:label="Voice Interaction Settings"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<service android:name=".MainInteractionSessionService"
- android:permission="android.permission.BIND_VOICE_INTERACTION"
- android:process=":session">
+ android:permission="android.permission.BIND_VOICE_INTERACTION"
+ android:process=":session">
</service>
<service android:name=".MainRecognitionService"
- android:label="CTS Voice Recognition Service">
+ android:label="CTS Voice Recognition Service"
+ android:exported="true">
<intent-filter>
- <action android:name="android.speech.RecognitionService" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.speech.RecognitionService"/>
+ <category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
- <meta-data android:name="android.speech" android:resource="@xml/recognition_service" />
+ <meta-data android:name="android.speech"
+ android:resource="@xml/recognition_service"/>
</service>
</application>
</manifest>
-
diff --git a/tests/tests/webkit/AndroidManifest.xml b/tests/tests/webkit/AndroidManifest.xml
index e7de9bf..ed0e92f 100644
--- a/tests/tests/webkit/AndroidManifest.xml
+++ b/tests/tests/webkit/AndroidManifest.xml
@@ -16,69 +16,74 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.webkit.cts">
+ package="android.webkit.cts">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
<!-- Note: we must provide INTERNET permission for
- ServiceWorkerWebSettingsTest#testBlockNetworkLoads -->
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <application android:maxRecents="1" android:usesCleartextTraffic="true">
+ ServiceWorkerWebSettingsTest#testBlockNetworkLoads -->
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <application android:maxRecents="1"
+ android:usesCleartextTraffic="true">
<provider android:name="android.webkit.cts.MockContentProvider"
- android:exported="true"
- android:authorities="android.webkit.cts.MockContentProvider" />
- <uses-library android:name="android.test.runner" />
- <uses-library android:name="org.apache.http.legacy" android:required="false" />
+ android:exported="true"
+ android:authorities="android.webkit.cts.MockContentProvider"/>
+ <uses-library android:name="android.test.runner"/>
+ <uses-library android:name="org.apache.http.legacy"
+ android:required="false"/>
<activity android:name="android.webkit.cts.CookieSyncManagerCtsActivity"
- android:label="CookieSyncManagerCtsActivity"
- android:screenOrientation="nosensor">
+ android:label="CookieSyncManagerCtsActivity"
+ android:screenOrientation="nosensor"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.webkit.cts.WebViewCtsActivity"
- android:label="WebViewCtsActivity"
- android:screenOrientation="nosensor">
+ android:label="WebViewCtsActivity"
+ android:screenOrientation="nosensor"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.webkit.cts.WebViewStartupCtsActivity"
- android:label="WebViewStartupCtsActivity"
- android:screenOrientation="nosensor">
+ android:label="WebViewStartupCtsActivity"
+ android:screenOrientation="nosensor"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<service android:name="android.webkit.cts.TestProcessServiceA"
- android:process=":testprocessA"
- android:exported="false" />
+ android:process=":testprocessA"
+ android:exported="false"/>
<service android:name="android.webkit.cts.TestProcessServiceB"
- android:process=":testprocessB"
- android:exported="false" />
+ android:process=":testprocessB"
+ android:exported="false"/>
<!-- Specify a preloaded font list to ensure that this doesn't interfere
- with the operation of the renderer process (as in b/70968451)
- -->
- <meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_fonts" />
+ with the operation of the renderer process (as in b/70968451)
+ -->
+ <meta-data android:name="preloaded_fonts"
+ android:resource="@array/preloaded_fonts"/>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.webkit.cts"
- android:label="CTS tests of android.webkit">
+ android:targetPackage="android.webkit.cts"
+ android:label="CTS tests of android.webkit">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/widget/AndroidManifest.xml b/tests/tests/widget/AndroidManifest.xml
index c30c71c..b822759 100644
--- a/tests/tests/widget/AndroidManifest.xml
+++ b/tests/tests/widget/AndroidManifest.xml
@@ -16,615 +16,685 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.widget.cts"
- android:targetSandboxVersion="2">
+ package="android.widget.cts"
+ android:targetSandboxVersion="2">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<application android:label="Android TestCase"
- android:icon="@drawable/size_48x48"
- android:maxRecents="1"
- android:multiArch="true"
- android:name="android.widget.cts.MockApplication"
- android:supportsRtl="true"
- android:theme="@android:style/Theme.Material.Light.DarkActionBar">
+ android:icon="@drawable/size_48x48"
+ android:maxRecents="1"
+ android:multiArch="true"
+ android:name="android.widget.cts.MockApplication"
+ android:supportsRtl="true"
+ android:theme="@android:style/Theme.Material.Light.DarkActionBar">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.widget.cts.EmptyCtsActivity"
- android:label="EmptyCtsActivity">
+ android:label="EmptyCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.AbsoluteLayoutCtsActivity"
- android:label="AbsoluteLayoutCtsActivity">
+ android:label="AbsoluteLayoutCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.TwoLineListItemCtsActivity"
- android:label="TwoLineListItemCtsActivity">
+ android:label="TwoLineListItemCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ViewFlipperCtsActivity"
- android:label="ViewFlipperCtsActivity">
+ android:label="ViewFlipperCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.HorizontalScrollViewCtsActivity"
- android:label="HorizontalScrollViewCtsActivity">
+ android:label="HorizontalScrollViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.SlidingDrawerCtsActivity"
- android:label="SlidingDrawerCtsActivity">
+ android:label="SlidingDrawerCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.DigitalClockCtsActivity"
- android:label="DigitalClockCtsActivity">
+ android:label="DigitalClockCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ImageViewCtsActivity"
- android:label="ImageViewCtsActivity">
+ android:label="ImageViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ImageSwitcherCtsActivity"
- android:label="ImageSwitcherCtsActivity">
+ android:label="ImageSwitcherCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.TextSwitcherCtsActivity"
- android:label="TextSwitcherCtsActivity">
+ android:label="TextSwitcherCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.SwitchCtsActivity"
- android:label="SwitchCtsActivity">
+ android:label="SwitchCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.SpinnerCtsActivity"
- android:label="SpinnerCtsActivity">
+ android:label="SpinnerCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ToolbarCtsActivity"
- android:theme="@android:style/Theme.Material.Light.NoActionBar"
- android:label="ToolbarCtsActivity">
+ android:theme="@android:style/Theme.Material.Light.NoActionBar"
+ android:label="ToolbarCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ToolbarWithMarginsCtsActivity"
- android:theme="@android:style/Theme.Material.Light.NoActionBar"
- android:label="ToolbarWithMarginsCtsActivity">
+ android:theme="@android:style/Theme.Material.Light.NoActionBar"
+ android:label="ToolbarWithMarginsCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ActionMenuViewCtsActivity"
- android:label="ActionMenuViewCtsActivity">
+ android:label="ActionMenuViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.SeekBarCtsActivity"
- android:label="SeekBarCtsActivity">
+ android:label="SeekBarCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ScrollViewCtsActivity"
- android:label="ScrollViewCtsActivity">
+ android:label="ScrollViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.FrameLayoutCtsActivity"
- android:label="FrameLayoutCtsActivity">
+ android:label="FrameLayoutCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.LinearLayoutCtsActivity"
- android:label="LinearLayoutCtsActivity">
+ android:label="LinearLayoutCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.GridLayoutCtsActivity"
- android:label="GridLayoutCtsActivity">
+ android:label="GridLayoutCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.LayoutDirectionCtsActivity"
- android:label="LayoutDirectionCtsActivity">
+ android:label="LayoutDirectionCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.AbsSeekBarCtsActivity"
- android:label="AbsSeekBarCtsActivity">
+ android:label="AbsSeekBarCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ProgressBarCtsActivity"
- android:label="ProgressBarCtsActivity">
+ android:label="ProgressBarCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ChronometerCtsActivity"
- android:label="ChronometerCtsActivity">
+ android:label="ChronometerCtsActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.MediaControllerCtsActivity"
- android:label="MediaControllerCtsActivity">
+ android:label="MediaControllerCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.RatingBarCtsActivity"
- android:label="RatingBarCtsActivity">
+ android:label="RatingBarCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.RemoteViewsCtsActivity"
- android:label="RemoteViewsCtsActivity">
+ android:label="RemoteViewsCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ExpandableListBasic"
- android:label="ExpandableListBasic">
+ android:label="ExpandableListBasic"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ExpandableList"
- android:label="ExpandableList">
+ android:label="ExpandableList"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.CtsActivity"
- android:label="CtsActivity">
+ android:label="CtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ExpandableListWithHeaders"
- android:label="ExpandableListWithHeaders">
+ android:label="ExpandableListWithHeaders"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.GalleryCtsActivity"
- android:label="GalleryCtsActivity">
+ android:label="GalleryCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.PopupWindowCtsActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:label="PopupWindowCtsActivity"
- android:theme="@style/Theme.PopupWindowCtsActivity">
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:label="PopupWindowCtsActivity"
+ android:theme="@style/Theme.PopupWindowCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.PopupMenuCtsActivity"
- android:label="PopupMenuCtsActivity">
+ android:label="PopupMenuCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ListPopupWindowCtsActivity"
- android:label="ListPopupWindowCtsActivity"
- android:windowSoftInputMode="stateAlwaysHidden">
+ android:label="ListPopupWindowCtsActivity"
+ android:windowSoftInputMode="stateAlwaysHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ListViewCtsActivity"
- android:label="ListViewCtsActivity">
+ android:label="ListViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ListViewFixedCtsActivity"
- android:label="ListViewFixedCtsActivity">
+ android:label="ListViewFixedCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.TextClockCtsActivity"
- android:label="TextClockCtsActivity"
- android:screenOrientation="nosensor"
- android:windowSoftInputMode="stateAlwaysHidden">
+ android:label="TextClockCtsActivity"
+ android:screenOrientation="nosensor"
+ android:windowSoftInputMode="stateAlwaysHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.TextViewCtsActivity"
android:label="TextViewCtsActivity"
android:screenOrientation="locked"
+ android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.EditTextCtsActivity"
- android:label="EditTextCtsActivity"
- android:screenOrientation="nosensor"
- android:windowSoftInputMode="stateAlwaysHidden">
+ android:label="EditTextCtsActivity"
+ android:screenOrientation="nosensor"
+ android:windowSoftInputMode="stateAlwaysHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.DialerFilterCtsActivity"
- android:label="DialerFilterCtsActivity">
+ android:label="DialerFilterCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.MultiAutoCompleteTextViewCtsActivity"
- android:label="MultiAutoCompleteTextView Test Activity">
+ android:label="MultiAutoCompleteTextView Test Activity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.VideoViewCtsActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:label="VideoViewCtsActivity">
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:label="VideoViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.AutoCompleteCtsActivity"
- android:label="AutoCompleteCtsActivity"
- android:screenOrientation="nosensor"
- android:windowSoftInputMode="stateAlwaysHidden">
+ android:label="AutoCompleteCtsActivity"
+ android:screenOrientation="nosensor"
+ android:windowSoftInputMode="stateAlwaysHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <activity android:name="android.widget.cts.ViewAnimatorCtsActivity" android:label="ViewAnimatorCtsActivity">
+ <activity android:name="android.widget.cts.ViewAnimatorCtsActivity"
+ android:label="ViewAnimatorCtsActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.GridViewCtsActivity"
- android:label="GridViewCtsActivity">
+ android:label="GridViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.RelativeLayoutCtsActivity"
- android:label="RelativeLayoutCtsActivity">
+ android:label="RelativeLayoutCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.FrameLayoutCtsActivity"
- android:label="FrameLayoutCtsActivity">
+ android:label="FrameLayoutCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.AdapterViewCtsActivity"
- android:label="AdapterViewCtsActivity">
+ android:label="AdapterViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.CheckedTextViewCtsActivity"
- android:label="CheckedTextViewCtsActivity"/>
+ android:label="CheckedTextViewCtsActivity"/>
<activity android:name="android.widget.cts.TableCtsActivity"
- android:label="TableCtsActivity">
+ android:label="TableCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.TabHostCtsActivity"
- android:label="TabHostCtsActivity">
+ android:label="TabHostCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ZoomButtonCtsActivity"
- android:label="ZoomButtonCtsActivity">
+ android:label="ZoomButtonCtsActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.DatePickerDialogCtsActivity"
- android:label="DatePickerDialogCtsActivity">
+ android:label="DatePickerDialogCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.CalendarViewCtsActivity"
- android:label="CalendarViewCtsActivity">
+ android:label="CalendarViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.DatePickerCtsActivity"
- android:label="DatePickerCtsActivity">
+ android:label="DatePickerCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.SearchViewCtsActivity"
- android:label="SearchViewCtsActivity">
+ android:label="SearchViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ImageButtonCtsActivity"
- android:label="ImageButtonCtsActivity">
+ android:label="ImageButtonCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.NumberPickerCtsActivity"
- android:label="NumberPickerCtsActivity">
+ android:label="NumberPickerCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.CheckBoxCtsActivity"
- android:label="CheckBoxCtsActivity">
+ android:label="CheckBoxCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.CompoundButtonCtsActivity"
- android:label="CompoundButtonCtsActivity">
+ android:label="CompoundButtonCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.RadioButtonCtsActivity"
- android:label="RadioButtonCtsActivity">
+ android:label="RadioButtonCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.ToggleButtonCtsActivity"
- android:label="ToggleButtonCtsActivity">
+ android:label="ToggleButtonCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.TimePickerCtsActivity"
- android:label="TimePickerCtsActivity">
+ android:label="TimePickerCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.BackwardNavigationCtsActivity"
- android:label="BackwardNavigationCtsActivity">
+ android:label="BackwardNavigationCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.RadioGroupCtsActivity"
- android:label="RadioGroupCtsActivity">
+ android:label="RadioGroupCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.app.Activity"
- android:label="Activity"
- android:theme="@style/WidgetAttributeTestTheme">
+ android:label="Activity"
+ android:theme="@style/WidgetAttributeTestTheme"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.app.ActivityGroup"
- android:label="ActivityGroup" />
+ android:label="ActivityGroup"/>
<activity android:name="android.widget.cts.MockURLSpanTestActivity"
- android:label="MockURLSpanTestActivity"
- android:launchMode="singleTask"
- android:alwaysRetainTaskState="true"
- android:configChanges="orientation|keyboardHidden">
+ android:label="MockURLSpanTestActivity"
+ android:launchMode="singleTask"
+ android:alwaysRetainTaskState="true"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- <data android:scheme="ctstest" />
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+ <data android:scheme="ctstest"/>
</intent-filter>
</activity>
- <activity android:name="android.widget.cts.PointerIconCtsActivity">
+ <activity android:name="android.widget.cts.PointerIconCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.MagnifierCtsActivity"
- android:label="MagnifierCtsActivity">
+ android:label="MagnifierCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
<activity android:name="android.widget.cts.inline.InlineContentViewCtsActivity"
- android:label="InlineContentViewCtsActivity">
+ android:label="InlineContentViewCtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.widget.cts"
- android:label="CTS tests of android.widget">
+ android:targetPackage="android.widget.cts"
+ android:label="CTS tests of android.widget">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/widget/res/layout/edittext_singleline_maxlength.xml b/tests/tests/widget/res/layout/edittext_singleline_maxlength.xml
new file mode 100644
index 0000000..548d42d
--- /dev/null
+++ b/tests/tests/widget/res/layout/edittext_singleline_maxlength.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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="wrap_content">
+
+ <TextView
+ android:id="@+id/textview_explicit_singleline_max_length"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/even_more_long_text"
+ android:singleLine="true" />
+ <EditText
+ android:id="@+id/edittext_explicit_singleline_max_length"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/even_more_long_text"
+ android:singleLine="true" />
+ <EditText
+ android:id="@+id/edittext_explicit_singleline_with_explicit_max_length"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/even_more_long_text"
+ android:maxLength="2000"
+ android:singleLine="true" />
+ <EditText
+ android:id="@+id/edittext_multiLine"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textMultiLine"
+ android:text="@string/even_more_long_text" />
+ <EditText
+ android:id="@+id/edittext_singleLine"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:text="@string/even_more_long_text" />
+
+</LinearLayout>
diff --git a/tests/tests/widget/res/values/strings.xml b/tests/tests/widget/res/values/strings.xml
index 9e36cc0..91084e9 100644
--- a/tests/tests/widget/res/values/strings.xml
+++ b/tests/tests/widget/res/values/strings.xml
@@ -176,6 +176,7 @@
with no fading. I have made this string longer to fix this case. If you are correcting this
text, I would love to see the kind of devices you guys now use! Guys, maybe some devices need longer string!
I think so, so how about double this string, like copy and paste! </string>
+ <string name="even_more_long_text">This is even more long string which exceeds the character limit of the single line edit text. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst.</string>
<string name="rectangle200">"M 0,0 l 200,0 l 0, 200 l -200, 0 z"</string>
<string name="popup_show">Show popup</string>
diff --git a/tests/tests/widget/src/android/widget/cts/EditTextTest.java b/tests/tests/widget/src/android/widget/cts/EditTextTest.java
index 957edf0..a9785a7 100755
--- a/tests/tests/widget/src/android/widget/cts/EditTextTest.java
+++ b/tests/tests/widget/src/android/widget/cts/EditTextTest.java
@@ -28,7 +28,9 @@
import android.content.res.Configuration;
import android.graphics.Point;
import android.text.Editable;
+import android.text.InputFilter;
import android.text.Layout;
+import android.text.Spanned;
import android.text.TextUtils;
import android.text.method.ArrowKeyMovementMethod;
import android.text.method.MovementMethod;
@@ -39,6 +41,7 @@
import android.util.Xml;
import android.view.KeyEvent;
import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.TextView.BufferType;
@@ -527,4 +530,165 @@
CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mEditText1, KeyEvent.KEYCODE_NUMPAD_ENTER);
assertTrue(mEditText2.hasFocus());
}
+
+ private static final int FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT = 5000;
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_explicit_singleLine() {
+ mActivity.setContentView(R.layout.edittext_singleline_maxlength);
+
+ EditText et = (EditText) mActivity.findViewById(
+ R.id.edittext_explicit_singleline_max_length);
+ assertTrue(et.getText().length() <= FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_explicit_singleLine_with_explicit_maxLength() {
+ mActivity.setContentView(R.layout.edittext_singleline_maxlength);
+
+ EditText et = (EditText) mActivity.findViewById(
+ R.id.edittext_explicit_singleline_with_explicit_max_length);
+ // This EditText has maxLength=2000 and singeLine=true.
+ // User specified maxLength must be respected.
+ assertTrue(et.getText().length() <= 2000);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_singleLine_from_inputType() {
+ mActivity.setContentView(R.layout.edittext_singleline_maxlength);
+
+ EditText et = (EditText) mActivity.findViewById(R.id.edittext_singleLine);
+ // This EditText has inputType="text" which is translated to singleLine.
+ assertTrue(et.getText().length() <= FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_multiline() {
+ mActivity.setContentView(R.layout.edittext_singleline_maxlength);
+
+ EditText et = (EditText) mActivity.findViewById(R.id.edittext_multiLine);
+ // Multiline text doesn't have automated char limit.
+ assertTrue(et.getText().length() > FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_textView() {
+ mActivity.setContentView(R.layout.edittext_singleline_maxlength);
+
+ TextView tv = (TextView) mActivity.findViewById(
+ R.id.textview_explicit_singleline_max_length);
+ // Automated maxLength for singline text is not applied to TextView.
+ assertTrue(tv.getText().length() > FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_SetSingleLine() {
+ EditText et = new EditText(mActivity);
+ et.setText(mActivity.getResources().getText(R.string.even_more_long_text));
+ et.setSingleLine();
+
+ assertTrue(et.getText().length() <= FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_setInputType_singleLine() {
+ EditText et = new EditText(mActivity);
+ et.setText(mActivity.getResources().getText(R.string.even_more_long_text));
+ et.setInputType(EditorInfo.TYPE_CLASS_TEXT);
+
+ assertTrue(et.getText().length() <= FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_setInputType_multiLine() {
+ EditText et = new EditText(mActivity);
+ et.setInputType(EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE);
+ et.setText(mActivity.getResources().getText(R.string.even_more_long_text));
+
+ assertTrue(et.getText().length() > FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+ }
+
+ class DummyFilter implements InputFilter {
+ @Override
+ public CharSequence filter(
+ CharSequence source,
+ int start,
+ int end,
+ Spanned dest,
+ int dstart,
+ int dend) {
+ return source;
+ }
+ }
+
+ private final InputFilter mFilterA = new DummyFilter();
+ private final InputFilter mFilterB = new DummyFilter();
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_SetSingleLine_preserveFilters() {
+ EditText et = new EditText(mActivity);
+ et.setText(mActivity.getResources().getText(R.string.even_more_long_text));
+ et.setFilters(new InputFilter[] { mFilterA, mFilterB });
+ et.setSingleLine();
+
+ assertTrue(et.getText().length() <= FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+
+ assertEquals(3, et.getFilters().length);
+ assertEquals(et.getFilters()[0], mFilterA);
+ assertEquals(et.getFilters()[1], mFilterB);
+ assertTrue(et.getFilters()[2] instanceof InputFilter.LengthFilter);
+
+ et.setSingleLine(false);
+ assertEquals(2, et.getFilters().length);
+ assertEquals(et.getFilters()[0], mFilterA);
+ assertEquals(et.getFilters()[1], mFilterB);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_SetSingleLine_preserveFilters_mixtureFilters() {
+ EditText et = new EditText(mActivity);
+ et.setText(mActivity.getResources().getText(R.string.even_more_long_text));
+ et.setSingleLine();
+ et.setFilters(new InputFilter[] { mFilterA, et.getFilters()[0], mFilterB });
+
+ assertTrue(et.getText().length() <= FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+
+ et.setSingleLine(false);
+ assertEquals(2, et.getFilters().length);
+ assertEquals(et.getFilters()[0], mFilterA);
+ assertEquals(et.getFilters()[1], mFilterB);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testSingleLineMaxLength_SetSingleLine_preserveFilters_anotherLengthFilter() {
+ EditText et = new EditText(mActivity);
+ et.setText(mActivity.getResources().getText(R.string.even_more_long_text));
+ final InputFilter myFilter =
+ new InputFilter.LengthFilter(FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+ et.setFilters(new InputFilter[] { myFilter });
+ et.setSingleLine();
+
+ assertTrue(et.getText().length() <= FRAMEWORK_MAX_LENGTH_FOR_SINGLE_LINE_EDIT_TEXT);
+
+ // setSingleLine(true) must not add new filter since there is already LengthFilter.
+ assertEquals(1, et.getFilters().length);
+ assertEquals(et.getFilters()[0], myFilter);
+
+ // setSingleLine(false) must not remove my custom filter.
+ et.setSingleLine(false);
+ assertEquals(1, et.getFilters().length);
+ assertEquals(et.getFilters()[0], myFilter);
+ }
+
}
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewRichContentReceiverTest.java b/tests/tests/widget/src/android/widget/cts/TextViewRichContentReceiverTest.java
new file mode 100644
index 0000000..bc753a9
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/TextViewRichContentReceiverTest.java
@@ -0,0 +1,830 @@
+/*
+ * 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.widget.cts;
+
+import static android.widget.RichContentReceiver.FLAG_CONVERT_TO_PLAIN_TEXT;
+import static android.widget.RichContentReceiver.SOURCE_AUTOFILL;
+import static android.widget.RichContentReceiver.SOURCE_CLIPBOARD;
+import static android.widget.RichContentReceiver.SOURCE_DRAG_AND_DROP;
+import static android.widget.RichContentReceiver.SOURCE_INPUT_METHOD;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import static java.util.Collections.singleton;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.ClipboardManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Parcel;
+import android.text.Selection;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.method.QwertyKeyListener;
+import android.text.method.TextKeyListener.Capitalize;
+import android.text.style.UnderlineSpan;
+import android.view.DragEvent;
+import android.view.View;
+import android.view.View.MeasureSpec;
+import android.view.autofill.AutofillValue;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputContentInfo;
+import android.widget.RichContentReceiver;
+import android.widget.TextView;
+import android.widget.TextView.BufferType;
+
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+
+import java.util.Set;
+
+/**
+ * Test {@link RichContentReceiver} and its integration with {@link TextView}.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TextViewRichContentReceiverTest {
+ @Rule
+ public ActivityTestRule<TextViewCtsActivity> mActivityRule =
+ new ActivityTestRule<>(TextViewCtsActivity.class);
+
+ private Activity mActivity;
+ private TextView mTextView;
+ private RichContentReceiver<TextView> mDefaultReceiver;
+ private MockReceiverWrapper mMockReceiverWrapper;
+ private RichContentReceiver<TextView> mMockReceiver;
+ private ClipboardManager mClipboardManager;
+
+ @Before
+ public void before() {
+ mActivity = mActivityRule.getActivity();
+ PollingCheck.waitFor(mActivity::hasWindowFocus);
+ mTextView = mActivity.findViewById(R.id.textview_text);
+ mDefaultReceiver = TextView.DEFAULT_RICH_CONTENT_RECEIVER;
+
+ mMockReceiverWrapper = new MockReceiverWrapper();
+ mMockReceiver = mMockReceiverWrapper.getMock();
+
+ mClipboardManager = mActivity.getSystemService(ClipboardManager.class);
+ mClipboardManager.clearPrimaryClip();
+
+ configureAppTargetSdkToS();
+ }
+
+ @After
+ public void after() {
+ resetTargetSdk();
+ }
+
+ // ============================================================================================
+ // Tests to verify TextView APIs/accessors/defaults related to RichContentReceiver.
+ // ============================================================================================
+
+ @UiThreadTest
+ @Test
+ public void testTextView_getAndSetRichContentReceiver() throws Exception {
+ // Verify that the default receiver is non null.
+ assertThat(TextView.DEFAULT_RICH_CONTENT_RECEIVER).isNotNull();
+
+ // Verify that by default the getter returns the default receiver.
+ assertThat(mTextView.getRichContentReceiver()).isSameAs(
+ TextView.DEFAULT_RICH_CONTENT_RECEIVER);
+
+ // Verify that after setting a custom receiver, the getter returns it.
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+ assertThat(mTextView.getRichContentReceiver()).isSameAs(mMockReceiverWrapper);
+
+ // Verify that setting a null receiver is not allowed.
+ try {
+ mTextView.setRichContentReceiver(null);
+ Assert.fail("Expected NullPointerException");
+ } catch (NullPointerException expected) {
+ assertThat(mTextView.getRichContentReceiver()).isSameAs(mMockReceiverWrapper);
+ }
+ }
+
+ @UiThreadTest
+ @Test
+ public void testTextView_onCreateInputConnection_nullEditorInfo() throws Exception {
+ initTextViewForEditing("xz", 1);
+ try {
+ mTextView.onCreateInputConnection(null);
+ Assert.fail("Expected exception");
+ } catch (NullPointerException expected) {
+ }
+ }
+
+ @UiThreadTest
+ @Test
+ public void testTextView_onCreateInputConnection_defaultReceiver() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ // Call onCreateInputConnection() and assert that contentMimeTypes is set to the MIME types
+ // of the default receiver.
+ EditorInfo editorInfo = new EditorInfo();
+ InputConnection ic = mTextView.onCreateInputConnection(editorInfo);
+ assertThat(ic).isNotNull();
+ String[] receiverMimeTypes = mDefaultReceiver.getSupportedMimeTypes().toArray(
+ new String[0]);
+ assertThat(editorInfo.contentMimeTypes).isEqualTo(receiverMimeTypes);
+ assertThat(receiverMimeTypes).isEqualTo(new String[]{"text/*"});
+ }
+
+ @UiThreadTest
+ @Test
+ public void testTextView_onCreateInputConnection_oldTargetSdk() throws Exception {
+ configureAppTargetSdkToR();
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Configure the receiver to a mock impl.
+ Set<String> receiverMimeTypes = Set.of("text/plain", "image/png", "video/mp4");
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(receiverMimeTypes);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Call onCreateInputConnection() and assert that contentMimeTypes is not populated with the
+ // MIME types of the receiver.
+ EditorInfo editorInfo = new EditorInfo();
+ InputConnection ic = mTextView.onCreateInputConnection(editorInfo);
+ assertThat(ic).isNotNull();
+ verifyNoMoreInteractions(mMockReceiver);
+ assertThat(editorInfo.contentMimeTypes).isNull();
+ }
+
+ @UiThreadTest
+ @Test
+ public void testTextView_onCreateInputConnection_customReceiver() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Configure the receiver to a mock impl.
+ Set<String> receiverMimeTypes = Set.of("text/plain", "image/png", "video/mp4");
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(receiverMimeTypes);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Call onCreateInputConnection() and assert that contentMimeTypes is set from the receiver.
+ EditorInfo editorInfo = new EditorInfo();
+ InputConnection ic = mTextView.onCreateInputConnection(editorInfo);
+ assertThat(ic).isNotNull();
+ verify(mMockReceiver, times(1)).getSupportedMimeTypes();
+ verifyNoMoreInteractions(mMockReceiver);
+ assertThat(editorInfo.contentMimeTypes).isEqualTo(receiverMimeTypes.toArray(new String[0]));
+ }
+
+ @UiThreadTest
+ @Test
+ public void testTextView_getAutofillType_defaultReceiver() throws Exception {
+ initTextViewForEditing("", 0);
+ assertThat(mTextView.getAutofillType()).isEqualTo(View.AUTOFILL_TYPE_TEXT);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testTextView_getAutofillType_customReceiver() throws Exception {
+ initTextViewForEditing("", 0);
+
+ // Setup: Configure the receiver to a mock impl that supports text and images.
+ Set<String> receiverMimeTypes = Set.of("text/*", "image/*");
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(receiverMimeTypes);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Assert that the autofill type returned is "rich content".
+ assertThat(mTextView.getAutofillType()).isEqualTo(View.AUTOFILL_TYPE_RICH_CONTENT);
+ verify(mMockReceiver, times(1)).getSupportedMimeTypes();
+ verifyNoMoreInteractions(mMockReceiver);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testTextView_getAutofillType_oldTargetSdk() throws Exception {
+ configureAppTargetSdkToR();
+ initTextViewForEditing("", 0);
+
+ // Setup: Configure the receiver to a mock impl that supports text and images.
+ Set<String> receiverMimeTypes = Set.of("text/*", "image/*");
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(receiverMimeTypes);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Assert that the autofill type returned is "text".
+ assertThat(mTextView.getAutofillType()).isEqualTo(View.AUTOFILL_TYPE_TEXT);
+ verifyNoMoreInteractions(mMockReceiver);
+ }
+
+ // ============================================================================================
+ // Tests to verify the behavior of TextView.DEFAULT_RICH_CONTENT_RECEIVER.
+ // ============================================================================================
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_getSupportedMimeTypes() throws Exception {
+ assertThat(mDefaultReceiver.getSupportedMimeTypes()).isEqualTo(singleton("text/*"));
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_text() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ ClipData clip = ClipData.newPlainText("test", "y");
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD, 0);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xyz", 2);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_styledText() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ UnderlineSpan underlineSpan = new UnderlineSpan();
+ SpannableStringBuilder ssb = new SpannableStringBuilder("hi world");
+ ssb.setSpan(underlineSpan, 3, 7, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ ClipData clip = ClipData.newPlainText("test", ssb);
+
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD, 0);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xhi worldz", 9);
+ int spanStart = mTextView.getEditableText().getSpanStart(underlineSpan);
+ assertThat(spanStart).isEqualTo(4);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_text_convertToPlainText() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ ClipData clip = ClipData.newPlainText("test", "y");
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD,
+ FLAG_CONVERT_TO_PLAIN_TEXT);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xyz", 2);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_styledText_convertToPlainText() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ UnderlineSpan underlineSpan = new UnderlineSpan();
+ SpannableStringBuilder ssb = new SpannableStringBuilder("hi world");
+ ssb.setSpan(underlineSpan, 3, 7, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ ClipData clip = ClipData.newPlainText("test", ssb);
+
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD,
+ FLAG_CONVERT_TO_PLAIN_TEXT);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xhi worldz", 9);
+ int spanStart = mTextView.getEditableText().getSpanStart(underlineSpan);
+ assertThat(spanStart).isEqualTo(-1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_html() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ ClipData clip = ClipData.newHtmlText("test", "*y*", "<b>y</b>");
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD, 0);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xyz", 2);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_html_convertToPlainText() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ ClipData clip = ClipData.newHtmlText("test", "*y*", "<b>y</b>");
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD,
+ FLAG_CONVERT_TO_PLAIN_TEXT);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("x*y*z", 4);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_unsupportedMimeType() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ ClipData clip = new ClipData("test", new String[]{"video/mp4"},
+ new ClipData.Item("text", "html", null, Uri.parse("content://com.example/path")));
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD, 0);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xhtmlz", 5);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_unsupportedMimeType_convertToPlainText()
+ throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ ClipData clip = new ClipData("test", new String[]{"video/mp4"},
+ new ClipData.Item("text", "html", null, Uri.parse("content://com.example/path")));
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD,
+ FLAG_CONVERT_TO_PLAIN_TEXT);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xtextz", 5);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_multipleItemsInClipData() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ ClipData clip = ClipData.newPlainText("test", "ONE");
+ clip.addItem(new ClipData.Item("TWO"));
+ clip.addItem(new ClipData.Item("THREE"));
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD, 0);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xONE\nTWO\nTHREEz", 14);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_noSelectionPriorToPaste() throws Exception {
+ // Set the text and then clear the selection (ie, ensure that nothing is selected and
+ // that the cursor is not present).
+ initTextViewForEditing("xz", 0);
+ Selection.removeSelection(mTextView.getEditableText());
+ assertTextAndCursorPosition("xz", -1);
+
+ // Pasting should still work (should just insert the text at the beginning).
+ ClipData clip = ClipData.newPlainText("test", "y");
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD, 0);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("yxz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDefaultReceiver_onReceive_selectionStartAndEndSwapped() throws Exception {
+ initTextViewForEditing("", 0);
+
+ // Set the selection such that "end" is before "start".
+ mTextView.setText("hey", BufferType.EDITABLE);
+ Selection.setSelection(mTextView.getEditableText(), 3, 1);
+ assertTextAndSelection("hey", 3, 1);
+
+ // Pasting should still work (should still successfully overwrite the selection).
+ ClipData clip = ClipData.newPlainText("test", "i");
+ boolean result = onReceive(mDefaultReceiver, clip, SOURCE_CLIPBOARD, 0);
+
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("hi", 2);
+ }
+
+ // ============================================================================================
+ // Tests to verify that the RichContentReceiver callback is invoked for all the appropriate user
+ // interactions:
+ // * Paste from clipboard ("Paste" and "Paste as plain text" actions)
+ // * Content insertion from IME
+ // * Drag and drop
+ // * Autofill
+ // ============================================================================================
+
+ @UiThreadTest
+ @Test
+ public void testPaste_defaultReceiver() throws Exception {
+ // Setup: Populate the text field.
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Copy text to the clipboard.
+ ClipData clip = ClipData.newPlainText("test", "y");
+ copyToClipboard(clip);
+
+ // Trigger the "Paste" action. This should execute the default receiver.
+ boolean result = triggerContextMenuAction(android.R.id.paste);
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("xyz", 2);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testPaste_customReceiver() throws Exception {
+ // Setup: Populate the text field.
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Copy text to the clipboard.
+ ClipData clip = ClipData.newPlainText("test", "y");
+ copyToClipboard(clip);
+
+ // Setup: Configure the receiver to a mock impl.
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger the "Paste" action and assert that the custom receiver was executed.
+ triggerContextMenuAction(android.R.id.paste);
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class), eq(SOURCE_CLIPBOARD), eq(0));
+ verifyNoMoreInteractions(mMockReceiver);
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testPaste_customReceiver_unsupportedMimeType() throws Exception {
+ // Setup: Populate the text field.
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Copy a URI to the clipboard with a MIME type that's not supported by the receiver.
+ ClipData clip = new ClipData("test", new String[]{"video/mp4"},
+ new ClipData.Item("text", null, Uri.parse("content://com.example/path")));
+ copyToClipboard(clip);
+
+ // Setup: Configure the receiver to a mock impl.
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger the "Paste" action and assert that the custom receiver was executed. This
+ // confirms that the receiver is invoked (ie, given a chance to handle the content) even if
+ // the MIME type of the content is not one of the receiver's supported MIME types.
+ triggerContextMenuAction(android.R.id.paste);
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class), eq(SOURCE_CLIPBOARD), eq(0));
+ verifyNoMoreInteractions(mMockReceiver);
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testPasteAsPlainText_defaultReceiver() throws Exception {
+ // Setup: Populate the text field.
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Copy HTML to the clipboard.
+ ClipData clip = ClipData.newHtmlText("test", "*y*", "<b>y</b>");
+ copyToClipboard(clip);
+
+ // Trigger the "Paste as plain text" action. This should execute the platform paste
+ // handling, so the content should be inserted according to whatever behavior is implemented
+ // in the OS version that's running.
+ boolean result = triggerContextMenuAction(android.R.id.pasteAsPlainText);
+ assertThat(result).isTrue();
+ assertTextAndCursorPosition("x*y*z", 4);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testPasteAsPlainText_customReceiver() throws Exception {
+ // Setup: Populate the text field.
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Copy text to the clipboard.
+ ClipData clip = ClipData.newPlainText("test", "y");
+ copyToClipboard(clip);
+
+ // Setup: Configure the receiver to a mock impl.
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger the "Paste as plain text" action and assert that the custom receiver was
+ // executed.
+ triggerContextMenuAction(android.R.id.pasteAsPlainText);
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class),
+ eq(SOURCE_CLIPBOARD), eq(FLAG_CONVERT_TO_PLAIN_TEXT));
+ verifyNoMoreInteractions(mMockReceiver);
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testImeCommitContent_defaultReceiver() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ // Trigger the IME's commitContent() call and assert its outcome.
+ boolean result = triggerImeCommitContent("image/png");
+ assertThat(result).isFalse();
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testImeCommitContent_customReceiver() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Configure the receiver to a mock impl.
+ Set<String> receiverMimeTypes = Set.of("text/*", "image/*");
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(receiverMimeTypes);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger the IME's commitContent() call and assert that the custom receiver was executed.
+ triggerImeCommitContent("image/png");
+ verify(mMockReceiver, times(1)).getSupportedMimeTypes();
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class), eq(SOURCE_INPUT_METHOD), eq(0));
+ verifyNoMoreInteractions(mMockReceiver);
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testImeCommitContent_customReceiver_unsupportedMimeType() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Configure the receiver to a mock impl.
+ Set<String> receiverMimeTypes = Set.of("text/*", "image/*");
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(receiverMimeTypes);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger the IME's commitContent() call and assert that the custom receiver was executed.
+ // This confirms that the receiver is invoked (ie, given a chance to handle the content)
+ // even if the MIME type of the content is not one of the receiver's supported MIME types.
+ triggerImeCommitContent("video/mp4");
+ verify(mMockReceiver, times(1)).getSupportedMimeTypes();
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class), eq(SOURCE_INPUT_METHOD), eq(0));
+ verifyNoMoreInteractions(mMockReceiver);
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testImeCommitContent_oldTargetSdk() throws Exception {
+ configureAppTargetSdkToR();
+ initTextViewForEditing("xz", 1);
+
+ // Setup: Configure the receiver to a mock impl.
+ Set<String> receiverMimeTypes = Set.of("text/*", "image/*");
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(receiverMimeTypes);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger the IME's commitContent() call and assert that the custom receiver was executed.
+ triggerImeCommitContent("image/png");
+ verifyNoMoreInteractions(mMockReceiver);
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDragAndDrop_defaultReceiver() throws Exception {
+ initTextViewForEditing("xz", 2);
+
+ // Trigger drop event. This should execute the default receiver.
+ ClipData clip = ClipData.newPlainText("test", "y");
+ triggerDropEvent(clip);
+ assertTextAndCursorPosition("yxz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDragAndDrop_customReceiver() throws Exception {
+ initTextViewForEditing("xz", 2);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger drop event. This should execute the default receiver.
+ ClipData clip = ClipData.newPlainText("test", "y");
+ triggerDropEvent(clip);
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class), eq(SOURCE_DRAG_AND_DROP), eq(0));
+ verifyNoMoreInteractions(mMockReceiver);
+ // Note: The cursor is moved to the location of the drop before calling the receiver.
+ assertTextAndCursorPosition("xz", 0);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testDragAndDrop_customReceiver_unsupportedMimeType() throws Exception {
+ initTextViewForEditing("xz", 2);
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(singleton("text/*"));
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger drop event and assert that the custom receiver was executed. This confirms that
+ // the receiver is invoked (ie, is given a chance to handle the content) even if the MIME
+ // type of the content is not one of the receiver's supported MIME types.
+ ClipData clip = new ClipData("test", new String[]{"video/mp4"},
+ new ClipData.Item("text", null, Uri.parse("content://com.example/path")));
+ triggerDropEvent(clip);
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class), eq(SOURCE_DRAG_AND_DROP), eq(0));
+ verifyNoMoreInteractions(mMockReceiver);
+ // Note: The cursor is moved to the location of the drop before calling the receiver.
+ assertTextAndCursorPosition("xz", 0);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testAutofill_defaultReceiver() throws Exception {
+ initTextViewForEditing("xz", 1);
+
+ // Trigger autofill. This should execute the default receiver.
+ ClipData clip = ClipData.newPlainText("test", "y");
+ triggerAutofill(clip);
+ assertTextAndCursorPosition("y", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testAutofill_customReceiver() throws Exception {
+ initTextViewForEditing("xz", 1);
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger autofill and assert that the custom receiver was executed.
+ ClipData clip = ClipData.newPlainText("test", "y");
+ triggerAutofill(clip);
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class), eq(SOURCE_AUTOFILL), eq(0));
+ verifyNoMoreInteractions(mMockReceiver);
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testAutofill_customReceiver_unsupportedMimeType() throws Exception {
+ initTextViewForEditing("xz", 1);
+ when(mMockReceiver.getSupportedMimeTypes()).thenReturn(singleton("text/*"));
+ mTextView.setRichContentReceiver(mMockReceiverWrapper);
+
+ // Trigger autofill and assert that the custom receiver was executed. This confirms that the
+ // receiver is invoked (ie, is given a chance to handle the content) even if the MIME type
+ // of the content is not one of the receiver's supported MIME types.
+ ClipData clip = new ClipData("test", new String[]{"video/mp4"},
+ new ClipData.Item("text", null, Uri.parse("content://com.example/path")));
+ triggerAutofill(clip);
+ verify(mMockReceiver, times(1)).onReceive(
+ eq(mTextView), any(ClipData.class), eq(SOURCE_AUTOFILL), eq(0));
+ verifyNoMoreInteractions(mMockReceiver);
+ assertTextAndCursorPosition("xz", 1);
+ }
+
+ @UiThreadTest
+ @Test
+ public void testAutofill_oldTargetSdk() throws Exception {
+ configureAppTargetSdkToR();
+ initTextViewForEditing("xz", 1);
+
+ // Try autofill with text. This should fill the field.
+ CharSequence text = "abc";
+ triggerAutofill(text);
+ assertTextAndCursorPosition("abc", 3);
+
+ // Try autofill with a ClipData. This should fill the field.
+ ClipData clip = ClipData.newPlainText("test", "xyz");
+ triggerAutofill(clip);
+ assertTextAndCursorPosition("xyz", 3);
+ }
+
+ private void initTextViewForEditing(final String text, final int cursorPosition) {
+ mTextView.setKeyListener(QwertyKeyListener.getInstance(false, Capitalize.NONE));
+ mTextView.setTextIsSelectable(true);
+ mTextView.requestFocus();
+
+ SpannableStringBuilder ssb = new SpannableStringBuilder(text);
+ mTextView.setText(ssb, BufferType.EDITABLE);
+ mTextView.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+ Selection.setSelection(mTextView.getEditableText(), cursorPosition);
+
+ assertWithMessage("TextView should have focus").that(mTextView.hasFocus()).isTrue();
+ assertTextAndCursorPosition(text, cursorPosition);
+ }
+
+ private void assertTextAndCursorPosition(String expectedText, int cursorPosition) {
+ assertTextAndSelection(expectedText, cursorPosition, cursorPosition);
+ }
+
+ private void assertTextAndSelection(String expectedText, int start, int end) {
+ assertThat(mTextView.getText().toString()).isEqualTo(expectedText);
+ int[] expected = new int[]{start, end};
+ int[] actual = new int[]{mTextView.getSelectionStart(), mTextView.getSelectionEnd()};
+ assertWithMessage("Unexpected selection start/end indexes")
+ .that(actual).isEqualTo(expected);
+ }
+
+ private boolean onReceive(final RichContentReceiver<TextView> receiver, final ClipData clip,
+ final int source, final int flags) {
+ return receiver.onReceive(mTextView, clip, source, flags);
+ }
+
+ private void resetTargetSdk() {
+ mActivity.getApplicationInfo().targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT;
+ }
+
+ private void configureAppTargetSdkToR() {
+ mActivity.getApplicationInfo().targetSdkVersion = Build.VERSION_CODES.R;
+ }
+
+ // TODO(b/150719306): Currently Build.VERSION_CODES.R is still set to
+ // Build.VERSION_CODES.CUR_DEVELOPMENT so we need this workaround. Once the R version code is
+ // assigned, remove this method.
+ private void configureAppTargetSdkToS() {
+ mActivity.getApplicationInfo().targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT + 1;
+ }
+
+ // This wrapper is used so that we only mock and verify the public callback methods. In addition
+ // to the public methods, the RichContentReceiver interface has some hidden default methods;
+ // we don't want to mock or assert calls to these helper functions (they are an implementation
+ // detail).
+ private static class MockReceiverWrapper implements RichContentReceiver<TextView> {
+ private final RichContentReceiver<TextView> mMock;
+
+ @SuppressWarnings("unchecked")
+ MockReceiverWrapper() {
+ this.mMock = Mockito.mock(RichContentReceiver.class);
+ }
+
+ public RichContentReceiver<TextView> getMock() {
+ return mMock;
+ }
+
+ @Override
+ public boolean onReceive(TextView view, ClipData clip, int source, int flags) {
+ return mMock.onReceive(view, clip, source, flags);
+ }
+
+ @Override
+ public Set<String> getSupportedMimeTypes() {
+ return mMock.getSupportedMimeTypes();
+ }
+ }
+
+ private void copyToClipboard(ClipData clip) {
+ mClipboardManager.setPrimaryClip(clip);
+ }
+
+ private boolean triggerContextMenuAction(final int actionId) {
+ return mTextView.onTextContextMenuItem(actionId);
+ }
+
+ private boolean triggerImeCommitContent(String mimeType) {
+ final InputContentInfo contentInfo = new InputContentInfo(
+ Uri.parse("content://com.example/path"),
+ new ClipDescription("from test", new String[]{mimeType}),
+ Uri.parse("https://example.com"));
+ EditorInfo editorInfo = new EditorInfo();
+ InputConnection ic = mTextView.onCreateInputConnection(editorInfo);
+ return ic.commitContent(contentInfo, 0, null);
+ }
+
+ private void triggerAutofill(CharSequence text) {
+ mTextView.autofill(AutofillValue.forText(text));
+ }
+
+ private void triggerAutofill(ClipData clip) {
+ mTextView.autofill(AutofillValue.forRichContent(clip));
+ }
+
+ private boolean triggerDropEvent(ClipData clip) {
+ DragEvent dropEvent = createDragEvent(DragEvent.ACTION_DROP, mTextView.getX(),
+ mTextView.getY(), clip);
+ return mTextView.onDragEvent(dropEvent);
+ }
+
+ private static DragEvent createDragEvent(int action, float x, float y, ClipData clip) {
+ // DragEvent doesn't expose any API for instantiation, so we have to build it from a Parcel.
+ Parcel dest = Parcel.obtain();
+ dest.writeInt(action);
+ dest.writeFloat(x);
+ dest.writeFloat(y);
+ dest.writeInt(0); // Result
+ dest.writeInt(1); // ClipData
+ clip.writeToParcel(dest, 0);
+ dest.writeInt(1); // ClipDescription
+ clip.getDescription().writeToParcel(dest, 0);
+ dest.writeInt(0); // IDragAndDropPermissions
+ dest.setDataPosition(0);
+ return DragEvent.CREATOR.createFromParcel(dest);
+ }
+}
diff --git a/tests/tests/widget29/AndroidManifest.xml b/tests/tests/widget29/AndroidManifest.xml
index e8973fc..d338368 100644
--- a/tests/tests/widget29/AndroidManifest.xml
+++ b/tests/tests/widget29/AndroidManifest.xml
@@ -16,31 +16,31 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.widget.cts29">
+ package="android.widget.cts29">
<application android:label="Android TestCase 29"
- android:maxRecents="1"
- android:multiArch="true"
- android:supportsRtl="true"
- android:theme="@android:style/Theme.Material.Light.DarkActionBar">
+ android:maxRecents="1"
+ android:multiArch="true"
+ android:supportsRtl="true"
+ android:theme="@android:style/Theme.Material.Light.DarkActionBar">
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.widget.cts29.CtsActivity"
- android:label="CtsActivity">
+ android:label="CtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.widget.cts29"
- android:label="(SDK 29) CTS tests of android.widget">
+ android:targetPackage="android.widget.cts29"
+ android:label="(SDK 29) CTS tests of android.widget">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
</manifest>
-
diff --git a/tests/tests/wrap/nowrap/AndroidManifest.xml b/tests/tests/wrap/nowrap/AndroidManifest.xml
index 927f1ef..c42ec94 100644
--- a/tests/tests/wrap/nowrap/AndroidManifest.xml
+++ b/tests/tests/wrap/nowrap/AndroidManifest.xml
@@ -16,25 +16,26 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.wrap.nowrap.cts">
+ package="android.wrap.nowrap.cts">
<!-- Ensure that wrap.sh is extracted. -->
- <application android:debuggable="true" android:extractNativeLibs="true">
- <uses-library android:name="android.test.runner" />
- <meta-data android:name="android.wrap.cts.expext_env" android:value="false" />
- <activity android:name="android.wrap.WrapActivity" >
+ <application android:debuggable="true"
+ android:extractNativeLibs="true">
+ <uses-library android:name="android.test.runner"/>
+ <meta-data android:name="android.wrap.cts.expext_env"
+ android:value="false"/>
+ <activity android:name="android.wrap.WrapActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for wrap.sh"
- android:targetPackage="android.wrap.nowrap.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for wrap.sh"
+ android:targetPackage="android.wrap.nowrap.cts">
</instrumentation>
</manifest>
-
diff --git a/tests/tests/wrap/wrap_debug/AndroidManifest.xml b/tests/tests/wrap/wrap_debug/AndroidManifest.xml
index b68aefb..aed6388 100644
--- a/tests/tests/wrap/wrap_debug/AndroidManifest.xml
+++ b/tests/tests/wrap/wrap_debug/AndroidManifest.xml
@@ -16,25 +16,26 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.wrap.wrap_debug.cts">
+ package="android.wrap.wrap_debug.cts">
<!-- Ensure that wrap.sh is extracted. -->
- <application android:debuggable="true" android:extractNativeLibs="true">
- <uses-library android:name="android.test.runner" />
- <meta-data android:name="android.wrap.cts.expext_env" android:value="true" />
- <activity android:name="android.wrap.WrapActivity" >
+ <application android:debuggable="true"
+ android:extractNativeLibs="true">
+ <uses-library android:name="android.test.runner"/>
+ <meta-data android:name="android.wrap.cts.expext_env"
+ android:value="true"/>
+ <activity android:name="android.wrap.WrapActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for wrap.sh"
- android:targetPackage="android.wrap.wrap_debug.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for wrap.sh"
+ android:targetPackage="android.wrap.wrap_debug.cts">
</instrumentation>
</manifest>
-
diff --git a/tests/tests/wrap/wrap_debug_malloc_debug/AndroidManifest.xml b/tests/tests/wrap/wrap_debug_malloc_debug/AndroidManifest.xml
index d00194b..d52119a 100644
--- a/tests/tests/wrap/wrap_debug_malloc_debug/AndroidManifest.xml
+++ b/tests/tests/wrap/wrap_debug_malloc_debug/AndroidManifest.xml
@@ -16,25 +16,26 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.wrap.wrap_debug_malloc_debug.cts">
+ package="android.wrap.wrap_debug_malloc_debug.cts">
<!-- Ensure that wrap.sh is extracted. -->
- <application android:debuggable="true" android:extractNativeLibs="true">
- <uses-library android:name="android.test.runner" />
- <meta-data android:name="android.wrap.cts.expext_env" android:value="true" />
- <activity android:name="android.wrap.WrapActivity" >
+ <application android:debuggable="true"
+ android:extractNativeLibs="true">
+ <uses-library android:name="android.test.runner"/>
+ <meta-data android:name="android.wrap.cts.expext_env"
+ android:value="true"/>
+ <activity android:name="android.wrap.WrapActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for wrap.sh"
- android:targetPackage="android.wrap.wrap_debug_malloc_debug.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for wrap.sh"
+ android:targetPackage="android.wrap.wrap_debug_malloc_debug.cts">
</instrumentation>
</manifest>
-
diff --git a/tests/tests/wrap/wrap_nodebug/AndroidManifest.xml b/tests/tests/wrap/wrap_nodebug/AndroidManifest.xml
index 9504883..b638726 100644
--- a/tests/tests/wrap/wrap_nodebug/AndroidManifest.xml
+++ b/tests/tests/wrap/wrap_nodebug/AndroidManifest.xml
@@ -16,25 +16,25 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.wrap.wrap_nodebug.cts">
+ package="android.wrap.wrap_nodebug.cts">
<!-- Ensure that wrap.sh is extracted. -->
<application android:extractNativeLibs="true">
- <uses-library android:name="android.test.runner" />
- <meta-data android:name="android.wrap.cts.expext_env" android:value="false" />
- <activity android:name="android.wrap.WrapActivity" >
+ <uses-library android:name="android.test.runner"/>
+ <meta-data android:name="android.wrap.cts.expext_env"
+ android:value="false"/>
+ <activity android:name="android.wrap.WrapActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
<!-- self-instrumenting test package. -->
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:label="CTS tests for wrap.sh"
- android:targetPackage="android.wrap.wrap_nodebug.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:label="CTS tests for wrap.sh"
+ android:targetPackage="android.wrap.wrap_nodebug.cts">
</instrumentation>
</manifest>
-
diff --git a/tests/tvprovider/TEST_MAPPING b/tests/tvprovider/TEST_MAPPING
new file mode 100644
index 0000000..a0b06c4
--- /dev/null
+++ b/tests/tvprovider/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsTvProviderTestCases"
+ }
+ ]
+}
diff --git a/tests/vr/AndroidManifest.xml b/tests/vr/AndroidManifest.xml
index cc60bd2..0196566 100644
--- a/tests/vr/AndroidManifest.xml
+++ b/tests/vr/AndroidManifest.xml
@@ -13,49 +13,48 @@
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.vr.cts"
- android:versionCode="1"
- android:versionName="1.0" >
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
- <uses-sdk android:minSdkVersion="14" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.vr.cts"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <uses-sdk android:minSdkVersion="14"/>
<uses-feature android:glEsVersion="0x00020000"/>
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.vr.cts" >
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="android.vr.cts">
<meta-data android:name="listener"
- android:value="com.android.cts.runner.CtsTestRunListener" />
+ android:value="com.android.cts.runner.CtsTestRunListener"/>
</instrumentation>
- <application
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:hardwareAccelerated="false" >
+ <application android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:hardwareAccelerated="false">
<service android:name="com.android.cts.verifier.vr.MockVrListenerService"
- android:exported="true"
- android:enabled="true"
- android:label="@string/vr_service_name"
- android:permission="android.permission.BIND_VR_LISTENER_SERVICE">
+ android:exported="true"
+ android:enabled="true"
+ android:label="@string/vr_service_name"
+ android:permission="android.permission.BIND_VR_LISTENER_SERVICE">
<intent-filter>
- <action android:name="android.service.vr.VrListenerService" />
+ <action android:name="android.service.vr.VrListenerService"/>
</intent-filter>
</service>
- <activity
- android:label="@string/app_name"
- android:name="android.vr.cts.OpenGLESActivity">
+ <activity android:label="@string/app_name"
+ android:name="android.vr.cts.OpenGLESActivity">
</activity>
<activity android:name=".CtsActivity"
- android:label="CtsActivity">
+ android:label="CtsActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
</intent-filter>
</activity>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
</application>
</manifest>
diff --git a/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java b/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
index e0fcbb0..8716562 100644
--- a/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
+++ b/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
@@ -536,6 +536,7 @@
charsKeyNames.add(CameraCharacteristics.SCALER_CROPPING_TYPE.getName());
charsKeyNames.add(CameraCharacteristics.SCALER_MANDATORY_STREAM_COMBINATIONS.getName());
charsKeyNames.add(CameraCharacteristics.SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS.getName());
+ charsKeyNames.add(CameraCharacteristics.SCALER_AVAILABLE_ROTATE_AND_CROP_MODES.getName());
charsKeyNames.add(CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT1.getName());
charsKeyNames.add(CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT2.getName());
charsKeyNames.add(CameraCharacteristics.SENSOR_CALIBRATION_TRANSFORM1.getName());
diff --git a/tools/cts-holo-generation/AndroidManifest.xml b/tools/cts-holo-generation/AndroidManifest.xml
index 41fab00..85332bb 100644
--- a/tools/cts-holo-generation/AndroidManifest.xml
+++ b/tools/cts-holo-generation/AndroidManifest.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.holo_capture"
- android:versionCode="1"
- android:versionName="1.0">
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <instrumentation
- android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.holo_capture" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.cts.holo_capture"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.holo_capture"/>
<application>
- <uses-library android:name="android.test.runner" />
- <activity android:name=".CaptureActivity">
+ <uses-library android:name="android.test.runner"/>
+ <activity android:name=".CaptureActivity"
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
diff --git a/tools/device-setup/TestDeviceSetup/AndroidManifest.xml b/tools/device-setup/TestDeviceSetup/AndroidManifest.xml
index 0a20e1c..5771fa2 100644
--- a/tools/device-setup/TestDeviceSetup/AndroidManifest.xml
+++ b/tools/device-setup/TestDeviceSetup/AndroidManifest.xml
@@ -16,15 +16,16 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.tests.devicesetup">
+ package="android.tests.devicesetup">
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<application>
- <uses-library android:name="android.test.runner" />
+ <uses-library android:name="android.test.runner"/>
<activity android:name="android.tests.getinfo.DeviceInfoActivity"
- android:label="DeviceInfoActivity">
+ android:label="DeviceInfoActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@@ -33,7 +34,7 @@
</application>
<instrumentation android:name="android.tests.getinfo.DeviceInfoInstrument"
- android:targetPackage="android.tests.devicesetup"
- android:label="app to get info from device"/>
+ android:targetPackage="android.tests.devicesetup"
+ android:label="app to get info from device"/>
</manifest>