commit 3001a035439d8134a7d70d796376d1dfbff3cdcd
author The Android Open Source Project <initial-contribution@android.com> Thu Feb 19 10:57:31 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Thu Feb 19 10:57:31 2009 -0800
tree 343ccdba15a594ff6e50c874a145232753315a30
parent da996f390e17e16f2dfa60e972e7ebc4f868f37e

auto import from //branches/cupcake/...@132276

services/java/com/android/server/BatteryService.java

diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java
index e4fdd0c1..9c9a580 100644
--- a/services/java/com/android/server/BatteryService.java
+++ b/services/java/com/android/server/BatteryService.java
@@ -121,9 +121,10 @@
         }
         int plugTypeBit = 0;
         if (mAcOnline) {
-            plugTypeBit = BatteryManager.BATTERY_PLUGGED_AC;
-        } else if (mUsbOnline) {
-            plugTypeBit = BatteryManager.BATTERY_PLUGGED_USB;
+            plugTypeBit |= BatteryManager.BATTERY_PLUGGED_AC;
+        }
+        if (mUsbOnline) {
+            plugTypeBit |= BatteryManager.BATTERY_PLUGGED_USB;
         }
         return (plugTypeSet & plugTypeBit) != 0;
     }