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

Merge "Fix custom font rendering" into mnc-ub-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2016-01-14 23:48:17 +00:00
committed by Android (Google) Code Review
parent 1665a621da 2ea852541f
commit f5984d5fce
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -196,7 +196,12 @@ public final class BridgeContext extends Context {
mRenderResources = renderResources; mRenderResources = renderResources;
mConfig = config; 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); mAssets.setAssetRepository(assets);
mApplicationInfo = new ApplicationInfo(); mApplicationInfo = new ApplicationInfo();