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

Commit 18aaacce 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 am: 222f1e1a 

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



Change-Id: I2b7fb1a73abe33f0049d1706e27f9bbe61b17694
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0046c1b 222f1e1a

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());

    }



    /**