From a27167dbd811cea1efcc298bf5e16c074c4e7a15 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Fri, 5 Nov 2021 01:36:13 +0800 Subject: [PATCH] Remove ACCESS_COARSE_LOCATION permission checking - The calling package needs ACCESS_FINE_LOCATION permission to get WiFi result data. - The ACCESS_COARSE_LOCATION permission is not allowed. Bug: 185126813 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest Change-Id: I2c9013a74d173066270b422ae2179b0d1018f2d7 --- src/com/android/settings/wifi/WifiDialogActivity.java | 7 ------- .../com/android/settings/wifi/WifiDialogActivityTest.java | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index f76ad673ed1..a423bd8aa89 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -16,7 +16,6 @@ package com.android.settings.wifi; -import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import android.content.DialogInterface; @@ -359,12 +358,6 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog return false; } - if (getPackageManager().checkPermission(ACCESS_COARSE_LOCATION, callingPackage) - == PackageManager.PERMISSION_GRANTED) { - Log.d(TAG, "The calling package has ACCESS_COARSE_LOCATION permission for result."); - return true; - } - if (getPackageManager().checkPermission(ACCESS_FINE_LOCATION, callingPackage) == PackageManager.PERMISSION_GRANTED) { Log.d(TAG, "The calling package has ACCESS_FINE_LOCATION permission for result."); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index 685819e7839..9a61b6b2d39 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -310,7 +310,7 @@ public class WifiDialogActivityTest { } @Test - public void hasPermissionForResult_hasCoarseLocationPermission_returnTrue() { + public void hasPermissionForResult_hasCoarseLocationPermission_returnFalse() { WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class)); when(activity.getCallingPackage()).thenReturn(CALLING_PACKAGE); when(activity.getPackageManager()).thenReturn(mPackageManager); @@ -321,7 +321,7 @@ public class WifiDialogActivityTest { final boolean result = activity.hasPermissionForResult(); - assertThat(result).isTrue(); + assertThat(result).isFalse(); } @Test