| commit | 4ead793229488123f7e80f5ea2a16ac05a307ea3 | [log] [tgz] |
|---|---|---|
| author | James Lin <jamescflin@google.com> | Tue Mar 23 19:24:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 23 19:24:21 2021 +0000 |
| tree | 39dc64619eff68097e5e0fed89d31ad65b4189e7 | |
| parent | 32900be9d647d8083891fd42ffa247dbabdcb26d [diff] | |
| parent | 833b4a1ed47e7e1d59db95c407bc59343d89b0ea [diff] |
Merge "Fix CTS failed when publish device capabilities." am: 833b4a1ed4 Original change: https://android-review.googlesource.com/c/platform/cts/+/1649976 Change-Id: I06b915121aba9316cbb0865280bcc256755df360
diff --git a/tests/tests/security/OWNERS b/tests/tests/security/OWNERS index 5c6bb98..5787345 100644 --- a/tests/tests/security/OWNERS +++ b/tests/tests/security/OWNERS
@@ -1,6 +1,7 @@ # Bug component: 36824 cbrubaker@google.com jeffv@google.com +nnk@google.com mspector@google.com manjaepark@google.com cdombroski@google.com
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 ac58f03..711bb7a 100644 --- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java +++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
@@ -465,7 +465,6 @@ } } - @Test public void testListen() throws Throwable { if (!InstrumentationRegistry.getContext().getPackageManager() .hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {