[Settings] User restriction should be applied
Simply verify isAdminUser() could be insufficient, since there're some
other use cases (such as managed device).
Bug: 228079419
Test: local
Change-Id: Ic9f27deafada31dacef03e27bf02ecbc9a8b3231
diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java
index c1df705..48b5be3 100644
--- a/src/com/android/settings/TestingSettings.java
+++ b/src/com/android/settings/TestingSettings.java
@@ -17,27 +17,41 @@
package com.android.settings;
import android.app.settings.SettingsEnums;
+import android.content.Context;
import android.os.Bundle;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
+import com.android.settings.network.telephony.MobileNetworkUtils;
+
public class TestingSettings extends SettingsPreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+
addPreferencesFromResource(R.xml.testing_settings);
- final UserManager um = UserManager.get(getContext());
- if (!um.isAdminUser()) {
+ if (!isRadioInfoVisible(getContext())) {
PreferenceScreen preferenceScreen = (PreferenceScreen)
findPreference("radio_info_settings");
getPreferenceScreen().removePreference(preferenceScreen);
}
}
+ @VisibleForTesting
+ protected boolean isRadioInfoVisible(Context context) {
+ UserManager um = context.getSystemService(UserManager.class);
+ if (um != null) {
+ if (!um.isAdminUser()) {
+ return false;
+ }
+ }
+ return !MobileNetworkUtils.isMobileNetworkUserRestricted(context);
+ }
+
@Override
public int getMetricsCategory() {
return SettingsEnums.TESTING;
diff --git a/tests/unit/src/com/android/settings/TestingSettingsTest.java b/tests/unit/src/com/android/settings/TestingSettingsTest.java
new file mode 100644
index 0000000..1f4e385
--- /dev/null
+++ b/tests/unit/src/com/android/settings/TestingSettingsTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2023 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;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.UserManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class TestingSettingsTest {
+
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private TestingSettings mTestingSettings;
+
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ }
+
+ @Test
+ public void isRadioInfoVisible_returnFalse_whenUserRestricted() {
+ mockService(mContext, Context.USER_SERVICE, UserManager.class, mUserManager);
+
+ doReturn(true).when(mUserManager).isAdminUser();
+ doReturn(false).when(mUserManager).isGuestUser();
+ doReturn(true).when(mUserManager)
+ .hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
+
+ assertThat(mTestingSettings.isRadioInfoVisible(mContext)).isFalse();
+ }
+
+ private <T> void mockService(Context context, String serviceName,
+ Class<T> serviceClass, T service) {
+ when(context.getSystemServiceName(serviceClass)).thenReturn(serviceName);
+ when(context.getSystemService(serviceName)).thenReturn(service);
+ }
+}