auto import from //depot/cupcake/@137055
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index fc25e38..77383bd 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -188,7 +188,6 @@
Log.i(TAG, "Starting Status Bar Service.");
statusBar = new StatusBarService(context);
ServiceManager.addService("statusbar", statusBar);
- com.android.server.status.StatusBarPolicy.installIcons(context, statusBar);
} catch (Throwable e) {
Log.e(TAG, "Failure starting StatusBarService", e);
}
@@ -315,6 +314,12 @@
} catch (Throwable e) {
Log.e(TAG, "Failure starting Gadget Service", e);
}
+
+ try {
+ com.android.server.status.StatusBarPolicy.installIcons(context, statusBar);
+ } catch (Throwable e) {
+ Log.e(TAG, "Failure installing status bar icons", e);
+ }
}
// make sure the ADB_ENABLED setting value matches the secure property value