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

Merge "Close ParcelFileDesciptor properly" into sc-v2-dev am: bae76ba745

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

Change-Id: Ifc4e740a0b1576a7ae615d1b296aa2b3456ecd11
This commit is contained in:
TreeHugger Robot
2021-11-02 10:17:20 +00:00
committed by Automerger Merge Worker
parent 17ddd9db75 bae76ba745
commit b1cde22071
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/WallpaperManager.java
View File

@@ -586,12 +586,12 @@ public class WallpaperManager {
Rect dimensions = null; Rect dimensions = null;
synchronized (this) { synchronized (this) {
ParcelFileDescriptor pfd = null;
try { try {
Bundle params = new Bundle(); Bundle params = new Bundle();
pfd = mService.getWallpaperWithFeature(context.getOpPackageName(),
context.getAttributionTag(), this, FLAG_SYSTEM, params, userId);
// Let's peek user wallpaper first. // Let's peek user wallpaper first.
ParcelFileDescriptor pfd = mService.getWallpaperWithFeature(
context.getOpPackageName(), context.getAttributionTag(), this,
FLAG_SYSTEM, params, userId);
if (pfd != null) { if (pfd != null) {
BitmapFactory.Options options = new BitmapFactory.Options(); BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true; options.inJustDecodeBounds = true;
@@ -600,6 +600,13 @@ public class WallpaperManager {
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
Log.w(TAG, "peek wallpaper dimensions failed", ex); Log.w(TAG, "peek wallpaper dimensions failed", ex);
} finally {
if (pfd != null) {
try {
pfd.close();
} catch (IOException ignored) {
}
}
} }
} }
// If user wallpaper is unavailable, may be the default one instead. // If user wallpaper is unavailable, may be the default one instead.