diff options
| author | Jin Seok Park <jinpark@google.com> | 2021-06-15 11:37:10 +0900 |
|---|---|---|
| committer | Jin Seok Park <jinpark@google.com> | 2021-06-15 06:36:38 +0000 |
| commit | 6d62a4711f65df22b7ee524e6352ae579089f6e2 (patch) | |
| tree | 09903e6009f42f046c4f31dcbd9fa32c570eaf5d | |
| parent | d53354eb95a8e4183e999d087495cd739a14df79 (diff) | |
Check nullity of ResultReceiver
Bug: 182164496
Test: N/A
Change-Id: I96bdef1c79f8f91d33d6a6a734bc94e162a5ea33
(cherry picked from commit 2d12628ecc78fdbd5c04bf40d2110c5cc91a9e58)
| -rw-r--r-- | apex/media/framework/java/android/media/MediaSession2.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apex/media/framework/java/android/media/MediaSession2.java b/apex/media/framework/java/android/media/MediaSession2.java index 7697359e7caf..e76d61cf8965 100644 --- a/apex/media/framework/java/android/media/MediaSession2.java +++ b/apex/media/framework/java/android/media/MediaSession2.java @@ -469,7 +469,9 @@ public class MediaSession2 implements AutoCloseable { } mCallbackExecutor.execute(() -> { if (!controllerInfo.removeRequestedCommandSeqNumber(seq)) { - resultReceiver.send(RESULT_INFO_SKIPPED, null); + if (resultReceiver != null) { + resultReceiver.send(RESULT_INFO_SKIPPED, null); + } return; } Session2Command.Result result = mCallback.onSessionCommand( |