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

Commit af3fd5e5 authored by Szu-An Lu's avatar Szu-An Lu
Browse files

[MQ] Fix NPE on getDefaultPictureProfileHandleValue 

After ag/34015918, calling package without permission will get null
result when calling getDefaultPictureProfile. This will stops apps using
MediaCodec to fetch default picture profile fallback to use global
default picture profile.

Use default profile id saved in mPictureProfileSharedPreference to avoid
permission requirement for general playback apps.

Flag: EXEMPT bug fix
Bug: 426480778
Test: play video content on 3P app and check global default is used
Change-Id: I263441ee52e8a311e7ae27dc084e18b1aabc2d56
parent 3cb9dadd

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) {