am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"

* commit '0e6b4da5ca53d338f351827f7a351edcd6281aaa':
  Frameworks/base: Fix request removal in VoiceInteractionSession
This commit is contained in:
Andreas Gampe
2015-03-28 05:11:02 +00:00
committed by Android Git Automerger

View File

@@ -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);
}
}