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

Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev

Browse Source
This commit is contained in:
Paul Jensen
2015-05-07 15:30:46 +00:00
committed by Android (Google) Code Review
parent fa21641122 d0d420587a
commit ffe2dda135
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -462,10 +462,8 @@ public class AsyncChannel {
} catch(Exception e) { } catch(Exception e) {
} }
// Tell source we're disconnected. // Tell source we're disconnected.
if (mSrcHandler != null) { replyDisconnected(STATUS_SUCCESSFUL);
replyDisconnected(STATUS_SUCCESSFUL); mSrcHandler = null;
mSrcHandler = null;
}
// Unlink only when bindService isn't used // Unlink only when bindService isn't used
if (mConnection == null && mDstMessenger != null && mDeathMonitor!= null) { if (mConnection == null && mDstMessenger != null && mDeathMonitor!= null) {
mDstMessenger.getBinder().unlinkToDeath(mDeathMonitor, 0); mDstMessenger.getBinder().unlinkToDeath(mDeathMonitor, 0);
@@ -871,6 +869,8 @@ public class AsyncChannel {
* @param status to be stored in msg.arg1 * @param status to be stored in msg.arg1
*/ */
private void replyDisconnected(int status) { private void replyDisconnected(int status) {
// Can't reply if already disconnected. Avoid NullPointerException.
if (mSrcHandler == null) return;
Message msg = mSrcHandler.obtainMessage(CMD_CHANNEL_DISCONNECTED); Message msg = mSrcHandler.obtainMessage(CMD_CHANNEL_DISCONNECTED);
msg.arg1 = status; msg.arg1 = status;
msg.obj = this; msg.obj = this;