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

Browse Source
This commit is contained in:
Bhavuk Jain
2023-05-25 20:19:39 +00:00
committed by Android (Google) Code Review
parent d6cc0131fd 7ddc9d0747
commit 222f1e1ab6
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

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