summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Prashant Malani <pmalani@google.com> 2014-08-07 22:15:01 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-08-07 22:15:01 +0000
commitd224a9dfd2d2f1977e7a40ba3bbfb42a4165aedc (patch)
treedf82d8f433f0c7d16d0d6fab87496516a558cb1a
parent7c9e2457f880e9e45d3939b352066283106f42c6 (diff)
parent639421cbd9780b9093bdf3415a79489c118ecb92 (diff)
am 639421cb: am fed4a556: Merge "Move wakelock release to handleMessage" into klp-modular-dev
* commit '639421cbd9780b9093bdf3415a79489c118ecb92': Move wakelock release to handleMessage
-rw-r--r--services/core/java/com/android/server/DockObserver.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/DockObserver.java b/services/core/java/com/android/server/DockObserver.java
index af38664080ec..d05c280093fb 100644
--- a/services/core/java/com/android/server/DockObserver.java
+++ b/services/core/java/com/android/server/DockObserver.java
@@ -201,9 +201,6 @@ final class DockObserver extends SystemService {
// There are many components in the system watching for this so as to
// adjust audio routing, screen orientation, etc.
getContext().sendStickyBroadcastAsUser(intent, UserHandle.ALL);
-
- // Release the wake lock that was acquired when the message was posted.
- mWakeLock.release();
}
}
@@ -213,6 +210,7 @@ final class DockObserver extends SystemService {
switch (msg.what) {
case MSG_DOCK_STATE_CHANGED:
handleDockStateChange();
+ mWakeLock.release();
break;
}
}