diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-31 15:06:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-31 15:06:17 +0000 |
| commit | 54b100ceedfe29c3d8f389437c0abb91160923d0 (patch) | |
| tree | 1009727e9d12a2d5f319295bb61a0074deba24e6 /tools/layoutlib | |
| parent | cb6979acf9794a30ede4b888a078b728c913bb16 (diff) | |
| parent | 98ac6c79a430e62a886b3a8278694425b5906300 (diff) | |
| download | frameworks_base-54b100ceedfe29c3d8f389437c0abb91160923d0.zip frameworks_base-54b100ceedfe29c3d8f389437c0abb91160923d0.tar.gz frameworks_base-54b100ceedfe29c3d8f389437c0abb91160923d0.tar.bz2 | |
am 98ac6c79: resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp
* commit '98ac6c79a430e62a886b3a8278694425b5906300':
Fix a few more delegate methods in layoutlib.
Diffstat (limited to 'tools/layoutlib')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java index d85c3d1..06673c1 100644 --- a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java @@ -102,7 +102,7 @@ import java.util.Set; } @LayoutlibDelegate - /*package*/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts) { + /*package*/ static Bitmap nativeDecodeAsset(long asset, Rect padding, Options opts) { opts.inBitmap = null; return null; } |