diff options
| author | Matthew Williams <mjwilliams@google.com> | 2014-06-10 14:55:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 14:55:46 +0000 |
| commit | f53c295ae3ccabf1cf5a31c03f64233526e683eb (patch) | |
| tree | fb59f194508169e78b3c3197c1c463b193ffea8b /services/tests | |
| parent | 1a2f7a1e29e59e0c9140ac5d3f465dc110c70b48 (diff) | |
| parent | 5553aeb2aeee88929b11ee3bbf8e02da1e9368bd (diff) | |
| download | frameworks_base-f53c295ae3ccabf1cf5a31c03f64233526e683eb.zip frameworks_base-f53c295ae3ccabf1cf5a31c03f64233526e683eb.tar.gz frameworks_base-f53c295ae3ccabf1cf5a31c03f64233526e683eb.tar.bz2 | |
am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
Add OnNetworkActive to TaskManager and simplify locking.
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java b/services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java index e617caf..6617a05 100644 --- a/services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java @@ -40,7 +40,7 @@ public class BatteryControllerTest extends AndroidTestCase { } @Override - public void onTaskDeadlineExpired(TaskStatus taskStatus) { + public void onRunTaskNow(TaskStatus taskStatus) { } }; @@ -63,4 +63,4 @@ public class BatteryControllerTest extends AndroidTestCase { assertTrue(mTrackerUnderTest.isOnStablePower()); } -} +}
\ No newline at end of file |