mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-09-29 20:55:36 +00:00
292 lines
10 KiB
Diff
292 lines
10 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Weng Su <wengsu@google.com>
|
||
|
Date: Wed, 3 Apr 2024 10:45:43 +0800
|
||
|
Subject: [PATCH] Restrict WifiDppConfiguratorActivity
|
||
|
|
||
|
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG
|
||
|
|
||
|
- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG
|
||
|
|
||
|
Fix: 299931076
|
||
|
Flag: None
|
||
|
Test: manual test with TestDPC
|
||
|
atest -c SettingsUnitTests:AddNetworkFragmentTest \
|
||
|
SettingsUnitTests:WifiDppConfiguratorActivityTest
|
||
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:254ba087c29503e8bcf01cc10082c3f393e7701f)
|
||
|
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
|
||
|
Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
|
||
|
---
|
||
|
.../settings/wifi/AddNetworkFragment.java | 20 +++++
|
||
|
.../wifi/dpp/WifiDppConfiguratorActivity.java | 20 +++++
|
||
|
.../settings/wifi/AddNetworkFragmentTest.java | 74 +++++++++++++++++++
|
||
|
.../dpp/WifiDppConfiguratorActivityTest.java | 74 +++++++++++++++++++
|
||
|
4 files changed, 188 insertions(+)
|
||
|
create mode 100644 tests/unit/src/com/android/settings/wifi/AddNetworkFragmentTest.java
|
||
|
create mode 100644 tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
|
||
|
|
||
|
diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java
|
||
|
index 01d5ef1ca4..c50ab9ae24 100644
|
||
|
--- a/src/com/android/settings/wifi/AddNetworkFragment.java
|
||
|
+++ b/src/com/android/settings/wifi/AddNetworkFragment.java
|
||
|
@@ -16,11 +16,16 @@
|
||
|
|
||
|
package com.android.settings.wifi;
|
||
|
|
||
|
+import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
|
||
|
+
|
||
|
import android.app.Activity;
|
||
|
import android.app.settings.SettingsEnums;
|
||
|
+import android.content.Context;
|
||
|
import android.content.Intent;
|
||
|
import android.net.wifi.WifiConfiguration;
|
||
|
import android.os.Bundle;
|
||
|
+import android.os.UserManager;
|
||
|
+import android.util.Log;
|
||
|
import android.view.LayoutInflater;
|
||
|
import android.view.View;
|
||
|
import android.view.ViewGroup;
|
||
|
@@ -40,6 +45,7 @@ import com.android.settings.wifi.dpp.WifiDppUtils;
|
||
|
*/
|
||
|
public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase2,
|
||
|
View.OnClickListener {
|
||
|
+ private static final String TAG = "AddNetworkFragment";
|
||
|
|
||
|
public static final String WIFI_CONFIG_KEY = "wifi_config_key";
|
||
|
@VisibleForTesting
|
||
|
@@ -57,6 +63,10 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
|
||
|
@Override
|
||
|
public void onCreate(Bundle savedInstanceState) {
|
||
|
super.onCreate(savedInstanceState);
|
||
|
+ if (!isAddWifiConfigAllowed(getContext())) {
|
||
|
+ getActivity().finish();
|
||
|
+ return;
|
||
|
+ }
|
||
|
}
|
||
|
|
||
|
@Override
|
||
|
@@ -204,4 +214,14 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
|
||
|
activity.setResult(Activity.RESULT_CANCELED);
|
||
|
activity.finish();
|
||
|
}
|
||
|
+
|
||
|
+ @VisibleForTesting
|
||
|
+ static boolean isAddWifiConfigAllowed(Context context) {
|
||
|
+ UserManager userManager = context.getSystemService(UserManager.class);
|
||
|
+ if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) {
|
||
|
+ Log.e(TAG, "The user is not allowed to add Wi-Fi configuration.");
|
||
|
+ return false;
|
||
|
+ }
|
||
|
+ return true;
|
||
|
+ }
|
||
|
}
|
||
|
diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
|
||
|
index ecaf9ee8fc..a658c16a8c 100644
|
||
|
--- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
|
||
|
+++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
|
||
|
@@ -16,6 +16,8 @@
|
||
|
|
||
|
package com.android.settings.wifi.dpp;
|
||
|
|
||
|
+import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
|
||
|
+
|
||
|
import android.app.settings.SettingsEnums;
|
||
|
import android.content.Intent;
|
||
|
import android.net.Uri;
|
||
|
@@ -96,6 +98,10 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
|
||
|
@Override
|
||
|
protected void onCreate(Bundle savedInstanceState) {
|
||
|
super.onCreate(savedInstanceState);
|
||
|
+ if (!isAddWifiConfigAllowed(getApplicationContext())) {
|
||
|
+ finish();
|
||
|
+ return;
|
||
|
+ }
|
||
|
|
||
|
if (savedInstanceState != null) {
|
||
|
String qrCode = savedInstanceState.getString(KEY_QR_CODE);
|
||
|
@@ -116,6 +122,10 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
|
||
|
|
||
|
@Override
|
||
|
protected void handleIntent(Intent intent) {
|
||
|
+ if (!isAddWifiConfigAllowed(getApplicationContext())) {
|
||
|
+ finish();
|
||
|
+ return;
|
||
|
+ }
|
||
|
String action = intent != null ? intent.getAction() : null;
|
||
|
if (action == null) {
|
||
|
finish();
|
||
|
@@ -384,4 +394,14 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
|
||
|
|
||
|
return null;
|
||
|
}
|
||
|
+
|
||
|
+ @VisibleForTesting
|
||
|
+ static boolean isAddWifiConfigAllowed(Context context) {
|
||
|
+ UserManager userManager = context.getSystemService(UserManager.class);
|
||
|
+ if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) {
|
||
|
+ Log.e(TAG, "The user is not allowed to add Wi-Fi configuration.");
|
||
|
+ return false;
|
||
|
+ }
|
||
|
+ return true;
|
||
|
+ }
|
||
|
}
|
||
|
diff --git a/tests/unit/src/com/android/settings/wifi/AddNetworkFragmentTest.java b/tests/unit/src/com/android/settings/wifi/AddNetworkFragmentTest.java
|
||
|
new file mode 100644
|
||
|
index 0000000000..22d43c9bb4
|
||
|
--- /dev/null
|
||
|
+++ b/tests/unit/src/com/android/settings/wifi/AddNetworkFragmentTest.java
|
||
|
@@ -0,0 +1,74 @@
|
||
|
+/*
|
||
|
+ * Copyright (C) 2024 The Android Open Source Project
|
||
|
+ *
|
||
|
+ * Licensed under the Apache License, Version 2.0 (the "License");
|
||
|
+ * you may not use this file except in compliance with the License.
|
||
|
+ * You may obtain a copy of the License at
|
||
|
+ *
|
||
|
+ * http://www.apache.org/licenses/LICENSE-2.0
|
||
|
+ *
|
||
|
+ * Unless required by applicable law or agreed to in writing, software
|
||
|
+ * distributed under the License is distributed on an "AS IS" BASIS,
|
||
|
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||
|
+ * See the License for the specific language governing permissions and
|
||
|
+ * limitations under the License.
|
||
|
+ */
|
||
|
+
|
||
|
+package com.android.settings.wifi;
|
||
|
+
|
||
|
+import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
|
||
|
+
|
||
|
+import static com.google.common.truth.Truth.assertThat;
|
||
|
+
|
||
|
+import static org.mockito.Mockito.when;
|
||
|
+
|
||
|
+import android.content.Context;
|
||
|
+import android.os.UserManager;
|
||
|
+
|
||
|
+import androidx.test.annotation.UiThreadTest;
|
||
|
+import androidx.test.core.app.ApplicationProvider;
|
||
|
+import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||
|
+
|
||
|
+import org.junit.Before;
|
||
|
+import org.junit.Rule;
|
||
|
+import org.junit.Test;
|
||
|
+import org.junit.runner.RunWith;
|
||
|
+import org.mockito.Mock;
|
||
|
+import org.mockito.Spy;
|
||
|
+import org.mockito.junit.MockitoJUnit;
|
||
|
+import org.mockito.junit.MockitoRule;
|
||
|
+
|
||
|
+@RunWith(AndroidJUnit4.class)
|
||
|
+@UiThreadTest
|
||
|
+public class AddNetworkFragmentTest {
|
||
|
+
|
||
|
+ @Rule
|
||
|
+ public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||
|
+ @Spy
|
||
|
+ private final Context mContext = ApplicationProvider.getApplicationContext();
|
||
|
+ @Mock
|
||
|
+ private UserManager mUserManager;
|
||
|
+
|
||
|
+ private AddNetworkFragment mFragment;
|
||
|
+
|
||
|
+ @Before
|
||
|
+ public void setUp() {
|
||
|
+ when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
|
||
|
+
|
||
|
+ mFragment = new AddNetworkFragment();
|
||
|
+ }
|
||
|
+
|
||
|
+ @Test
|
||
|
+ public void isAddWifiConfigAllowed_hasNoUserRestriction_returnTrue() {
|
||
|
+ when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);
|
||
|
+
|
||
|
+ assertThat(mFragment.isAddWifiConfigAllowed(mContext)).isTrue();
|
||
|
+ }
|
||
|
+
|
||
|
+ @Test
|
||
|
+ public void isAddWifiConfigAllowed_hasUserRestriction_returnFalse() {
|
||
|
+ when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);
|
||
|
+
|
||
|
+ assertThat(mFragment.isAddWifiConfigAllowed(mContext)).isFalse();
|
||
|
+ }
|
||
|
+}
|
||
|
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
|
||
|
new file mode 100644
|
||
|
index 0000000000..4d723dc184
|
||
|
--- /dev/null
|
||
|
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
|
||
|
@@ -0,0 +1,74 @@
|
||
|
+/*
|
||
|
+ * Copyright (C) 2024 The Android Open Source Project
|
||
|
+ *
|
||
|
+ * Licensed under the Apache License, Version 2.0 (the "License");
|
||
|
+ * you may not use this file except in compliance with the License.
|
||
|
+ * You may obtain a copy of the License at
|
||
|
+ *
|
||
|
+ * http://www.apache.org/licenses/LICENSE-2.0
|
||
|
+ *
|
||
|
+ * Unless required by applicable law or agreed to in writing, software
|
||
|
+ * distributed under the License is distributed on an "AS IS" BASIS,
|
||
|
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||
|
+ * See the License for the specific language governing permissions and
|
||
|
+ * limitations under the License.
|
||
|
+ */
|
||
|
+
|
||
|
+package com.android.settings.wifi.dpp;
|
||
|
+
|
||
|
+import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
|
||
|
+
|
||
|
+import static com.google.common.truth.Truth.assertThat;
|
||
|
+
|
||
|
+import static org.mockito.Mockito.when;
|
||
|
+
|
||
|
+import android.content.Context;
|
||
|
+import android.os.UserManager;
|
||
|
+
|
||
|
+import androidx.test.annotation.UiThreadTest;
|
||
|
+import androidx.test.core.app.ApplicationProvider;
|
||
|
+import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||
|
+
|
||
|
+import org.junit.Before;
|
||
|
+import org.junit.Rule;
|
||
|
+import org.junit.Test;
|
||
|
+import org.junit.runner.RunWith;
|
||
|
+import org.mockito.Mock;
|
||
|
+import org.mockito.Spy;
|
||
|
+import org.mockito.junit.MockitoJUnit;
|
||
|
+import org.mockito.junit.MockitoRule;
|
||
|
+
|
||
|
+@RunWith(AndroidJUnit4.class)
|
||
|
+@UiThreadTest
|
||
|
+public class WifiDppConfiguratorActivityTest {
|
||
|
+
|
||
|
+ @Rule
|
||
|
+ public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||
|
+ @Spy
|
||
|
+ private final Context mContext = ApplicationProvider.getApplicationContext();
|
||
|
+ @Mock
|
||
|
+ private UserManager mUserManager;
|
||
|
+
|
||
|
+ private WifiDppConfiguratorActivity mActivity;
|
||
|
+
|
||
|
+ @Before
|
||
|
+ public void setUp() {
|
||
|
+ when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
|
||
|
+
|
||
|
+ mActivity = new WifiDppConfiguratorActivity();
|
||
|
+ }
|
||
|
+
|
||
|
+ @Test
|
||
|
+ public void isAddWifiConfigAllowed_hasNoUserRestriction_returnTrue() {
|
||
|
+ when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);
|
||
|
+
|
||
|
+ assertThat(mActivity.isAddWifiConfigAllowed(mContext)).isTrue();
|
||
|
+ }
|
||
|
+
|
||
|
+ @Test
|
||
|
+ public void isAddWifiConfigAllowed_hasUserRestriction_returnFalse() {
|
||
|
+ when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);
|
||
|
+
|
||
|
+ assertThat(mActivity.isAddWifiConfigAllowed(mContext)).isFalse();
|
||
|
+ }
|
||
|
+}
|