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

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

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

Change-Id: Ibf9d3fa20ca99852eeec2a44d51b2e4ff863144b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Silva
2022-06-03 14:28:15 +00:00
committed by Automerger Merge Worker
parent 7811330b58 2aa3ecaf9e
commit 11d36d2ff3
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/service/dreams/DreamService.java
View File

@@ -1130,18 +1130,16 @@ public class DreamService extends Service implements Window.Callback {
final PackageManager pm = context.getPackageManager(); final PackageManager pm = context.getPackageManager();
final TypedArray rawMetadata = readMetadata(pm, serviceInfo); try (TypedArray rawMetadata = readMetadata(pm, serviceInfo)) {
if (rawMetadata == null) return null; if (rawMetadata == null) return null;
return new DreamMetadata(
final DreamMetadata metadata = new DreamMetadata(
convertToComponentName(rawMetadata.getString( convertToComponentName(rawMetadata.getString(
com.android.internal.R.styleable.Dream_settingsActivity), serviceInfo), com.android.internal.R.styleable.Dream_settingsActivity), serviceInfo),
rawMetadata.getDrawable( rawMetadata.getDrawable(
com.android.internal.R.styleable.Dream_previewImage), com.android.internal.R.styleable.Dream_previewImage),
rawMetadata.getBoolean(R.styleable.Dream_showClockAndComplications, rawMetadata.getBoolean(R.styleable.Dream_showClockAndComplications,
DEFAULT_SHOW_COMPLICATIONS)); DEFAULT_SHOW_COMPLICATIONS));
rawMetadata.recycle(); }
return metadata;
} }
/** /**