Merge "Close ParcelFileDesciptor properly" into sc-v2-dev (bae76ba7) · Commits · e / os / android_frameworks_base

core/java/android/app/WallpaperManager.java

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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.