filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: We don't need to check for verbose logging everywhere

Browse Source 
We can just do this in the actual method

Change-Id: I80e89b0ab97926749851628b1bd34e8cd9dc82f2
This commit is contained in:
Michael W
2025-04-10 16:08:50 +02:00
parent 8613b6bcc8
commit c4bbba9441
39 changed files with 293 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/com/android/messaging/util/ImageUtils.java
View File

@@ -577,8 +577,6 @@ public class ImageUtils {
* @return whether the image can be down subsampled
*/
private boolean canBeCompressed() {
final boolean logv = LogUtil.isLoggable(LogUtil.BUGLE_IMAGE_TAG, LogUtil.VERBOSE);
int imageHeight = mHeight;
int imageWidth = mWidth;
@@ -611,13 +609,11 @@ public class ImageUtils {
Assert.fail("Image cannot be resized"); // http://b/18926934
return false;
}
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"computeInitialSampleSize: Increasing sampleSize to " + sampleSize
+ " as h=" + imageHeight + " vs " + heightLimitWithSlop
+ " w=" + imageWidth + " vs " + widthLimitWithSlop
+ " p=" + imageHeight * imageWidth + " vs " + pixelLimit);
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"computeInitialSampleSize: Increasing sampleSize to " + sampleSize
+ " as h=" + imageHeight + " vs " + heightLimitWithSlop
+ " w=" + imageWidth + " vs " + widthLimitWithSlop
+ " p=" + imageHeight * imageWidth + " vs " + pixelLimit);
imageHeight = mHeight / sampleSize;
imageWidth = mWidth / sampleSize;
fits = (imageHeight < heightLimitWithSlop &&
@@ -625,13 +621,11 @@ public class ImageUtils {
imageHeight * imageWidth < pixelLimit);
}
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"computeInitialSampleSize: Initial sampleSize " + sampleSize
+ " for h=" + imageHeight + " vs " + heightLimitWithSlop
+ " w=" + imageWidth + " vs " + widthLimitWithSlop
+ " p=" + imageHeight * imageWidth + " vs " + pixelLimit);
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"computeInitialSampleSize: Initial sampleSize " + sampleSize
+ " for h=" + imageHeight + " vs " + heightLimitWithSlop
+ " w=" + imageWidth + " vs " + widthLimitWithSlop
+ " p=" + imageHeight * imageWidth + " vs " + pixelLimit);
mSampleSize = sampleSize;
return true;
@@ -646,12 +640,9 @@ public class ImageUtils {
byte[] encoded = null;
try {
final ContentResolver cr = mContext.getContentResolver();
final boolean logv = LogUtil.isLoggable(LogUtil.BUGLE_IMAGE_TAG, LogUtil.VERBOSE);
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG, "getResizedImageData: attempt=" + attempt
+ " limit (w=" + mWidthLimit + " h=" + mHeightLimit + ") quality="
+ mQuality + " scale=" + mScaleFactor + " sampleSize=" + mSampleSize);
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG, "getResizedImageData: attempt=" + attempt
+ " limit (w=" + mWidthLimit + " h=" + mHeightLimit + ") quality="
+ mQuality + " scale=" + mScaleFactor + " sampleSize=" + mSampleSize);
if (mScaled == null) {
if (mDecoded == null) {
mOptions.inSampleSize = mSampleSize;
@@ -661,17 +652,13 @@ public class ImageUtils {
// Ignore
}
if (mDecoded == null) {
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: got empty decoded bitmap");
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: got empty decoded bitmap");
return null;
}
}
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG, "getResizedImageData: decoded w,h="
+ mDecoded.getWidth() + "," + mDecoded.getHeight());
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG, "getResizedImageData: decoded w,h="
+ mDecoded.getWidth() + "," + mDecoded.getHeight());
// Make sure to scale the decoded image if dimension is not within limit
final int decodedWidth = mDecoded.getWidth();
final int decodedHeight = mDecoded.getHeight();
@@ -693,23 +680,19 @@ public class ImageUtils {
mScaled = Bitmap.createBitmap(mDecoded, 0, 0, decodedWidth, decodedHeight,
mMatrix, false /* filter */);
if (mScaled == null) {
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: got empty scaled bitmap");
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: got empty scaled bitmap");
return null;
}
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG, "getResizedImageData: scaled w,h="
+ mScaled.getWidth() + "," + mScaled.getHeight());
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG, "getResizedImageData: scaled w,h="
+ mScaled.getWidth() + "," + mScaled.getHeight());
} else {
mScaled = mDecoded;
}
}
// Now encode it at current quality
encoded = ImageUtils.bitmapToBytes(mScaled, mQuality);
if (encoded != null && logv) {
if (encoded != null) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: Encoded down to " + encoded.length + "@"
+ mScaled.getWidth() + "/" + mScaled.getHeight() + "~"
@@ -729,7 +712,6 @@ public class ImageUtils {
* @param currentSize encoded image size (will be 0 if OOM)
*/
private void updateRecodeParameters(final int currentSize) {
final boolean logv = LogUtil.isLoggable(LogUtil.BUGLE_IMAGE_TAG, LogUtil.VERBOSE);
// Only return data within the limit
if (currentSize > 0 &&
mQuality > MINIMUM_IMAGE_COMPRESSION_QUALITY) {
@@ -738,10 +720,8 @@ public class ImageUtils {
mQuality = Math.max(MINIMUM_IMAGE_COMPRESSION_QUALITY,
Math.min((int) (mQuality * Math.sqrt((1.0 * mByteLimit) / currentSize)),
(int) (mQuality * QUALITY_SCALE_DOWN_RATIO)));
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: Retrying at quality " + mQuality);
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: Retrying at quality " + mQuality);
} else if (currentSize > 0 &&
mScaleFactor < 2.0 * MIN_SCALE_DOWN_RATIO * MIN_SCALE_DOWN_RATIO) {
// JPEG compression failed to hit target size - need smaller image
@@ -751,10 +731,8 @@ public class ImageUtils {
// 2.0 / MIN_SCALE_DOWN_RATIO (arbitrary limit)
mQuality = IMAGE_COMPRESSION_QUALITY;
mScaleFactor = mScaleFactor / MIN_SCALE_DOWN_RATIO;
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: Retrying at scale " + mScaleFactor);
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: Retrying at scale " + mScaleFactor);
// Release scaled bitmap to trigger rescaling
if (mScaled != null && mScaled != mDecoded) {
mScaled.recycle();
@@ -764,19 +742,15 @@ public class ImageUtils {
// Then before we subsample try cleaning up our cached memory
Factory.get().reclaimMemory();
mHasReclaimedMemory = true;
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: Retrying after reclaiming memory ");
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: Retrying after reclaiming memory ");
} else {
// Last resort - subsample image by another factor of 2 and try again
mSampleSize = mSampleSize * 2;
mQuality = IMAGE_COMPRESSION_QUALITY;
mScaleFactor = 1.0f;
if (logv) {
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG,
"getResizedImageData: Retrying at sampleSize " + mSampleSize);
}
LogUtil.v(LogUtil.BUGLE_IMAGE_TAG, "getResizedImageData: Retrying at sampleSize "
+ mSampleSize);
// Release all bitmaps to trigger subsampling
if (mScaled != null && mScaled != mDecoded) {
mScaled.recycle();