commit 5a15bf69d8d2782d70c462f7fd8bd75e687260dc
author Andreas Gampe <agampe@google.com> Sat Mar 28 04:50:07 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 28 04:50:08 2015 +0000
tree 597291990b6e3d1b64a444fa248578e8bfc7021d
parent 36ee836d2f6e6df59d6a20a69421639bacf25559
parent 8ef92bd311e6faf602c9705db663abd451590fff

Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"

core/java/android/service/voice/VoiceInteractionSession.java

diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java
index 749f813..d751266 100644
--- a/core/java/android/service/voice/VoiceInteractionSession.java
+++ b/core/java/android/service/voice/VoiceInteractionSession.java
@@ -436,11 +436,7 @@
 
     Request removeRequest(IBinder reqInterface) {
         synchronized (this) {
-            Request req = mActiveRequests.get(reqInterface);
-            if (req != null) {
-                mActiveRequests.remove(req);
-            }
-            return req;
+            return mActiveRequests.remove(reqInterface);
         }
     }