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

Commit da1e6b84 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Wi-Fi] Fix SavedAccessPointsPreferenceController crash when editing Settings search box"

parents 4214463f d90eac59
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class SavedAccessPointsPreferenceController extends BasePreferenceControl

    @Override
    public int getAvailabilityStatus() {
        refreshSavedAccessPoints();
        return mAccessPoints.size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
    }

+5 −10
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

package com.android.settings.wifi.savedaccesspoints;

import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;

import static com.google.common.truth.Truth.assertThat;
@@ -30,19 +29,14 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;

import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;

import com.android.settings.testutils.shadow.ShadowAccessPoint;
import com.android.settings.testutils.shadow.ShadowWifiManager;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPointPreference;

import java.util.ArrayList;
import java.util.Arrays;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -53,6 +47,8 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;

import java.util.ArrayList;

@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowWifiManager.class})
public class SavedAccessPointsPreferenceControllerTest {
@@ -89,11 +85,10 @@ public class SavedAccessPointsPreferenceControllerTest {
    }

    @Test
    public void getAvailability_oneSavedAccessPoint_shouldAvailable() {
        final AccessPoint accessPoint = new AccessPoint(mContext, new Bundle() /* savedState */);
        mController.mAccessPoints = new ArrayList<AccessPoint>(Arrays.asList(accessPoint));
    public void getAvailability_shouldRefreshSavedAccessPoints() {
        mController.getAvailabilityStatus();

        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
        verify(mController).refreshSavedAccessPoints();
    }

    @Test