resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp

Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b

diff --cc tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
index 13d2ba1,f6abaa1..89d7e23
--- 1/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
--- 2/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
@@@ -314,14 -314,7 +314,14 @@@ public final class Bitmap_Delegate 
      }
  
      @LayoutlibDelegate
-     /*package*/ static void nativeReconfigure(int nativeBitmap, int width, int height,
++    /*package*/ static void nativeReconfigure(long nativeBitmap, int width, int height,
 +            int config, int allocSize) {
 +        Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,
 +                "Bitmap.reconfigure() is not supported", null /*data*/);
 +    }
 +
 +    @LayoutlibDelegate
-     /*package*/ static boolean nativeCompress(int nativeBitmap, int format, int quality,
+     /*package*/ static boolean nativeCompress(long nativeBitmap, int format, int quality,
              OutputStream stream, byte[] tempStorage) {
          Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,
                  "Bitmap.compress() is not supported", null /*data*/);
@@@ -349,7 -342,29 +349,7 @@@
      }
  
      @LayoutlibDelegate
-     /*package*/ static int nativeRowBytes(int nativeBitmap) {
 -    /*package*/ static int nativeWidth(long nativeBitmap) {
 -        // get the delegate from the native int.
 -        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
 -        if (delegate == null) {
 -            return 0;
 -        }
 -
 -        return delegate.mImage.getWidth();
 -    }
 -
 -    @LayoutlibDelegate
 -    /*package*/ static int nativeHeight(long nativeBitmap) {
 -        // get the delegate from the native int.
 -        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
 -        if (delegate == null) {
 -            return 0;
 -        }
 -
 -        return delegate.mImage.getHeight();
 -    }
 -
 -    @LayoutlibDelegate
+     /*package*/ static int nativeRowBytes(long nativeBitmap) {
          // get the delegate from the native int.
          Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
          if (delegate == null) {
@@@ -393,8 -408,7 +393,8 @@@
      }
  
      @LayoutlibDelegate
-     /*package*/ static int nativeGetPixel(int nativeBitmap, int x, int y,
 -    /*package*/ static int nativeGetPixel(long nativeBitmap, int x, int y) {
++    /*package*/ static int nativeGetPixel(long nativeBitmap, int x, int y,
 +            boolean isPremultiplied) {
          // get the delegate from the native int.
          Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
          if (delegate == null) {
@@@ -406,8 -419,8 +406,8 @@@
      }
  
      @LayoutlibDelegate
-     /*package*/ static void nativeGetPixels(int nativeBitmap, int[] pixels, int offset,
+     /*package*/ static void nativeGetPixels(long nativeBitmap, int[] pixels, int offset,
 -            int stride, int x, int y, int width, int height) {
 +            int stride, int x, int y, int width, int height, boolean isPremultiplied) {
          Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
          if (delegate == null) {
              return;
@@@ -418,8 -431,7 +418,8 @@@
  
  
      @LayoutlibDelegate
-     /*package*/ static void nativeSetPixel(int nativeBitmap, int x, int y, int color,
 -    /*package*/ static void nativeSetPixel(long nativeBitmap, int x, int y, int color) {
++    /*package*/ static void nativeSetPixel(long nativeBitmap, int x, int y, int color,
 +            boolean isPremultiplied) {
          Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
          if (delegate == null) {
              return;
@@@ -429,8 -441,8 +429,8 @@@
      }
  
      @LayoutlibDelegate
-     /*package*/ static void nativeSetPixels(int nativeBitmap, int[] colors, int offset,
+     /*package*/ static void nativeSetPixels(long nativeBitmap, int[] colors, int offset,
 -            int stride, int x, int y, int width, int height) {
 +            int stride, int x, int y, int width, int height, boolean isPremultiplied) {
          Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
          if (delegate == null) {
              return;

diff --cc tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java
index b513463,a5c52e5..38745ce
--- 1/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java
--- 2/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java
@@@ -167,8 -167,7 +167,8 @@@ public final class NinePatch_Delegate 
          return sManager.addNewDelegate(newDelegate);
      }
  
-     /*package*/ static void nativeFinalize(int chunk) {
 +    @LayoutlibDelegate
+     /*package*/ static void nativeFinalize(long chunk) {
          sManager.removeJavaReferenceFor(chunk);
      }
  

diff --cc tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java
index 9d80be9,f3b56d9..4e9c129
--- 1/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java
--- 2/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java
@@@ -474,13 -474,7 +474,13 @@@ public final class Path_Delegate 
      }
  
      @LayoutlibDelegate
-     /*package*/ static boolean native_op(int nPath1, int nPath2, int op, int result) {
++    /*package*/ static boolean native_op(long nPath1, long nPath2, int op, int result) {
 +        Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "Path.op() not supported", null);
 +        return false;
 +    }
 +
 +    @LayoutlibDelegate
-     /*package*/ static void finalizer(int nPath) {
+     /*package*/ static void finalizer(long nPath) {
          sManager.removeJavaReferenceFor(nPath);
      }