commit 639421cbd9780b9093bdf3415a79489c118ecb92
author Prashant Malani <pmalani@google.com> Thu Aug 07 22:10:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 07 22:10:25 2014 +0000
tree 7cd1f275e46f98b9d0775072f33e776f66d63801
parent a4ef5a3aaafddc1e11a87290c42397748aa9358d
parent fed4a5565b9318fa1132003ad3599fa42bbefdf0

am fed4a556: Merge "Move wakelock release to handleMessage" into klp-modular-dev

* commit 'fed4a5565b9318fa1132003ad3599fa42bbefdf0':
  Move wakelock release to handleMessage

services/core/java/com/android/server/DockObserver.java

diff --git a/services/core/java/com/android/server/DockObserver.java b/services/core/java/com/android/server/DockObserver.java
index af38664..d05c280 100644
--- a/services/core/java/com/android/server/DockObserver.java
+++ b/services/core/java/com/android/server/DockObserver.java
@@ -201,9 +201,6 @@
             // 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 @@
             switch (msg.what) {
                 case MSG_DOCK_STATE_CHANGED:
                     handleDockStateChange();
+                    mWakeLock.release();
                     break;
             }
         }