commit 3e511afa7c52847db15d117a4829a2b90a1d5447
author haiyangl <haiyangl@codeaurora.org> Thu Sep 25 10:57:56 2014 +0800
committer Linux Build Service Account <lnxbuild@localhost> Tue Nov 04 08:36:45 2014 -0700
tree 0743ead4d75c5f219004276e078ac650f1f0e2e4
parent 7f23b6091987673bc4633ded5434a6bc3f964b98

SystemUI: Update the service state of NetworkController

MSimNetworkController doesn't update NetworkController.mServiceState when
service state changes, so mServiceState always point to the old object.

Update mServiceState to make sure NetworkController check emergency call
only state correctly.

CRs-Fixed: 708875

Change-Id: Iacfdb20831459e1afc50c9b957543fcd5d62e04c

packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java
index 79765dd..6f96e0b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java
@@ -465,6 +465,7 @@
                         + phoneId + "state=" + state.getState());
                 }
                 mMSimServiceState[phoneId] = state;
+                mServiceState = mMSimServiceState[mDefaultPhoneId];
                 if (SystemProperties.getBoolean("ro.config.combined_signal", true)) {
                     /*
                      * if combined_signal is set to true only then consider data