Merge "Remove auto-boxing during the inflate" into mnc-ub-dev (1c442aca) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -409,7 +409,7 @@ public final class BridgeContext extends Context {
	pushParser(blockParser);		pushParser(blockParser);
	return Pair.of(		return Pair.of(
	mBridgeInflater.inflate(blockParser, parent, attachToRoot),		mBridgeInflater.inflate(blockParser, parent, attachToRoot),
	true);		Boolean.TRUE);
	} finally {		} finally {
	popParser();		popParser();
	}		}
	@@ -447,7 +447,7 @@ public final class BridgeContext extends Context {
	pushParser(blockParser);		pushParser(blockParser);
	return Pair.of(		return Pair.of(
	mBridgeInflater.inflate(blockParser, parent, attachToRoot),		mBridgeInflater.inflate(blockParser, parent, attachToRoot),
	false);		Boolean.FALSE);
	} finally {		} finally {
	popParser();		popParser();
	}		}
	@@ -470,7 +470,7 @@ public final class BridgeContext extends Context {
	resource.getName()), null);		resource.getName()), null);
	}		}

	return Pair.of(null, false);		return Pair.of(null, Boolean.FALSE);
	}		}

	@SuppressWarnings("deprecation")		@SuppressWarnings("deprecation")

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -117,11 +117,11 @@ abstract class CustomBar extends LinearLayout {
	density = iconLoader.getDensity();		density = iconLoader.getDensity();
	String path = iconLoader.getPath();		String path = iconLoader.getPath();
	// look for a cached bitmap		// look for a cached bitmap
	Bitmap bitmap = Bridge.getCachedBitmap(path, true /isFramework/);		Bitmap bitmap = Bridge.getCachedBitmap(path, Boolean.TRUE /isFramework/);
	if (bitmap == null) {		if (bitmap == null) {
	try {		try {
	bitmap = Bitmap_Delegate.createBitmap(stream, false /isMutable/, density);		bitmap = Bitmap_Delegate.createBitmap(stream, false /isMutable/, density);
	Bridge.setCachedBitmap(path, bitmap, true /isFramework/);		Bridge.setCachedBitmap(path, bitmap, Boolean.TRUE /isFramework/);
	} catch (IOException e) {		} catch (IOException e) {
	return;		return;
	}		}