From 1901f50dcf480c057a3096827eafde88764f88b5 Mon Sep 17 00:00:00 2001 From: SongFerng Wang Date: Tue, 8 Aug 2023 08:44:44 +0000 Subject: [PATCH] Fix NullPointerException of LocalMediaManager Bug: LocalMediaManager Test: build pass Change-Id: Ib53cb11d28669486573777be992711200a39cd85 --- .../android/settings/media/MediaOutputIndicatorWorker.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/media/MediaOutputIndicatorWorker.java b/src/com/android/settings/media/MediaOutputIndicatorWorker.java index bf1e06e4e0c..7c299c6bbbc 100644 --- a/src/com/android/settings/media/MediaOutputIndicatorWorker.java +++ b/src/com/android/settings/media/MediaOutputIndicatorWorker.java @@ -157,7 +157,11 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements return mMediaDevices; } + @Nullable public MediaDevice getCurrentConnectedMediaDevice() { + if (mLocalMediaManager == null) { + return null; + } return mLocalMediaManager.getCurrentConnectedDevice(); }