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

Commit bc204078 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Use try-with-resource statement for dream metadata to ensure proper... 

Merge "Use try-with-resource statement for dream metadata to ensure proper cleanup." into tm-dev am: 2aa3ecaf am: 717707e3

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



Change-Id: I8a10990fccf4fa381b9451364472aa8f532d8146
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46f6ae0d 717707e3

core/java/android/service/dreams/DreamService.java

+10 −12
Original line number Diff line number Diff line
@@ -1130,18 +1130,16 @@ public class DreamService extends Service implements Window.Callback { 


        final PackageManager pm = context.getPackageManager();



        final TypedArray rawMetadata = readMetadata(pm, serviceInfo);

        try (TypedArray rawMetadata = readMetadata(pm, serviceInfo)) {

            if (rawMetadata == null) return null;



        final DreamMetadata metadata = new DreamMetadata(

            return new DreamMetadata(

                    convertToComponentName(rawMetadata.getString(

                            com.android.internal.R.styleable.Dream_settingsActivity), serviceInfo),

                    rawMetadata.getDrawable(

                            com.android.internal.R.styleable.Dream_previewImage),

                    rawMetadata.getBoolean(R.styleable.Dream_showClockAndComplications,

                            DEFAULT_SHOW_COMPLICATIONS));

        rawMetadata.recycle();

        return metadata;

        }

    }



    /**