| commit | 28ac3cfb24e85e0a84a1f976be46d1d94cc42c6f | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue May 03 01:53:23 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 03 01:53:23 2016 +0000 |
| tree | 42b95ea9908926e8167b81c1752fbe6fc4db74cd | |
| parent | f5c92cbe0b9b37780c79e4464cdebd4718fc88ad [diff] | |
| parent | fc31ecb8eb7e746f5f2164bde9484bd2998284c4 [diff] |
Merge "Skip testDelegatedCertInstaller if feature is not available" into nyc-dev
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTestApi23.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTestApi23.java index d94748d..914fe19 100644 --- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTestApi23.java +++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTestApi23.java
@@ -51,6 +51,9 @@ } public void testDelegatedCertInstaller() throws Exception { + if (!mHasFeature) { + return; + } assertTrue("DelegatedCertInstaller failed", runDeviceTestsAsUser(DEVICE_ADMIN_PKG, ".DelegatedCertInstallerTest", "testSetNotExistCertInstallerPackage", mUserId)); }