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

Commit 40fa1050 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[MQ] Fix NPE on getDefaultPictureProfileHandleValue" into main

parents 3d0f1522 af3fd5e5

services/core/java/com/android/server/media/quality/MediaQualityService.java

+8 −4
Original line number Diff line number Diff line
@@ -664,10 +664,14 @@ public class MediaQualityService extends SystemService { 
                    value = mPackageDefaultPictureProfileHandleMap.get(packageName);



                    if (value == null) {

                        Long defaultPictureProfileId = mPictureProfileSharedPreference.getLong(

                                DEFAULT_PICTURE_PROFILE_ID, -1);

                        if (defaultPictureProfileId != -1) {

                          Log.v(TAG,

                                "Package default for " + packageName

                                        + " fallback to global default.");

                        value = getDefaultPictureProfile().getHandle().getId();

                                  "Default picture profile handle value for " + packageName

                                  + " not found. Fallback to return global default.");

                          value = defaultPictureProfileId;

                        }

                    }



                    if (value != null) {