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

Merge "Use try-with-resources to avoid accidentaly leaking unclosed objects." am: 943c640df3

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

Change-Id: I27f6a6b2cd7a21ae347caed7f08c75ecdd7f8367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-24 14:34:31 +00:00
committed by Automerger Merge Worker
parent a9e4df7b90 943c640df3
commit 7d07b0141a
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,9 +98,8 @@ public final class WallpaperInfo implements Parcelable {
ServiceInfo si = service.serviceInfo; ServiceInfo si = service.serviceInfo;
final PackageManager pm = context.getPackageManager(); final PackageManager pm = context.getPackageManager();
XmlResourceParser parser = null; try (XmlResourceParser parser = si.loadXmlMetaData(pm,
try { WallpaperService.SERVICE_META_DATA)) {
parser = si.loadXmlMetaData(pm, WallpaperService.SERVICE_META_DATA);
if (parser == null) { if (parser == null) {
throw new XmlPullParserException("No " throw new XmlPullParserException("No "
+ WallpaperService.SERVICE_META_DATA + " meta-data"); + WallpaperService.SERVICE_META_DATA + " meta-data");
@@ -159,8 +158,6 @@ public final class WallpaperInfo implements Parcelable {
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
throw new XmlPullParserException( throw new XmlPullParserException(
"Unable to create context for: " + si.packageName); "Unable to create context for: " + si.packageName);
} finally {
if (parser != null) parser.close();
} }
} }