Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0878ed30 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android Build Coastguard Worker
Browse files

Prevent null entries in mDeviceSuggestions 

Bug: 444456059
Flag: EXEMPT BUGFIX
Test: Presubmit (NPE fix)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:054a7e13ac902ac374d71c7040f0cbc153bb12c0
Merged-In: I8be949bc421d3e0d87f3e85824fc780f3eef664c
Change-Id: I8be949bc421d3e0d87f3e85824fc780f3eef664c
parent 3228688a

services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java

+9 −3
Original line number Diff line number Diff line
@@ -2896,12 +2896,18 @@ class MediaRouter2ServiceImpl { 
         * Updates the device suggestions for the given suggesting package.

         *

         * @param suggestingPackageName The package name of the suggesting app.

         * @param deviceSuggestions The device suggestions.

         * @param deviceSuggestions The device suggestions. May be null if the caller is clearing

         *     out their suggestions.

         */

        @GuardedBy("mLock")

        public void putDeviceSuggestionsLocked(

                String suggestingPackageName, List<SuggestedDeviceInfo> deviceSuggestions) {

                String suggestingPackageName,

                @Nullable List<SuggestedDeviceInfo> deviceSuggestions) {

            if (deviceSuggestions != null) {

                mDeviceSuggestions.put(suggestingPackageName, deviceSuggestions);

            } else {

                mDeviceSuggestions.remove(suggestingPackageName);

            }

        }



        /**