diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-31 12:08:17 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-01-31 12:08:17 +0000 |
| commit | 98ac6c79a430e62a886b3a8278694425b5906300 (patch) | |
| tree | 7258fdc1a9489c0130b82d54d80f9ad1ce5f24b8 | |
| parent | 643be3bab19a6305e776721854b293928bf2bfaa (diff) | |
| parent | cb7cdd5053ab37e3b606eb313e8b482a2047091a (diff) | |
| download | frameworks_base-98ac6c79a430e62a886b3a8278694425b5906300.zip frameworks_base-98ac6c79a430e62a886b3a8278694425b5906300.tar.gz frameworks_base-98ac6c79a430e62a886b3a8278694425b5906300.tar.bz2 | |
resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp
Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
3 files changed, 3 insertions, 3 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; } diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index ba771dd..3111f0d 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -786,7 +786,7 @@ public final class Canvas_Delegate { } @LayoutlibDelegate - /*package*/ static void native_drawPath(long nativeCanvas, int path, long paint) { + /*package*/ static void native_drawPath(long nativeCanvas, long path, long paint) { final Path_Delegate pathDelegate = Path_Delegate.getDelegate(path); if (pathDelegate == null) { return; diff --git a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java index 1d66586..ebfe9bc 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java @@ -654,7 +654,7 @@ public final class Matrix_Delegate { } @LayoutlibDelegate - /*package*/ static boolean native_invert(long native_object, int inverse) { + /*package*/ static boolean native_invert(long native_object, long inverse) { Matrix_Delegate d = sManager.getDelegate(native_object); if (d == null) { return false; |