diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-28 05:18:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-28 05:18:03 +0000 |
| commit | 2d3455993e857b0da029abe9ce8dd88801319d07 (patch) | |
| tree | 6db657a4e48f28f93deb1b9600ead3cca564b00d | |
| parent | c5071f9bf12208c38a81c59735f5f75b662a2bfb (diff) | |
| parent | 1bca3532687675d81dea805b12577a6c3a00b4c3 (diff) | |
| download | frameworks_base-2d3455993e857b0da029abe9ce8dd88801319d07.zip frameworks_base-2d3455993e857b0da029abe9ce8dd88801319d07.tar.gz frameworks_base-2d3455993e857b0da029abe9ce8dd88801319d07.tar.bz2 | |
am 1bca3532: am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '1bca3532687675d81dea805b12577a6c3a00b4c3':
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 7a5bb90..3245f55 100644 --- a/core/java/android/service/voice/VoiceInteractionSession.java +++ b/core/java/android/service/voice/VoiceInteractionSession.java @@ -512,11 +512,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); } } |