Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index fdb4548..4baf1afe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -719,28 +719,19 @@
             Slog.d(TAG, "updateConnectivity: connectionStatus=" + connectionStatus);
         }
 
-        int inetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0);
+        mInetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0);
 
-        switch (info.getType()) {
-            case ConnectivityManager.TYPE_MOBILE:
-                mInetCondition = inetCondition;
-                updateDataNetType();
-                updateDataIcon();
-                updateTelephonySignalStrength(); // apply any change in connectionStatus
-                break;
-            case ConnectivityManager.TYPE_WIFI:
-                mInetCondition = inetCondition;
-                updateWifiIcons();
-                break;
-            case ConnectivityManager.TYPE_BLUETOOTH:
-                mInetCondition = inetCondition;
-                if (info != null) {
-                    mBluetoothTethered = info.isConnected() ? true: false;
-                } else {
-                    mBluetoothTethered = false;
-                }
-                break;
+        if (info != null && info.getType() == ConnectivityManager.TYPE_BLUETOOTH) {
+            mBluetoothTethered = info.isConnected() ? true: false;
+        } else {
+            mBluetoothTethered = false;
         }
+
+        // We want to update all the icons, all at once, for any condition change
+        updateDataNetType();
+        updateDataIcon();
+        updateTelephonySignalStrength();
+        updateWifiIcons();
     }
 
 
@@ -1033,8 +1024,8 @@
         pw.println(mWifiLevel);
         pw.print("  mWifiSsid=");
         pw.println(mWifiSsid);
-        pw.print("  mWifiIconId=");
-        pw.println(mWifiIconId);
+        pw.print(String.format("  mWifiIconId=0x%08x/%s",
+                    mWifiIconId, getResourceName(mWifiIconId)));
         pw.print("  mWifiActivity=");
         pw.println(mWifiActivity);
 
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 977dd6f..cdefa00 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -65,6 +65,7 @@
 class ServerThread extends Thread {
     private static final String TAG = "SystemServer";
     private static final String ENCRYPTING_STATE = "trigger_restart_min_framework";
+    private static final String ENCRYPTED_STATE = "1";
 
     ContentResolver mContentResolver;
 
@@ -150,10 +151,15 @@
             Slog.i(TAG, "Package Manager");
             // Only run "core" apps if we're encrypting the device.
             String cryptState = SystemProperties.get("vold.decrypt");
-            boolean onlyCore = ENCRYPTING_STATE.equals(cryptState);
-            if (onlyCore) {
+            boolean onlyCore = false;
+            if (ENCRYPTING_STATE.equals(cryptState)) {
                 Slog.w(TAG, "Detected encryption in progress - only parsing core apps");
+                onlyCore = true;
+            } else if (ENCRYPTED_STATE.equals(cryptState)) {
+                Slog.w(TAG, "Device encrypted - only parsing core apps");
+                onlyCore = true;
             }
+
             pm = PackageManagerService.main(context,
                     factoryTest != SystemServer.FACTORY_TEST_OFF,
                     onlyCore);