diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-28 04:50:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-28 04:50:08 +0000 |
| commit | 5a15bf69d8d2782d70c462f7fd8bd75e687260dc (patch) | |
| tree | 597291990b6e3d1b64a444fa248578e8bfc7021d | |
| parent | 36ee836d2f6e6df59d6a20a69421639bacf25559 (diff) | |
| parent | 8ef92bd311e6faf602c9705db663abd451590fff (diff) | |
| download | frameworks_base-5a15bf69d8d2782d70c462f7fd8bd75e687260dc.zip frameworks_base-5a15bf69d8d2782d70c462f7fd8bd75e687260dc.tar.gz frameworks_base-5a15bf69d8d2782d70c462f7fd8bd75e687260dc.tar.bz2 | |
Merge "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); } } |