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

Merge "LayoutLib: misc fix." into honeycomb

Browse Source
This commit is contained in:
Xavier Ducrohet
2011-01-11 15:34:44 -08:00
committed by Android (Google) Code Review
parent 0827e697a9 639e1bd352
commit 85de0087fc
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
View File

@@ -318,7 +318,7 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge {
t2 = t.getCause(); t2 = t.getCause();
} }
return new BridgeRenderSession(null, return new BridgeRenderSession(null,
ERROR_UNKNOWN.createResult(t2.getMessage(), t2)); ERROR_UNKNOWN.createResult(t2.getMessage(), t));
} }
} }

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
View File

@@ -170,7 +170,9 @@ public class BridgeRenderSession extends RenderSession {
/*package*/ BridgeRenderSession(RenderSessionImpl scene, Result lastResult) { /*package*/ BridgeRenderSession(RenderSessionImpl scene, Result lastResult) {
mSession = scene; mSession = scene;
mSession.setScene(this); if (scene != null) {
mSession.setScene(this);
}
mLastResult = lastResult; mLastResult = lastResult;
} }
} }