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

Commit 03b39bc5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725



Change-Id: I6e8bb778a0c9a7e45965bebe6605bac76915aad4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a6553b1 3494d09d

src/com/android/settings/network/tether/TetherSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -148,12 +148,13 @@ public class TetherSettings extends RestrictedSettingsFragment 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        // Even when the UI is restricted, addPreferencesFromResource cannot be omitted.

        addPreferencesFromResource(R.xml.tether_prefs);

        setIfOnlyAvailableForAdmins(true);

        if (isUiRestricted()) {

            return;

        }



        addPreferencesFromResource(R.xml.tether_prefs);

        mContext = getContext();

        mDataSaverBackend = new DataSaverBackend(mContext);

        mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();

tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -131,10 +131,12 @@ public class TetherSettingsTest { 
    @Test

    @Config(shadows = ShadowRestrictedSettingsFragment.class)

    public void onCreate_isUiRestricted_doNotSetupViewModel() {

        doNothing().when(mTetherSettings).addPreferencesFromResource(anyInt());

        when(mTetherSettings.isUiRestricted()).thenReturn(true);



        mTetherSettings.onCreate(null);



        verify(mTetherSettings).addPreferencesFromResource(anyInt());

        verify(mTetherSettings, never()).setupViewModel();

    }