Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6346f0d1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [17129063, 17118783] into security-aosp-sc-v2-release. 

Change-Id: I9ccbabfe912320247f644918e280e04a79a128ae
parents 0e108202 ea01af3d

res/xml/development_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"/>

src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/network/PrivateDnsPreferenceController.java

+6 −3
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java

+11 −0
Original line number Diff line number Diff line
@@ -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));
@@ -173,6 +178,12 @@ public class PrivateDnsPreferenceControllerTest { 
        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @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);