commit 2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54
author Baligh Uddin <baligh@google.com> Mon Oct 29 15:19:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 29 15:19:59 2012 -0700
tree 828d94fb3f95f410dd93514e000715cda265d78a
parent 8d028a87e97f9420f9db31a6b8aa80859fe393b3
parent fc66cb838625d55a5bf661cc8ec3b8b7a4855c91

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

src/com/android/settings/CryptKeeperSettings.java

diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index d0043e6..58d97a8 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -61,14 +61,14 @@
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
-                int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
-                int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
-                int invalidCharger = intent.getIntExtra(BatteryManager.EXTRA_INVALID_CHARGER, 0);
+                final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+                final int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+                final int invalidCharger = intent.getIntExtra(
+                    BatteryManager.EXTRA_INVALID_CHARGER, 0);
 
-                boolean levelOk = level >= MIN_BATTERY_LEVEL;
-                boolean pluggedOk =
-                    (plugged == BatteryManager.BATTERY_PLUGGED_AC ||
-                     plugged == BatteryManager.BATTERY_PLUGGED_USB) &&
+                final boolean levelOk = level >= MIN_BATTERY_LEVEL;
+                final boolean pluggedOk =
+                    ((plugged & BatteryManager.BATTERY_PLUGGED_ANY) != 0) &&
                      invalidCharger == 0;
 
                 // Update UI elements based on power/battery status
@@ -204,4 +204,3 @@
         ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference);
     }
 }
-