diff options
| author | Ashok Bhat <ashok.bhat@arm.com> | 2014-01-27 16:00:23 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-02-21 13:02:34 +0000 |
| commit | 17ab38f8a87bc90eab11373f878f220ce3031de6 (patch) | |
| tree | 85e10af9fa5b4cc58f8117c66f118adf8b93c195 /core/java | |
| parent | e1abfdf711ce9ff3b15ff1b4d86531f5a8dd3dec (diff) | |
| download | frameworks_base-17ab38f8a87bc90eab11373f878f220ce3031de6.zip frameworks_base-17ab38f8a87bc90eab11373f878f220ce3031de6.tar.gz frameworks_base-17ab38f8a87bc90eab11373f878f220ce3031de6.tar.bz2 | |
AArch64: Make AssetAtlasService 64-bit compatible
Changes in this patch include
[x] Long(64-bit) is used to store native pointers in
AssetAtlasService and related classes as they can be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
(cherry-picked from 4de3f481bc59ab4b766dc027e41aff7cda9d62f7)
Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/GLES20Canvas.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/GLRenderer.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/IAssetAtlas.aidl | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index 2ed0cba..a08d83a 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -351,11 +351,11 @@ class GLES20Canvas extends HardwareCanvas { // Atlas /////////////////////////////////////////////////////////////////////////// - static void initAtlas(GraphicBuffer buffer, int[] map) { + static void initAtlas(GraphicBuffer buffer, long[] map) { nInitAtlas(buffer, map, map.length); } - private static native void nInitAtlas(GraphicBuffer buffer, int[] map, int count); + private static native void nInitAtlas(GraphicBuffer buffer, long[] map, int count); /////////////////////////////////////////////////////////////////////////// // Display list diff --git a/core/java/android/view/GLRenderer.java b/core/java/android/view/GLRenderer.java index d61c4b1..b758930 100644 --- a/core/java/android/view/GLRenderer.java +++ b/core/java/android/view/GLRenderer.java @@ -271,7 +271,7 @@ public class GLRenderer extends HardwareRenderer { if (atlas.isCompatible(android.os.Process.myPpid())) { GraphicBuffer buffer = atlas.getBuffer(); if (buffer != null) { - int[] map = atlas.getMap(); + long[] map = atlas.getMap(); if (map != null) { GLES20Canvas.initAtlas(buffer, map); } diff --git a/core/java/android/view/IAssetAtlas.aidl b/core/java/android/view/IAssetAtlas.aidl index 5f1e238..edce059 100644 --- a/core/java/android/view/IAssetAtlas.aidl +++ b/core/java/android/view/IAssetAtlas.aidl @@ -45,10 +45,10 @@ interface IAssetAtlas { * if the atlas is not available yet. * * Each bitmap is represented by several entries in the array: - * int0: SkBitmap*, the native bitmap object - * int1: x position - * int2: y position - * int3: rotated, 1 if the bitmap must be rotated, 0 otherwise + * long0: SkBitmap*, the native bitmap object + * long1: x position + * long2: y position + * long3: rotated, 1 if the bitmap must be rotated, 0 otherwise */ - int[] getMap(); + long[] getMap(); } |