commit 7450614a496d0b6a5836703c1145e9bcd4f104e9
author Prashant Malani <pmalani@google.com> Wed Aug 06 16:49:53 2014 -0700
committer Prashant Malani <pmalani@google.com> Wed Aug 06 22:22:18 2014 -0700
tree fc4219d662146bd594e6f70899198f0bb22312cb
parent 6ebeefa04cb3c360d8028eb77e60bacf8a800cb1

Move wakelock release to handleMessage

There were certain code paths in handleDockStateChange() that were
exiting without releasing the wakelock. So we move the release to the
calling function to prevent stray held wakelocks.

Bug: 16841895

Change-Id: I8ae4d2ab8f775c42a893d3bcdef34321c5f631a6
Signed-off-by: Prashant Malani <pmalani@google.com>

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;
             }
         }