Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AsyncChannel] Fix race in handling of sync result

Browse Source 
Bug: 62866191
Bug: 63074860
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d3)
This commit is contained in:
Michael Plass
2017-07-13 10:09:07 -07:00
committed by Calvin On
parent 3c17135901
commit 9c1d56576e
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/com/android/internal/util/AsyncChannel.java
View File

@@ -768,9 +768,10 @@ public class AsyncChannel {
/** Handle of the reply message */
@Override
public void handleMessage(Message msg) {
mResultMsg = Message.obtain();
mResultMsg.copyFrom(msg);
Message msgCopy = Message.obtain();
msgCopy.copyFrom(msg);
synchronized(mLockObject) {
mResultMsg = msgCopy;
mLockObject.notify();
}
}
@@ -812,22 +813,26 @@ public class AsyncChannel {
*/
private static Message sendMessageSynchronously(Messenger dstMessenger, Message msg) {
SyncMessenger sm = SyncMessenger.obtain();
Message resultMsg = null;
try {
if (dstMessenger != null && msg != null) {
msg.replyTo = sm.mMessenger;
synchronized (sm.mHandler.mLockObject) {
if (sm.mHandler.mResultMsg != null) {
Slog.wtf(TAG, "mResultMsg should be null here");
sm.mHandler.mResultMsg = null;
}
dstMessenger.send(msg);
sm.mHandler.mLockObject.wait();
resultMsg = sm.mHandler.mResultMsg;
sm.mHandler.mResultMsg = null;
}
} else {
sm.mHandler.mResultMsg = null;
}
} catch (InterruptedException e) {
sm.mHandler.mResultMsg = null;
Slog.e(TAG, "error in sendMessageSynchronously", e);
} catch (RemoteException e) {
sm.mHandler.mResultMsg = null;
Slog.e(TAG, "error in sendMessageSynchronously", e);
}
Message resultMsg = sm.mHandler.mResultMsg;
sm.recycle();
return resultMsg;
}