drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 43e9eb28: am 9ddb7df8: Fix build.

Browse Source 
Merge commit '43e9eb28ab9a246472149384567f505434f492a3' into eclair-mr2-plus-aosp

* commit '43e9eb28ab9a246472149384567f505434f492a3':
  Fix build.
This commit is contained in:
Dianne Hackborn
2009-11-16 20:04:59 -08:00
committed by Android Git Automerger
parent 1ff57418a7 43e9eb28ab
commit fe11d1a7a5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java
View File

@ -32,21 +32,21 @@ public class BridgeAssetManager extends AssetManager {
* {@link Bridge} calls this method after setting up a new bridge.
*/
/*package*/ static AssetManager initSystem() {
if (!(AssetManager.mSystem instanceof BridgeAssetManager)) {
if (!(AssetManager.sSystem instanceof BridgeAssetManager)) {
// Note that AssetManager() creates a system AssetManager and we override it
// with our BridgeAssetManager.
AssetManager.mSystem = new BridgeAssetManager();
AssetManager.mSystem.makeStringBlocks(false);
AssetManager.sSystem = new BridgeAssetManager();
AssetManager.sSystem.makeStringBlocks(false);
}
return AssetManager.mSystem;
return AssetManager.sSystem;
}
/**
* Clears the static {@link AssetManager#mSystem} to make sure we don't leave objects
* Clears the static {@link AssetManager#sSystem} to make sure we don't leave objects
* around that would prevent us from unloading the library.
*/
/*package*/ static void clearSystem() {
AssetManager.mSystem = null;
AssetManager.sSystem = null;
}
private BridgeAssetManager() {