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

Commit abe5b29d authored by Bhavuk Jain's avatar Bhavuk Jain Committed by Automerger Merge Worker
Browse files

Merge "Added null check while fetching the context URI resource" into udc-dev... 

Merge "Added null check while fetching the context URI resource" into udc-dev am: 222f1e1a am: 18aaacce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23406924



Change-Id: Ia5fdf273113c1d60715b0e41e861ff383e76bad8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ddcf67c 18aaacce

core/java/android/app/WallpaperInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -289,12 +289,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());

    }



    /**