tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "remove-ic-vsr-test" am: a0bb39cd9d am: 03de9e5d1b am: eccba5a001

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2513475

Change-Id: I6bc7dec3752d1973d04d8e39c1e8cd9a98ee046f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-03-29 15:42:03 +00:00 committed by Automerger Merge Worker
commit 2843cae121
4 changed files with 2 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
identity/OWNERS
View file

@ -1,2 +1,4 @@
# Bug component: 1084909
swillden@google.com swillden@google.com
zeuthen@google.com zeuthen@google.com

12
identity/aidl/vts/Android.bp
View file

@ -61,15 +61,3 @@ cc_test {
], ],
require_root: true, require_root: true,
} }
java_test_host {
name: "IdentityCredentialImplementedTest",
libs: [
"tradefed",
],
srcs: ["src/**/*.java"],
test_suites: [
"vts",
],
test_config: "IdentityCredentialImplementedTest.xml",
}

22
identity/aidl/vts/IdentityCredentialImplementedTest.xml
View file

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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 IdentityCredentialImplementedTest">
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
<test class="com.android.tradefed.testtype.HostTest" >
<option name="jar" value="IdentityCredentialImplementedTest.jar" />
</test>
</configuration>

68
identity/aidl/vts/src/com/android/tests/security/identity/IdentityCredentialImplementedTest.java
View file

@ -1,68 +0,0 @@
/*
* Copyright (C) 2022 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.security.identity;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import android.platform.test.annotations.RequiresDevice;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import org.junit.Test;
import org.junit.runner.RunWith;
// This is a host-test which executes shell commands on the device. It would be
// nicer to have this be a Device test (like CTS) but this is currently not
// possible, see https://source.android.com/docs/core/tests/vts
@RunWith(DeviceJUnit4ClassRunner.class)
public class IdentityCredentialImplementedTest extends BaseHostJUnit4Test {
// Returns the ro.vendor.api_level or 0 if not set.
//
// Throws NumberFormatException if ill-formatted.
//
// Throws DeviceNotAvailableException if device is not available.
//
private int getVendorApiLevel() throws NumberFormatException, DeviceNotAvailableException {
String vendorApiLevelString =
getDevice().executeShellCommand("getprop ro.vendor.api_level").trim();
if (vendorApiLevelString.isEmpty()) {
return 0;
}
return Integer.parseInt(vendorApiLevelString);
}
// As of Android 14 VSR (vendor API level 34), Identity Credential is required at feature
// version 202301 or later.
@RequiresDevice
@Test
public void testIdentityCredentialIsImplemented() throws Exception {
int vendorApiLevel = getVendorApiLevel();
assumeTrue(vendorApiLevel >= 34);
final String minimumFeatureVersionNeeded = "202301";
String result = getDevice().executeShellCommand(
"pm has-feature android.hardware.identity_credential "
+ minimumFeatureVersionNeeded);
if (!result.trim().equals("true")) {
fail("Identity Credential feature version " + minimumFeatureVersionNeeded
+ " required but not found");
}
}
}