commit | 719b05d7eba5a0388dcef36fce209b60feef8abe | [log] [tgz] |
---|---|---|
author | Sungsoo Lim <sungsoo@google.com> | Mon Feb 18 11:58:49 2019 +0900 |
committer | Sungsoo Lim <sungsoo@google.com> | Mon Feb 18 12:01:53 2019 +0900 |
tree | f8df0427a76d81fac4d49f98b40502c26f8a8c9f | |
parent | a524400e319c2e90e505cef7bb7bc884f8ef6b42 [diff] |
Fix NPE in MediaController2 Test: build Change-Id: Ibd48b1515afe639f58fd20198b67e828b2c20106
diff --git a/media/apex/java/android/media/MediaController2.java b/media/apex/java/android/media/MediaController2.java index e85d997..4ea384a 100644 --- a/media/apex/java/android/media/MediaController2.java +++ b/media/apex/java/android/media/MediaController2.java
@@ -317,7 +317,9 @@ isCanceled = !mRequestedCommandSeqNumbers.remove(seq); } if (isCanceled) { - resultReceiver.send(RESULT_INFO_SKIPPED, null); + if (resultReceiver != null) { + resultReceiver.send(RESULT_INFO_SKIPPED, null); + } return; } Session2Command.Result result = mCallback.onSessionCommand(