From 7ddc9d0747f488807d8e94960b30691ea73fb50a Mon Sep 17 00:00:00 2001
From: Bhavuk Jain <bhavukj@google.com>
Date: Wed, 24 May 2023 04:46:16 +0000
Subject: [PATCH] Added null check while fetching the context URI resource

This CL aims at adding a null check before we convert the fetched URI
character sequence to string format.

Bug: b/257012915
Test: Tested by building and flashing on local, and seeing everything
works okay as expected before for 3P livewallpapers.

Change-Id: Id90367ee16d479591e524d7c2c5774ec3c483628
---
 core/java/android/app/WallpaperInfo.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/java/android/app/WallpaperInfo.java b/core/java/android/app/WallpaperInfo.java
index 99d406446dae8..b29e73a717f48 100644
--- a/core/java/android/app/WallpaperInfo.java
+++ b/core/java/android/app/WallpaperInfo.java
@@ -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());
     }
 
     /**