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

Commit 683a0777 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 74b54c51: am 3f37869c: am 02b0a574: Merge "Only re-register callbacks if... 

am 74b54c51: am 3f37869c: am 02b0a574: Merge "Only re-register callbacks if tuning changed" into mnc-dev

* commit '74b54c51':
  Only re-register callbacks if tuning changed
parents 69f65a72 74b54c51

packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

+15 −8
Original line number Original line Diff line number Diff line
@@ -114,14 +114,21 @@ public class SignalClusterView 
            return;

            return;

        }

        }

        ArraySet<String> blockList = StatusBarIconController.getIconBlacklist(newValue);

        ArraySet<String> blockList = StatusBarIconController.getIconBlacklist(newValue);

        mBlockAirplane = blockList.contains(SLOT_AIRPLANE);

        boolean blockAirplane = blockList.contains(SLOT_AIRPLANE);

        mBlockMobile = blockList.contains(SLOT_MOBILE);

        boolean blockMobile = blockList.contains(SLOT_MOBILE);

        mBlockWifi = blockList.contains(SLOT_WIFI);

        boolean blockWifi = blockList.contains(SLOT_WIFI);

        mBlockEthernet = blockList.contains(SLOT_ETHERNET);

        boolean blockEthernet = blockList.contains(SLOT_ETHERNET);





        if (blockAirplane != mBlockAirplane || blockMobile != mBlockMobile

                || blockEthernet != mBlockEthernet || blockWifi != mBlockWifi) {

            mBlockAirplane = blockAirplane;

            mBlockMobile = blockMobile;

            mBlockEthernet = blockEthernet;

            mBlockWifi = blockWifi;

            // Re-register to get new callbacks.

            // Re-register to get new callbacks.

        mNC.removeSignalCallback(SignalClusterView.this);

            mNC.removeSignalCallback(this);

        mNC.addSignalCallback(SignalClusterView.this);

            mNC.addSignalCallback(this);

        }

    }

    }





    public void setNetworkController(NetworkControllerImpl nc) {

    public void setNetworkController(NetworkControllerImpl nc) {