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

am 85de0087: Merge "LayoutLib: misc fix." into honeycomb

Browse Source 
* commit '85de0087fc6a65a66d3994f0b8dd3fecd9db2526':
  LayoutLib: misc fix.
This commit is contained in:
Xavier Ducrohet
2011-01-11 15:37:21 -08:00
committed by Android Git Automerger
parent d22f714973 85de0087fc
commit 4eca262902
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();
}
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) {
mSession = scene;
mSession.setScene(this);
if (scene != null) {
mSession.setScene(this);
}
mLastResult = lastResult;
}
}