Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia5fdf273113c1d60715b0e41e861ff383e76bad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bhavuk Jain
2023-05-25 21:19:22 +00:00
committed by Automerger Merge Worker
parent 7ddcf67c3f 18aaacce4f
commit abe5b29d51
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/WallpaperInfo.java
View File

@@ -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());
}
/**