Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cdbfaf4 authored by Diego Perez's avatar Diego Perez Committed by android-build-merger
Browse files

Merge "Remove auto-boxing during the inflate" into mnc-ub-dev 

am: 1c442aca

* commit '1c442aca':
  Remove auto-boxing during the inflate
parents 724af9ce 1c442aca

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

+3 −3
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ public final class BridgeContext extends Context { 
                    pushParser(blockParser);

                    return Pair.of(

                            mBridgeInflater.inflate(blockParser, parent, attachToRoot),

                            true);

                            Boolean.TRUE);

                } finally {

                    popParser();

                }
@@ -447,7 +447,7 @@ public final class BridgeContext extends Context { 
                        pushParser(blockParser);

                        return Pair.of(

                                mBridgeInflater.inflate(blockParser, parent, attachToRoot),

                                false);

                                Boolean.FALSE);

                    } finally {

                        popParser();

                    }
@@ -470,7 +470,7 @@ public final class BridgeContext extends Context { 
                            resource.getName()), null);

        }



        return Pair.of(null, false);

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

    }



    @SuppressWarnings("deprecation")

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java

+2 −2
Original line number Diff line number Diff line
@@ -117,11 +117,11 @@ abstract class CustomBar extends LinearLayout { 
                density = iconLoader.getDensity();

                String path = iconLoader.getPath();

                // look for a cached bitmap

                Bitmap bitmap = Bridge.getCachedBitmap(path, true /*isFramework*/);

                Bitmap bitmap = Bridge.getCachedBitmap(path, Boolean.TRUE /*isFramework*/);

                if (bitmap == null) {

                    try {

                        bitmap = Bitmap_Delegate.createBitmap(stream, false /*isMutable*/, density);

                        Bridge.setCachedBitmap(path, bitmap, true /*isFramework*/);

                        Bridge.setCachedBitmap(path, bitmap, Boolean.TRUE /*isFramework*/);

                    } catch (IOException e) {

                        return;

                    }