diff options
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 7 | 
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java index f2d214c43135..a32128f656c4 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java @@ -196,7 +196,12 @@ public final class BridgeContext extends Context {          mRenderResources = renderResources;          mConfig = config; -        mAssets = new BridgeAssetManager(); +        AssetManager systemAssetManager = AssetManager.getSystem(); +        if (systemAssetManager instanceof BridgeAssetManager) { +            mAssets = (BridgeAssetManager) systemAssetManager; +        } else { +            throw new AssertionError("Creating BridgeContext without initializing Bridge"); +        }          mAssets.setAssetRepository(assets);          mApplicationInfo = new ApplicationInfo();  |