Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24bb2264 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use try-with-resources to avoid accidentaly leaking unclosed objects."... 

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

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



Change-Id: Ib413266f6080e4ad5bec6d683dc5daac2229cd2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 887a97be 7d07b014

core/java/android/app/WallpaperInfo.java

+9 −12
Original line number Diff line number Diff line
@@ -98,9 +98,8 @@ public final class WallpaperInfo implements Parcelable { 
        ServiceInfo si = service.serviceInfo;



        final PackageManager pm = context.getPackageManager();

        XmlResourceParser parser = null;

        try {

            parser = si.loadXmlMetaData(pm, WallpaperService.SERVICE_META_DATA);

        try (XmlResourceParser parser = si.loadXmlMetaData(pm,

                WallpaperService.SERVICE_META_DATA)) {

            if (parser == null) {

                throw new XmlPullParserException("No "

                        + WallpaperService.SERVICE_META_DATA + " meta-data");
@@ -159,8 +158,6 @@ public final class WallpaperInfo implements Parcelable { 
        } catch (NameNotFoundException e) {

            throw new XmlPullParserException(

                    "Unable to create context for: " + si.packageName);

        } finally {

            if (parser != null) parser.close();

        }

    }