commit 5d8e6659728824aeb61316b7504279d55c409c57
author Robin Lee <rgl@google.com> Sat Jul 18 00:42:20 2020 +0200
committer Robin Lee <rgl@google.com> Mon Jul 20 15:01:28 2020 +0000
tree ff87f6690ddced6269ab334050a09217b017c312
parent 19b10eac87ecfb804992e7187649010122fc27bf

Skip getCellLocation if we don't have telephony

Test: atest LocationPolicyTest
Fix: 160264045
Change-Id: I4f2be57405f8b5ea1a988f9c32731625708d484e

hostsidetests/appsecurity/test-apps/LocationPolicyApp/src/android/appsecurity/cts/locationpolicy/LocationPolicyTest.java

diff --git a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/src/android/appsecurity/cts/locationpolicy/LocationPolicyTest.java b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/src/android/appsecurity/cts/locationpolicy/LocationPolicyTest.java
index 74ce0c5..a91948b 100644
--- a/hostsidetests/appsecurity/test-apps/LocationPolicyApp/src/android/appsecurity/cts/locationpolicy/LocationPolicyTest.java
+++ b/hostsidetests/appsecurity/test-apps/LocationPolicyApp/src/android/appsecurity/cts/locationpolicy/LocationPolicyTest.java
@@ -49,14 +49,16 @@
             PackageManager.PERMISSION_GRANTED,
             pm.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION,
             mContext.getPackageName()));
-        TelephonyManager tele = mContext.getSystemService(TelephonyManager.class);
-        try {
-            tele.getCellLocation();
-        fail(
-            "ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION Permissions not granted. Should have"
-              + " received a security exception when invoking getCellLocation().");
-        } catch (SecurityException ignore) {
-          // That's what we want!
+        if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            TelephonyManager tele = mContext.getSystemService(TelephonyManager.class);
+            try {
+                tele.getCellLocation();
+            fail(
+                "ACCESS_FINE_LOCATION and ACCESS_COARSE_LOCATION Permissions not granted. Should"
+                  + " have received a security exception when invoking getCellLocation().");
+            } catch (SecurityException ignore) {
+              // That's what we want!
+            }
         }
     }
 }