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

Commit 6977f723 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Safeguard against threading issues on dependency 

Test: make
Change-Id: I92650a97051b286a19258cbee8a3761cf6ecc783
parent b86ec0a5

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.settingslib.graph.SignalDrawable; 
import com.android.settingslib.mobile.TelephonyIcons;

import com.android.settingslib.mobile.TelephonyIcons;

import com.android.settingslib.wifi.WifiStatusTracker;

import com.android.settingslib.wifi.WifiStatusTracker;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.util.Assert;





import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -190,6 +191,7 @@ public class WifiSignalController extends SignalController<WifiState, IconGroup> 
    }

    }





    private void handleStatusUpdated() {

    private void handleStatusUpdated() {

        Assert.isMainThread();

        copyWifiStates();

        copyWifiStates();

        notifyListenersIfNecessary();

        notifyListenersIfNecessary();

    }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { 
    @Before

    @Before

    public void setUp() throws Exception {

    public void setUp() throws Exception {

        super.setUp();

        super.setUp();

        allowTestableLooperAsMainThread();

        when(mWifiInfo.makeCopy(anyLong())).thenReturn(mWifiInfo);

        when(mWifiInfo.makeCopy(anyLong())).thenReturn(mWifiInfo);

        when(mWifiInfo.isPrimary()).thenReturn(true);

        when(mWifiInfo.isPrimary()).thenReturn(true);

    }

    }