commit c035ecdf1eac22d7721b0136b032e17a13298488
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 12 01:04:07 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 12 01:04:07 2019 +0000
tree 8f75e35ac08501ed19d2b9fc2f7d2949e826d2ce
parent 4f962066344deb5b630aa38faf531ae8b960e1f6
parent 7552e7e72911dc327a1fa123c6545ce472dbc1c7

Merge "Update cellular check for cts tests" into pie-cts-dev

tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java

diff --git a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
index ee35eed..0a198f2 100644
--- a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
+++ b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
@@ -108,10 +108,8 @@
      * Checks whether the cellular stack should be running on this device.
      */
     private boolean hasCellular() {
-        ConnectivityManager mgr =
-                (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-        return mgr.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) &&
-               mTelephonyManager.isVoiceCapable();
+        return mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) &&
+                mTelephonyManager.getPhoneCount() > 0;
     }
 
     private boolean isSimCardPresent() {