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 
am: f5984d5fce

* commit 'f5984d5fce511a669e8d4bb6eaeb9679ff2ba9f0':
  Fix custom font rendering
This commit is contained in:
Deepanshu Gupta
2016-01-15 00:19:08 +00:00
committed by android-build-merger
parent bbd0b324ba f5984d5fce
commit 14df39f9e5
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;
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();