diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-16 01:03:52 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-16 01:03:52 +0000 |
commit | 5784e3dddc754b25bc359d7e643ee96cfa1cad6f (patch) | |
tree | f73bfe1f08a7bb228a0f9112debc99533f5586b8 | |
parent | b04f62fe4e5699ec3c765e86b02b5eb000440552 (diff) | |
parent | 13a433150492c6277fc0d1ca932e3dc2f81a1868 (diff) | |
download | Settings-5784e3dddc754b25bc359d7e643ee96cfa1cad6f.tar.gz |
Snap for 8305585 from 13a433150492c6277fc0d1ca932e3dc2f81a1868 to mainline-networking-releaseandroid-mainline-12.0.0_r99android-mainline-12.0.0_r100
Change-Id: I04b54cc4fd21559fc5cb826bb47a378736b836a4
5 files changed, 22 insertions, 8 deletions
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 621351681cd..e389747bf67 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -293,7 +293,7 @@ android:title="@string/tethering_hardware_offload" android:summary="@string/tethering_hardware_offload_summary" /> - <com.android.settingslib.RestrictedSwitchPreference + <com.android.settingslib.RestrictedPreference android:key="default_usb_configuration" android:fragment="com.android.settings.connecteddevice.usb.UsbDefaultFragment" android:title="@string/usb_default_label"/> diff --git a/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java b/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java index be7704fd735..7c3d3b120e0 100644 --- a/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java +++ b/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java @@ -24,7 +24,7 @@ import android.os.UserHandle; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.RestrictedPreference; import com.android.settingslib.development.DeveloperOptionsPreferenceController; public class DefaultUsbConfigurationPreferenceController extends @@ -32,7 +32,7 @@ public class DefaultUsbConfigurationPreferenceController extends private static final String PREFERENCE_KEY = "default_usb_configuration"; - private RestrictedSwitchPreference mPreference; + private RestrictedPreference mPreference; public DefaultUsbConfigurationPreferenceController(Context context) { super(context); diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 07d57140ec1..ed6f9ed955d 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -85,9 +85,12 @@ public class PrivateDnsPreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { - return mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings) - ? AVAILABLE - : UNSUPPORTED_ON_DEVICE; + if (!mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings)) { + return UNSUPPORTED_ON_DEVICE; + } + final UserManager userManager = mContext.getSystemService(UserManager.class); + if (userManager.isGuestUser()) return DISABLED_FOR_USER; + return AVAILABLE; } @Override diff --git a/tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java index c9b13e27a0c..a386473020a 100644 --- a/tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java @@ -32,7 +32,7 @@ import android.os.UserHandle; import androidx.preference.PreferenceScreen; import com.android.settingslib.RestrictedLockUtils; -import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.RestrictedPreference; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ public class DefaultUsbConfigurationPreferenceControllerTest { private static final ComponentName TEST_COMPONENT_NAME = new ComponentName("test", "test"); @Mock - private RestrictedSwitchPreference mPreference; + private RestrictedPreference mPreference; @Mock private PreferenceScreen mPreferenceScreen; @Mock diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index e31d959622a..057b6cbf0b9 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -26,6 +26,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; @@ -35,6 +36,7 @@ import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; @@ -109,6 +111,8 @@ public class PrivateDnsPreferenceControllerTest { private Network mNetwork; @Mock private Preference mPreference; + @Mock + private UserManager mUserManager; @Captor private ArgumentCaptor<NetworkCallback> mCallbackCaptor; private PrivateDnsPreferenceController mController; @@ -127,6 +131,7 @@ public class PrivateDnsPreferenceControllerTest { mShadowContentResolver = Shadow.extract(mContentResolver); when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) .thenReturn(mConnectivityManager); + when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); doNothing().when(mConnectivityManager).registerDefaultNetworkCallback( mCallbackCaptor.capture(), nullable(Handler.class)); @@ -174,6 +179,12 @@ public class PrivateDnsPreferenceControllerTest { } @Test + public void getAvailabilityStatus_disabledForGuestUser() { + doReturn(true).when(mUserManager).isGuestUser(); + assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER); + } + + @Test public void goThroughLifecycle_shouldRegisterUnregisterSettingsObserver() { mLifecycle.handleLifecycleEvent(ON_START); verify(mContext, atLeastOnce()).getContentResolver(); |