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

Commit ddbbc7de 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: I06c468366b1373dc140e8e8f01340cbf353b0866
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0fd8f2a 222f1e1a

core/java/android/app/WallpaperInfo.java

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

            packageName = mService.serviceInfo.packageName;

            applicationInfo = mService.serviceInfo.applicationInfo;

            applicationInfo = mService.serviceInfo.applicationInfo;

        }

        }

        String contextUriString = pm.getText(

        CharSequence contextUriCharSequence = pm.getText(

                packageName, mContextUriResource, applicationInfo).toString();

                packageName, mContextUriResource, applicationInfo);

        if (contextUriString == null) {

        if (contextUriCharSequence == null) {

            return null;

            return null;

        }

        }

        return Uri.parse(contextUriString);

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

    }

    }





    /**

    /**