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

Commit a30d123e authored by Weng Su's avatar Weng Su Committed by Automerger Merge Worker
Browse files

Restrict secondary users to share Wi-Fi network am: 4c4a1f58 

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



Change-Id: I4d1bf49f4eab2ce72148cd308b5c217d814ab75c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 734d9495 4c4a1f58

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

+32 −2
Original line number Diff line number Diff line
@@ -34,9 +34,11 @@ import android.net.wifi.WifiManager; 
import android.os.Bundle;

import android.os.Handler;

import android.os.PowerManager;

import android.os.UserManager;

import android.provider.Settings;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.ContextMenu;
@@ -204,6 +206,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
     * by the Test DPC tool in AFW mode.

     */

    protected boolean mIsRestricted;

    @VisibleForTesting

    boolean mIsAdmin = true;



    @VisibleForTesting

    AirplaneModeEnabler mAirplaneModeEnabler;
@@ -287,6 +291,13 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        addPreferences();



        mIsRestricted = isUiRestricted();

        mIsAdmin = isAdminUser();

    }



    private boolean isAdminUser() {

        final UserManager userManager = getSystemService(UserManager.class);

        if (userManager == null) return true;

        return userManager.isAdminUser();

    }



    private void addPreferences() {
@@ -546,7 +557,9 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        }



        if (mSelectedWifiEntry.canDisconnect()) {

            menu.add(Menu.NONE, MENU_ID_SHARE, 0 /* order */, R.string.share);

            if (mSelectedWifiEntry.canShare()) {

                addShareMenuIfSuitable(menu);

            }

            menu.add(Menu.NONE, MENU_ID_DISCONNECT, 1 /* order */,

                    R.string.wifi_disconnect_button_text);

        }
@@ -554,7 +567,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        // "forget" for normal saved network. And "disconnect" for ephemeral network because it

        // could only be disconnected and be put in blocklists so it won't be used again.

        if (canForgetNetwork()) {

            menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);

            addForgetMenuIfSuitable(menu);

        }



        WifiConfiguration config = mSelectedWifiEntry.getWifiConfiguration();
@@ -569,6 +582,23 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        }

    }



    @VisibleForTesting

    void addShareMenuIfSuitable(ContextMenu menu) {

        if (mIsAdmin) {

            menu.add(Menu.NONE, MENU_ID_SHARE, 0 /* order */, R.string.share);

            return;

        }

        Log.w(TAG, "Don't add the Wi-Fi share menu because the user is not an admin.");

        EventLog.writeEvent(0x534e4554, "206986392", -1 /* UID */, "User is not an admin");

    }



    @VisibleForTesting

    void addForgetMenuIfSuitable(ContextMenu menu) {

        if (mIsAdmin) {

            menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);

        }

    }



    private boolean canForgetNetwork() {

        return mSelectedWifiEntry.canForget() && !WifiUtils.isNetworkLockedDown(getActivity(),

                mSelectedWifiEntry.getWifiConfiguration());

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

+95 −5
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
 */

package com.android.settings.network;



import static com.android.settings.network.NetworkProviderSettings.MENU_ID_DISCONNECT;

import static com.android.settings.network.NetworkProviderSettings.MENU_ID_FORGET;

import static com.android.settings.network.NetworkProviderSettings.MENU_ID_SHARE;

import static com.android.settings.wifi.WifiConfigUiBase2.MODE_CONNECT;

import static com.android.settings.wifi.WifiConfigUiBase2.MODE_MODIFY;
@@ -78,6 +81,7 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;
@@ -109,6 +113,8 @@ public class NetworkProviderSettingsTest { 
    @Mock

    private WifiPickerTracker mMockWifiPickerTracker;

    @Mock

    private WifiEntry mWifiEntry;

    @Mock

    private PreferenceManager mPreferenceManager;

    @Mock

    private InternetResetHelper mInternetResetHelper;
@@ -117,6 +123,8 @@ public class NetworkProviderSettingsTest { 
    @Mock

    private LayoutPreference mResetInternetPreference;

    @Mock

    private ContextMenu mContextMenu;

    @Mock

    private MenuItem mMenuItem;

    @Mock

    InternetUpdater mInternetUpdater;
@@ -323,12 +331,54 @@ public class NetworkProviderSettingsTest { 
        final View view = mock(View.class);

        when(view.getTag()).thenReturn(connectedWifiEntryPreference);



        final ContextMenu menu = mock(ContextMenu.class);

        mNetworkProviderSettings.onCreateContextMenu(menu, view, null /* info */);

        mNetworkProviderSettings.onCreateContextMenu(mContextMenu, view, null /* info */);



        verify(menu).add(anyInt(), eq(NetworkProviderSettings.MENU_ID_FORGET), anyInt(), anyInt());

        verify(menu).add(anyInt(), eq(NetworkProviderSettings.MENU_ID_DISCONNECT), anyInt(),

                anyInt());

        verify(mContextMenu).add(anyInt(), eq(MENU_ID_FORGET), anyInt(), anyInt());

        verify(mContextMenu).add(anyInt(), eq(MENU_ID_DISCONNECT), anyInt(), anyInt());

    }



    @Test

    public void onCreateContextMenu_canShare_shouldHaveShareMenuForConnectedWifiEntry() {

        final FragmentActivity activity = mock(FragmentActivity.class);

        when(activity.getApplicationContext()).thenReturn(mContext);

        when(mNetworkProviderSettings.getActivity()).thenReturn(activity);



        when(mWifiEntry.canDisconnect()).thenReturn(true);

        when(mWifiEntry.canShare()).thenReturn(true);

        when(mWifiEntry.canForget()).thenReturn(true);

        when(mWifiEntry.isSaved()).thenReturn(true);

        when(mWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);



        final LongPressWifiEntryPreference connectedWifiEntryPreference =

                mNetworkProviderSettings.createLongPressWifiEntryPreference(mWifiEntry);

        final View view = mock(View.class);

        when(view.getTag()).thenReturn(connectedWifiEntryPreference);



        mNetworkProviderSettings.onCreateContextMenu(mContextMenu, view, null /* info */);



        verify(mContextMenu).add(anyInt(), eq(MENU_ID_SHARE), anyInt(), anyInt());

    }



    @Test

    public void onCreateContextMenu_canNotShare_shouldDisappearShareMenuForConnectedWifiEntry() {

        final FragmentActivity activity = mock(FragmentActivity.class);

        when(activity.getApplicationContext()).thenReturn(mContext);

        when(mNetworkProviderSettings.getActivity()).thenReturn(activity);



        when(mWifiEntry.canDisconnect()).thenReturn(true);

        when(mWifiEntry.canShare()).thenReturn(false);

        when(mWifiEntry.canForget()).thenReturn(true);

        when(mWifiEntry.isSaved()).thenReturn(true);

        when(mWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);



        final LongPressWifiEntryPreference connectedWifiEntryPreference =

                mNetworkProviderSettings.createLongPressWifiEntryPreference(mWifiEntry);

        final View view = mock(View.class);

        when(view.getTag()).thenReturn(connectedWifiEntryPreference);



        mNetworkProviderSettings.onCreateContextMenu(mContextMenu, view, null /* info */);



        verify(mContextMenu, never()).add(anyInt(), eq(MENU_ID_SHARE), anyInt(), anyInt());

    }



    @Test
@@ -603,6 +653,46 @@ public class NetworkProviderSettingsTest { 
        verify(mAirplaneModeEnabler).stop();

    }



    @Test

    public void addShareMenuIfSuitable_isAdmin_addMenu() {

        mNetworkProviderSettings.mIsAdmin = true;

        Mockito.reset(mContextMenu);



        mNetworkProviderSettings.addShareMenuIfSuitable(mContextMenu);



        verify(mContextMenu).add(anyInt(), eq(MENU_ID_SHARE), anyInt(), anyInt());

    }



    @Test

    public void addShareMenuIfSuitable_isNotAdmin_notAddMenu() {

        mNetworkProviderSettings.mIsAdmin = false;

        Mockito.reset(mContextMenu);



        mNetworkProviderSettings.addShareMenuIfSuitable(mContextMenu);



        verify(mContextMenu, never()).add(anyInt(), eq(MENU_ID_SHARE), anyInt(), anyInt());

    }



    @Test

    public void addForgetMenuIfSuitable_isAdmin_addMenu() {

        mNetworkProviderSettings.mIsAdmin = true;

        Mockito.reset(mContextMenu);



        mNetworkProviderSettings.addForgetMenuIfSuitable(mContextMenu);



        verify(mContextMenu).add(anyInt(), eq(MENU_ID_FORGET), anyInt(), anyInt());

    }



    @Test

    public void addForgetMenuIfSuitable_isNotAdmin_notAddMenu() {

        mNetworkProviderSettings.mIsAdmin = false;

        Mockito.reset(mContextMenu);



        mNetworkProviderSettings.addForgetMenuIfSuitable(mContextMenu);



        verify(mContextMenu, never()).add(anyInt(), eq(MENU_ID_FORGET), anyInt(), anyInt());

    }



    @Implements(PreferenceFragmentCompat.class)

    public static class ShadowPreferenceFragmentCompat {