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

Commit 7ddc9d07 authored by Bhavuk Jain's avatar Bhavuk Jain
Browse files

Added null check while fetching the context URI resource 

This CL aims at adding a null check before we convert the fetched URI
character sequence to string format.

Bug: b/257012915
Test: Tested by building and flashing on local, and seeing everything
works okay as expected before for 3P livewallpapers.

Change-Id: Id90367ee16d479591e524d7c2c5774ec3c483628
parent aba85c44

core/java/android/app/WallpaperInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -292,12 +292,12 @@ public final class WallpaperInfo implements Parcelable { 
            packageName = mService.serviceInfo.packageName;

            applicationInfo = mService.serviceInfo.applicationInfo;

        }

        String contextUriString = pm.getText(

                packageName, mContextUriResource, applicationInfo).toString();

        if (contextUriString == null) {

        CharSequence contextUriCharSequence = pm.getText(

                packageName, mContextUriResource, applicationInfo);

        if (contextUriCharSequence == null) {

            return null;

        }

        return Uri.parse(contextUriString);

        return Uri.parse(contextUriCharSequence.toString());

    }



    /**