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

This commit is contained in:
Bhavuk Jain
2023-05-25 20:19:39 +00:00
committed by Android (Google) Code Review

View File

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