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

2015-03-28 04:50:07 +00:00
parent 36ee836d2f 8ef92bd311
commit 5a15bf69d8
1 changed files with 1 additions and 5 deletions
--- a/core/java/android/service/voice/VoiceInteractionSession.java
+++ b/core/java/android/service/voice/VoiceInteractionSession.java
@@ -436,11 +436,7 @@ public abstract class VoiceInteractionSession implements KeyEvent.Callback {

    Request removeRequest(IBinder reqInterface) {
        synchronized (this) {
-            Request req = mActiveRequests.get(reqInterface);
-            if (req != null) {
-                mActiveRequests.remove(req);
-            }
-            return req;
+            return mActiveRequests.remove(reqInterface);
        }
    }