summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2015-06-08 17:05:08 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-06-08 17:05:09 +0000
commit7fa228f4eaa774df9e925e0c037f0fa78caafafc (patch)
tree6034c4ead668a7a317fb3d5b72168cdf65afe00b
parent72285e5600fad17c42730d6f84164d8425d4d43c (diff)
parent4a922d470089bde49c2ca50b258973828a665aba (diff)
Merge "Release voice wake lock at end of voice interaction session" into mnc-dev
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index b6cc1c7f6d1c..1046b2960fdc 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -10216,6 +10216,7 @@ public final class ActivityManagerService extends ActivityManagerNative
void finishRunningVoiceLocked() {
if (mRunningVoice != null) {
mRunningVoice = null;
+ mVoiceWakeLock.release();
updateSleepIfNeededLocked();
}
}