Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp

Browse Source 
Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
This commit is contained in:
Narayan Kamath
2014-01-31 12:08:17 +00:00
parent 643be3bab1 cb7cdd5053
commit 98ac6c79a4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java
View File

@@ -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;
}

2
tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
View File

@@ -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;

2
tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java
View File

@@ -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;