am 2e47052f: am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread

Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c'

* commit '2e47052fc4ad3439adc2322fd953fd58a85d457c':
  Fix problems with determining when to kill apps for wake usage.

2 files changed, 18 insertions, 1 deletions

diff --git a/tests/BatteryWaster/res/layout/battery_waster.xml b/tests/BatteryWaster/res/layout/battery_waster.xml
index 36aa68b..57a5b55 100644
--- a/tests/BatteryWaster/res/layout/battery_waster.xml
+++ b/tests/BatteryWaster/res/layout/battery_waster.xml
@@ -25,6 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="25dp"
         android:layout_marginTop="25dp"
+        android:saveEnabled="false"
         android:textSize="18sp"
         android:textColor="#ffffffff"
         android:text="@string/waste_away"
@@ -35,6 +36,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="25dp"
         android:layout_marginTop="25dp"
+        android:saveEnabled="false"
         android:textSize="18sp"
         android:textColor="#ffffffff"
         android:text="@string/wake_away"
diff --git a/tests/BatteryWaster/src/com/android/batterywaster/BatteryWaster.java b/tests/BatteryWaster/src/com/android/batterywaster/BatteryWaster.java
index 499330f..48c4520 100644
--- a/tests/BatteryWaster/src/com/android/batterywaster/BatteryWaster.java
+++ b/tests/BatteryWaster/src/com/android/batterywaster/BatteryWaster.java
@@ -39,6 +39,7 @@ public class BatteryWaster extends Activity {
     DateFormat mDateFormat;
     IntentFilter mFilter;
     PowerManager.WakeLock mWakeLock;
+    PowerManager.WakeLock mPartialWakeLock;
     SpinThread mThread;
 
     boolean mWasting, mWaking;
@@ -66,6 +67,8 @@ public class BatteryWaster extends Activity {
         PowerManager pm = (PowerManager)getSystemService(POWER_SERVICE);
         mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, "BatteryWaster");
         mWakeLock.setReferenceCounted(false);
+        mPartialWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "BatteryWaster");
+        mPartialWakeLock.setReferenceCounted(false);
     }
 
     @Override
@@ -80,6 +83,9 @@ public class BatteryWaster extends Activity {
         if (mWakeLock.isHeld()) {
             mWakeLock.release();
         }
+        if (mPartialWakeLock.isHeld()) {
+            mPartialWakeLock.release();
+        }
     }
 
     View.OnClickListener mClickListener = new View.OnClickListener() {
@@ -133,7 +139,7 @@ public class BatteryWaster extends Activity {
     }
 
     void updateWakeLock() {
-        if (mWasting || mWaking) {
+        if (mWasting) {
             if (!mWakeLock.isHeld()) {
                 mWakeLock.acquire();
             }
@@ -142,6 +148,15 @@ public class BatteryWaster extends Activity {
                 mWakeLock.release();
             }
         }
+        if (mWaking) {
+            if (!mPartialWakeLock.isHeld()) {
+                mPartialWakeLock.acquire();
+            }
+        } else {
+            if (mPartialWakeLock.isHeld()) {
+                mPartialWakeLock.release();
+            }
+        }
     }
 
     void log(String s) {