diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-17 21:22:49 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-17 21:22:49 -0700 |
| commit | 8ef92bd311e6faf602c9705db663abd451590fff (patch) | |
| tree | 61027faca549ffeb207f4b602cb3f324038e0aa7 | |
| parent | 28e6aeca3aad075ef4fd7aab08cd1ad1ff9eb555 (diff) | |
| download | frameworks_base-8ef92bd311e6faf602c9705db663abd451590fff.zip frameworks_base-8ef92bd311e6faf602c9705db663abd451590fff.tar.gz frameworks_base-8ef92bd311e6faf602c9705db663abd451590fff.tar.bz2 | |
Frameworks/base: Fix request removal in VoiceInteractionSession
Fix and simplify removeRequest.
Bug: 19797138
Change-Id: I0eca877e3109c9f39cebd4c888f166ce334fcc0e
| -rw-r--r-- | core/java/android/service/voice/VoiceInteractionSession.java | 6 |
1 files changed, 1 insertions, 5 deletions
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 @@ 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); } } |