diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-28 05:03:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-28 05:03:18 +0000 |
| commit | 0e6b4da5ca53d338f351827f7a351edcd6281aaa (patch) | |
| tree | 7aebcfdfcce304a47778d813ce9612267ca320f6 | |
| parent | d7e0610477b1a97ce6b566a19e1fe9246bc30f52 (diff) | |
| parent | 5a15bf69d8d2782d70c462f7fd8bd75e687260dc (diff) | |
| download | frameworks_base-0e6b4da5ca53d338f351827f7a351edcd6281aaa.zip frameworks_base-0e6b4da5ca53d338f351827f7a351edcd6281aaa.tar.gz frameworks_base-0e6b4da5ca53d338f351827f7a351edcd6281aaa.tar.bz2 | |
am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
Frameworks/base: Fix request removal in VoiceInteractionSession
| -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); } } |