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

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26808831']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26808831'] into security-aosp-tm-release.

Change-Id: Ic8d1f5b6da6659973134bc594a6d05ecccb15f2d
parents 76f5427d d1f9e61e

src/com/android/settings/wifi/AddNetworkFragment.java

+20 −0
Original line number Diff line number Diff line
@@ -16,11 +16,16 @@ 


package com.android.settings.wifi;



import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;



import android.app.Activity;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.net.wifi.WifiConfiguration;

import android.os.Bundle;

import android.os.UserManager;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -41,6 +46,7 @@ import com.android.settings.wifi.dpp.WifiDppUtils; 
 */

public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase2,

        View.OnClickListener {

    private static final String TAG = "AddNetworkFragment";



    public static final String WIFI_CONFIG_KEY = "wifi_config_key";

    @VisibleForTesting
@@ -58,6 +64,10 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (!isAddWifiConfigAllowed(getContext())) {

            getActivity().finish();

            return;

        }

    }



    @Override
@@ -209,4 +219,14 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf 
        activity.setResult(Activity.RESULT_CANCELED);

        activity.finish();

    }



    @VisibleForTesting

    static boolean isAddWifiConfigAllowed(Context context) {

        UserManager userManager = context.getSystemService(UserManager.class);

        if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) {

            Log.e(TAG, "The user is not allowed to add Wi-Fi configuration.");

            return false;

        }

        return true;

    }

}

src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java

+23 −0
Original line number Diff line number Diff line
@@ -16,13 +16,17 @@ 


package com.android.settings.wifi.dpp;



import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.os.Bundle;

import android.os.UserManager;

import android.provider.Settings;

import android.util.Log;
@@ -96,6 +100,10 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (!isAddWifiConfigAllowed(getApplicationContext())) {

            finish();

            return;

        }



        if (savedInstanceState != null) {

            String qrCode = savedInstanceState.getString(KEY_QR_CODE);
@@ -116,6 +124,11 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements 


    @Override

    protected void handleIntent(Intent intent) {

        if (!isAddWifiConfigAllowed(getApplicationContext())) {

            finish();

            return;

        }



        String action = intent != null ? intent.getAction() : null;

        if (action == null) {

            finish();
@@ -384,4 +397,14 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements 


        return null;

    }



    @VisibleForTesting

    static boolean isAddWifiConfigAllowed(Context context) {

        UserManager userManager = context.getSystemService(UserManager.class);

        if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) {

            Log.e(TAG, "The user is not allowed to add Wi-Fi configuration.");

            return false;

        }

        return true;

    }

}

tests/unit/src/com/android/settings/wifi/AddNetworkFragmentTest.java

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.wifi;



import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.when;



import android.content.Context;

import android.os.UserManager;



import androidx.test.annotation.UiThreadTest;

import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Spy;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



@RunWith(AndroidJUnit4.class)

@UiThreadTest

public class AddNetworkFragmentTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();

    @Spy

    private final Context mContext = ApplicationProvider.getApplicationContext();

    @Mock

    private UserManager mUserManager;



    private AddNetworkFragment mFragment;



    @Before

    public void setUp() {

        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);



        mFragment = new AddNetworkFragment();

    }



    @Test

    public void isAddWifiConfigAllowed_hasNoUserRestriction_returnTrue() {

        when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);



        assertThat(mFragment.isAddWifiConfigAllowed(mContext)).isTrue();

    }



    @Test

    public void isAddWifiConfigAllowed_hasUserRestriction_returnFalse() {

        when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);



        assertThat(mFragment.isAddWifiConfigAllowed(mContext)).isFalse();

    }

}

tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.wifi.dpp;



import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.when;



import android.content.Context;

import android.os.UserManager;



import androidx.test.annotation.UiThreadTest;

import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Spy;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



@RunWith(AndroidJUnit4.class)

@UiThreadTest

public class WifiDppConfiguratorActivityTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();

    @Spy

    private final Context mContext = ApplicationProvider.getApplicationContext();

    @Mock

    private UserManager mUserManager;



    private WifiDppConfiguratorActivity mActivity;



    @Before

    public void setUp() {

        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);



        mActivity = new WifiDppConfiguratorActivity();

    }



    @Test

    public void isAddWifiConfigAllowed_hasNoUserRestriction_returnTrue() {

        when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);



        assertThat(mActivity.isAddWifiConfigAllowed(mContext)).isTrue();

    }



    @Test

    public void isAddWifiConfigAllowed_hasUserRestriction_returnFalse() {

        when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);



        assertThat(mActivity.isAddWifiConfigAllowed(mContext)).isFalse();

    }

}