[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I74316633648d6a5002433440358b9a0a443b3cf8
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index a212190..7782786 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -16,13 +16,9 @@
package com.android.settings.wifi;
-import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
-import static android.Manifest.permission.ACCESS_FINE_LOCATION;
-
import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.net.NetworkInfo;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
@@ -57,12 +53,10 @@
public static final String KEY_WIFI_CONFIGURATION = "wifi_configuration";
- @VisibleForTesting
- static final int RESULT_CONNECTED = RESULT_FIRST_USER;
+ private static final int RESULT_CONNECTED = RESULT_FIRST_USER;
private static final int RESULT_FORGET = RESULT_FIRST_USER + 1;
- @VisibleForTesting
- static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
+ private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
private WifiDialog mDialog;
@@ -162,22 +156,17 @@
}
}
- Intent resultData = hasPermissionForResult() ? createResultData(config, accessPoint) : null;
- setResult(RESULT_CONNECTED, resultData);
- finish();
- }
-
- protected Intent createResultData(WifiConfiguration config, AccessPoint accessPoint) {
- Intent result = new Intent();
+ Intent resultData = new Intent();
if (accessPoint != null) {
Bundle accessPointState = new Bundle();
accessPoint.saveWifiState(accessPointState);
- result.putExtra(KEY_ACCESS_POINT_STATE, accessPointState);
+ resultData.putExtra(KEY_ACCESS_POINT_STATE, accessPointState);
}
if (config != null) {
- result.putExtra(KEY_WIFI_CONFIGURATION, config);
+ resultData.putExtra(KEY_WIFI_CONFIGURATION, config);
}
- return result;
+ setResult(RESULT_CONNECTED, resultData);
+ finish();
}
@Override
@@ -203,35 +192,9 @@
if (resultCode != RESULT_OK) {
return;
}
- if (hasPermissionForResult()) {
- setResult(RESULT_CONNECTED, data);
- } else {
- setResult(RESULT_CONNECTED);
- }
+
+ setResult(RESULT_CONNECTED, data);
finish();
}
}
-
- protected boolean hasPermissionForResult() {
- final String callingPackage = getCallingPackage();
- if (callingPackage == null) {
- Log.d(TAG, "Failed to get the calling package, don't return the result.");
- 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.");
- return true;
- }
-
- Log.d(TAG, "The calling package does not have the necessary permissions for result.");
- return false;
- }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
index f86f6e7..15a0780 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
@@ -16,32 +16,18 @@
package com.android.settings.wifi;
-import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
-import static android.Manifest.permission.ACCESS_FINE_LOCATION;
-
-import static com.android.settings.wifi.WifiDialogActivity.REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER;
-import static com.android.settings.wifi.WifiDialogActivity.RESULT_CONNECTED;
-import static com.android.settings.wifi.WifiDialogActivity.RESULT_OK;
-
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowWifiManager;
import com.android.settings.wifi.dpp.WifiDppEnrolleeActivity;
-import com.android.settingslib.wifi.AccessPoint;
import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -64,30 +50,13 @@
})
public class WifiDialogActivityTest {
- private static final String CALLING_PACKAGE = "calling_package";
private static final String AP1_SSID = "\"ap1\"";
-
- @Mock
- PackageManager mPackageManager;
- @Mock
- WifiManager mWifiManager;
- @Mock
- WifiDialog mWifiDialog;
- @Mock
- WifiConfiguration mWifiConfiguration;
- @Mock
- AccessPoint mAccessPoint;
- @Mock
- Intent mResultData;
@Mock
private WifiConfigController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- when(mWifiDialog.getController()).thenReturn(mController);
- when(mController.getConfig()).thenReturn(mWifiConfiguration);
- when(mController.getAccessPoint()).thenReturn(mAccessPoint);
WifiConfiguration wifiConfig = new WifiConfiguration();
wifiConfig.SSID = AP1_SSID;
@@ -108,29 +77,6 @@
}
@Test
- public void onSubmit_noPermissionForResult_setResultWithoutData() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.hasPermissionForResult()).thenReturn(false);
- when(activity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
-
- activity.onSubmit(mWifiDialog);
-
- verify(activity).setResult(RESULT_CONNECTED, null);
- }
-
- @Test
- public void onSubmit_hasPermissionForResult_setResultWithData() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.hasPermissionForResult()).thenReturn(true);
- when(activity.createResultData(any(), any())).thenReturn(mResultData);
- when(activity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
-
- activity.onSubmit(mWifiDialog);
-
- verify(activity).setResult(RESULT_CONNECTED, mResultData);
- }
-
- @Test
public void onSubmit_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
WifiDialogActivity activity =
Robolectric.buildActivity(
@@ -186,97 +132,4 @@
assertThat(controller.get().getThemeResId()).
isEqualTo(R.style.LightTheme_SettingsBase_SetupWizard);
}
-
- @Test
- public void onActivityResult_noPermissionForResult_setResultWithoutData() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.hasPermissionForResult()).thenReturn(false);
- final Intent data = new Intent();
-
- activity.onActivityResult(REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER, RESULT_OK,
- data);
-
- verify(activity).setResult(RESULT_CONNECTED);
- }
-
- @Test
- public void onActivityResult_hasPermissionForResult_setResultWithData() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.hasPermissionForResult()).thenReturn(true);
- final Intent data = new Intent();
-
- activity.onActivityResult(REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER, RESULT_OK,
- data);
-
- verify(activity).setResult(RESULT_CONNECTED, data);
- }
-
- @Test
- public void hasPermissionForResult_noCallingPackage_returnFalse() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.getCallingPackage()).thenReturn(null);
-
- final boolean result = activity.hasPermissionForResult();
-
- assertThat(result).isFalse();
- }
-
- @Test
- public void hasPermissionForResult_noPermission_returnFalse() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.getCallingPackage()).thenReturn(null);
- when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
- .thenReturn(PackageManager.PERMISSION_DENIED);
- when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
- .thenReturn(PackageManager.PERMISSION_DENIED);
-
- final boolean result = activity.hasPermissionForResult();
-
- assertThat(result).isFalse();
- }
-
- @Test
- public void hasPermissionForResult_hasCoarseLocationPermission_returnTrue() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
- when(activity.getPackageManager()).thenReturn(mPackageManager);
- when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
- .thenReturn(PackageManager.PERMISSION_GRANTED);
- when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
- .thenReturn(PackageManager.PERMISSION_DENIED);
-
- final boolean result = activity.hasPermissionForResult();
-
- assertThat(result).isTrue();
- }
-
- @Test
- public void hasPermissionForResult_hasFineLocationPermission_returnTrue() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
- when(activity.getPackageManager()).thenReturn(mPackageManager);
- when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
- .thenReturn(PackageManager.PERMISSION_DENIED);
- when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
- .thenReturn(PackageManager.PERMISSION_GRANTED);
-
- final boolean result = activity.hasPermissionForResult();
-
- assertThat(result).isTrue();
- }
-
- @Test
- public void hasPermissionForResult_haveBothLocationPermissions_returnTrue() {
- WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
- when(activity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
- when(activity.getPackageManager()).thenReturn(mPackageManager);
- when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
- .thenReturn(PackageManager.PERMISSION_GRANTED);
- when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
- .thenReturn(PackageManager.PERMISSION_GRANTED);
-
- final boolean result = activity.hasPermissionForResult();
-
- assertThat(result).isTrue();
- }
}