commit 505f30c572271abfb4347b2ac8f00f0469b07f29
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 02 04:41:18 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 02 04:41:18 2021 +0000
tree a0dca2ee826b963b7df25253ecf874217126356d
parent 899b99040ce18ae6ca2e46c1c5900df8c108be5d
parent f780194b257239e1e3aa7d17eb4b6ddab8909364

Merge "Test Entitlement when telephony is present" am: 93773f0aa0 am: f780194b25

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735336

Change-Id: I0df5ed172ea00f2d2bf44e8f37c1b417fc9245b7

tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java

diff --git a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
index 0a5e506..bd1b74a 100644
--- a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
+++ b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
@@ -361,6 +361,7 @@
     @Test
     public void testRequestLatestEntitlementResult() throws Exception {
         assumeTrue(mTM.isTetheringSupported());
+        assumeTrue(mPm.hasSystemFeature(FEATURE_TELEPHONY));
         // Verify that requestLatestTetheringEntitlementResult() can get entitlement
         // result(TETHER_ERROR_ENTITLEMENT_UNKNOWN due to invalid downstream type) via listener.
         assertEntitlementResult(listener -> mTM.requestLatestTetheringEntitlementResult(