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

Commit 85de0087 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android (Google) Code Review
Browse files

Merge "LayoutLib: misc fix." into honeycomb

parents 0827e697 639e1bd3

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

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge { 
                t2 = t.getCause();

            }

            return new BridgeRenderSession(null,

                    ERROR_UNKNOWN.createResult(t2.getMessage(), t2));

                    ERROR_UNKNOWN.createResult(t2.getMessage(), t));

        }

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -170,7 +170,9 @@ public class BridgeRenderSession extends RenderSession { 


    /*package*/ BridgeRenderSession(RenderSessionImpl scene, Result lastResult) {

        mSession = scene;

        if (scene != null) {

            mSession.setScene(this);

        }

        mLastResult = lastResult;

    }

}