diff options
author | Dianne Hackborn <hackbod@google.com> | 2009-11-16 18:05:34 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-16 18:05:34 -0800 |
commit | 24c9c9db9f9595fe465930a0321965a3df4602ab (patch) | |
tree | ad827f467edf732637c65a68831e7b7277add813 /tools | |
parent | 7f96f4563787cff835bc192a0743008934e854ce (diff) | |
parent | 9ddb7df88a62a131519264f75f5d6616ee11b6e6 (diff) | |
download | frameworks_base-24c9c9db9f9595fe465930a0321965a3df4602ab.zip frameworks_base-24c9c9db9f9595fe465930a0321965a3df4602ab.tar.gz frameworks_base-24c9c9db9f9595fe465930a0321965a3df4602ab.tar.bz2 |
am 9ddb7df8: Fix build.
Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-plus-aosp
* commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6':
Fix build.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java index 06dd96f..6c1b5b3 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeAssetManager.java @@ -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() { |