Get icon updating working.
Change-Id: I749967545af5c97756e316231e740208fcd8ad3c
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CommandQueue.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CommandQueue.java
index 502de10..3357e10 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CommandQueue.java
+++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CommandQueue.java
@@ -18,7 +18,7 @@
import android.os.Handler;
import android.os.Message;
-import android.util.Log;
+import android.util.Slog;
import com.android.internal.statusbar.IStatusBar;
import com.android.internal.statusbar.StatusBarIcon;
@@ -72,7 +72,7 @@
private final class H extends Handler {
public void handleMessage(Message msg) {
int what = msg.what & MSG_MASK;
- switch (msg.what) {
+ switch (what) {
case MSG_ICON: {
int index = msg.what & INDEX_MASK;
int viewIndex = mList.getViewIndex(index);
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarIconView.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarIconView.java
index 4200fad..874fcfa 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarIconView.java
+++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarIconView.java
@@ -39,6 +39,9 @@
}
private static boolean streq(String a, String b) {
+ if (a == b) {
+ return true;
+ }
if (a == null && b != null) {
return false;
}
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java
index c7fe0e6..89f26b4 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java
+++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java
@@ -57,6 +57,7 @@
public void onCreate() {
// Connect in to the status bar manager service
StatusBarIconList iconList = new StatusBarIconList();
+ mCommandQueue = new CommandQueue(this, iconList);
mBarService = IStatusBarService.Stub.asInterface(
ServiceManager.getService(Context.STATUS_BAR_SERVICE));
try {
@@ -66,7 +67,6 @@
}
// Set up the initial icon state
- mCommandQueue = new CommandQueue(this, iconList);
final int N = iconList.size();
int viewIndex = 0;
for (int i=0; i<N; i++) {