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

Merge "Merge "Use try-with-resources to avoid accidentaly leaking unclosed objects." am: 943c640df3 am: 7d07b0141a am: 24bb226422" into udc-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2023-04-24 16:02:08 +00:00
committed by Android (Google) Code Review
parent 96ef46ddd7 fa6bb81bd0
commit 320254a2cd
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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");
@@ -111,7 +110,7 @@ public final class WallpaperInfo implements Parcelable {
AttributeSet attrs = Xml.asAttributeSet(parser); AttributeSet attrs = Xml.asAttributeSet(parser);
int type; int type;
while ((type=parser.next()) != XmlPullParser.END_DOCUMENT while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
&& type != XmlPullParser.START_TAG) { && type != XmlPullParser.START_TAG) {
} }
@@ -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();
} }
} }