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

Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-19 21:26:30 +00:00
committed by Android (Google) Code Review
parent 319336eae8 4c5f09cab3
commit 9edf1a7140
1 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1402,27 +1402,18 @@ public class WallpaperManager {
mContext.getUserId());
if (fd != null) {
FileOutputStream fos = null;
final Bitmap tmp = BitmapFactory.decodeStream(resources.openRawResource(resid));
boolean ok = false;
try {
// If the stream can't be decoded, treat it as an invalid input.
if (tmp != null) {
fos = new ParcelFileDescriptor.AutoCloseOutputStream(fd);
tmp.compress(Bitmap.CompressFormat.PNG, 100, fos);
// The 'close()' is the trigger for any server-side image manipulation,
// so we must do that before waiting for completion.
fos.close();
completion.waitForCompletion();
} else {
throw new IllegalArgumentException(
"Resource 0x" + Integer.toHexString(resid) + " is invalid");
}
fos = new ParcelFileDescriptor.AutoCloseOutputStream(fd);
copyStreamToWallpaperFile(resources.openRawResource(resid), fos);
// The 'close()' is the trigger for any server-side image manipulation,
// so we must do that before waiting for completion.
fos.close();
completion.waitForCompletion();
} finally {
// Might be redundant but completion shouldn't wait unless the write
// succeeded; this is a fallback if it threw past the close+wait.
IoUtils.closeQuietly(fos);
if (tmp != null) {
tmp.recycle();
}
}
}
} catch (RemoteException e) {
@@ -1664,22 +1655,13 @@ public class WallpaperManager {
result, which, completion, mContext.getUserId());
if (fd != null) {
FileOutputStream fos = null;
final Bitmap tmp = BitmapFactory.decodeStream(bitmapData);
try {
// If the stream can't be decoded, treat it as an invalid input.
if (tmp != null) {
fos = new ParcelFileDescriptor.AutoCloseOutputStream(fd);
tmp.compress(Bitmap.CompressFormat.PNG, 100, fos);
fos.close();
completion.waitForCompletion();
} else {
throw new IllegalArgumentException("InputStream is invalid");
}
fos = new ParcelFileDescriptor.AutoCloseOutputStream(fd);
copyStreamToWallpaperFile(bitmapData, fos);
fos.close();
completion.waitForCompletion();
} finally {
IoUtils.closeQuietly(fos);
if (tmp != null) {
tmp.recycle();
}
}
}
} catch (RemoteException e) {