summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Collapse)AuthorAgeFilesLines
* am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related ↵Narayan Kamath2014-01-313-167/+177
|\ | | | | | | | | | | | | classes 64-bit compatible" * commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b': AArch64: Make AssetManager and related classes 64-bit compatible
| * AArch64: Make AssetManager and related classes 64-bit compatibleAshok Bhat2014-01-313-167/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following changes have been done: [x] Long is used to store native pointers as pointers can be 64-bit. [x] AssetManager openAsset native function returned -1 if file name was empty and java function considered any non-zero value as success. This has been fixed by native function throwing Illegal Argument Exception as well. [x] AssetManager incRefsLocked and decRefsLocked now accept long as input to support 64-bit native references. [x] AssetManager incRefsLocked method incorrecly used 'this.hashCode()' instead of the passed parameter id. This has been fixed. [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) Change-Id: I095b9f900d49e51f43ad6afc47cbc23116a6a64a Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set ↵Igor Murashkin2014-01-311-1/+1
|\ \ | |/ | | | | | | | | | | producerControlledByApp" * commit '4463a4ef26b2eb62fae74568193fd07e97dedd4d': EGL14.eglCreateWindowSurface should set producerControlledByApp
| * Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"Igor Murashkin2014-01-311-1/+1
| |\
| | * EGL14.eglCreateWindowSurface should set producerControlledByAppTakahiro Aizawa2013-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Interface of Surface class changed. To reflect the change for EGL14, add producerControlledByApp flag. Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788 Change-Id: Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0
* | | am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in ↵Narayan Kamath2014-01-311-12/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | PropertyValuesHolder" * commit '70986e197bbaf4de4f8126519a75df2b057c3b52': AArch64: Use of long for pointers in PropertyValuesHolder
| * | Merge "AArch64: Use of long for pointers in PropertyValuesHolder"Narayan Kamath2014-01-301-12/+12
| |\ \
| | * | AArch64: Use of long for pointers in PropertyValuesHolderAshok Bhat2014-01-291-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long is used in PropertyValuesHolder class to store native pointers as they can be 64-bit. Note that jmethodID, a pointer to structures, is also carried in long rather than int to support 64-bit system. Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"Narayan Kamath2014-01-311-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fa2e16e36d95d5cf0848a28a98ac4566321fc119': change Surface constructor arg to 64bit
| * | | change Surface constructor arg to 64bitChong Zhang2014-01-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12799017 Bug: 12799384 (cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1) Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03
* | | | am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."Nick Kralevich2014-01-311-1/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708': Map SELinux log levels to Android log levels.
| * | | Map SELinux log levels to Android log levels.Stephen Smalley2014-01-291-1/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."Narayan Kamath2014-01-291-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9ecada44042c49516d781281bbe0cba4e0af51a2': mNativeCanvas is long, not int.
| * | | Merge "mNativeCanvas is long, not int."Narayan Kamath2014-01-291-1/+1
| |\ \ \
| | * | | mNativeCanvas is long, not int.Narayan Kamath2014-01-291-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | swapNativeCanvas was asking for an int field. Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
* | | | am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-01-291-14/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | in graphics/Interpolator" * commit 'cdc095ae4850d9ffd08de0d6e8828949603fcdd1': AArch64: Use long for pointers in graphics/Interpolator
| * | | Merge "AArch64: Use long for pointers in graphics/Interpolator"Narayan Kamath2014-01-291-14/+19
| |\ \ \
| | * | | AArch64: Use long for pointers in graphics/InterpolatorAshok Bhat2014-01-161-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in android/graphics/Interpolator class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I1e181476a4fe5273ff190cf34c4a7487aa1aecf4 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | | am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-01-291-11/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | in SurfaceTexture" * commit 'e4fc5c17c092a77e0647e01e93a6b0e806c27692': AArch64: Use long for pointers in SurfaceTexture
| * | | | Merge "AArch64: Use long for pointers in SurfaceTexture"Narayan Kamath2014-01-291-11/+11
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | AArch64: Use long for pointers in SurfaceTextureAshok Bhat2014-01-161-11/+11
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long is used in SurfaceTexture class to store pointers as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I771aa62c42bc865e644c63fd48f309782dd03e73 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and ↵Narayan Kamath2014-01-292-99/+99
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Parcel 64-bit compatible" * commit 'e3e4b40577032f6fad38bfbeb9c2b40df89f0ef9': AArch64: Make Binder and Parcel 64-bit compatible
| * | | Merge "AArch64: Make Binder and Parcel 64-bit compatible"Narayan Kamath2014-01-292-99/+99
| |\ \ \
| | * | | AArch64: Make Binder and Parcel 64-bit compatibleAshok Bhat2014-01-232-99/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include [x] Long is used to store native pointers [x] Added new method obtain(long obj) to Parcel. Binder uses this method instead of obtain(int obj). [x] obtain(int) has been changed to throw unsupported operation exception. Change-Id: I408e0f2a24deb28c9277d86670653a51eb314266 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | | am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4dbMark Salyzyn2014-01-281-43/+41
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * commit 'd732f561b24e643676812855396d0c9b9138b4c8': jni: Resolve build warnings jni: Incorporate liblog reading API
| * | | | Merge changes I3659193f,I8b78e4dbMark Salyzyn2014-01-281-43/+41
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: jni: Resolve build warnings jni: Incorporate liblog reading API
| | * | | | jni: Resolve build warningsMark Salyzyn2014-01-271-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 087f58dd80e3296a53c6e3c74c089e9a0265f3bd) Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
| | * | | | jni: Incorporate liblog reading APIMark Salyzyn2014-01-271-39/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e11cbd441df4a1689c89b2ab91b84523c9f2fd10) Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
* | | | | | am be674bf6: am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-01-281-28/+46
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in graphics/Camera" * commit 'be674bf688fec9ce4ec04e77c93644be8253d273': AArch64: Use long for pointers in graphics/Camera
| * | | | | AArch64: Use long for pointers in graphics/CameraAshok Bhat2014-01-281-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ic05ebf2051a225a1638a43f476bab6176c0b5c38 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | | | am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes ↵Narayan Kamath2014-01-2828-1449/+2102
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64-bit compatible" * commit '7ae1726d0b962878cce4c1fe6c814a315f253293': AArch64: Make graphics classes 64-bit compatible
| * | | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-2828-1449/+2102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Long is used to store native pointers 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) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | | | am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in ↵Mathieu Chartier2014-01-271-6/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matrix.cpp." * commit '15594557f118f670e8d8523e9aed0df3345d28ca': Fix dest == src bugs in Matrix.cpp.
| * | | | | Merge "Fix dest == src bugs in Matrix.cpp."Mathieu Chartier2014-01-271-6/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix dest == src bugs in Matrix.cpp.Mathieu Chartier2014-01-251-6/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main bug was that the AutoJavaFloatArray autoSrc was not passing in read only. This meant that the destructor overwrote the data which the autoDst AutoJavaFloatArray had written in it's destructor. This case only happened if src == dest and the arrays were copies. Also improved performance by passing in read only a few other places. Bug: 12570144 Change-Id: Idc8764087dc165433c584b87a0f9d4ed0ec795e8
* | | | | am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be ↵Narayan Kamath2014-01-271-6/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | int32_t and not void*." * commit 'ebd43d46ebf53005ae60af59948f8ed634f9bafb': AssetManager cookies should be int32_t and not void*.
| * | | | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-6/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies are really indices into vectors and arrays, so they don't need to be void*. We choose int32_t instead of size_t to allow their width to be well specified. (cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7) (cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215) (cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd) Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
* | | | am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."Elliott Hughes2014-01-181-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052': Don't confuse stat and stat64.
| * | | Don't confuse stat and stat64.Elliott Hughes2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 11865851 Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
* | | | am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."Narayan Kamath2014-01-171-4/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e66fa5c1851f48dce95364dc0acbde1b9f39f160': Fix error checking in MemoryFile.
| * | | Fix error checking in MemoryFile.Narayan Kamath2014-01-161-4/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | mmap returns MAP_FAILED on failures, not 0 (NULL). Also, convert some C style casts to C++ since they make intent clearer. Change-Id: I367993c73e9ee576f11ebe76e530d2c2f27c662d
* | | am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-01-164-38/+38
|\ \ \ | |/ / | | | | | | | | | | | | | | | in view/input classes" * commit 'd569e21dac38fffe0e6a7f935e9a6965495b87d4': AArch64: Use long for pointers in view/input classes
| * | Merge "AArch64: Use long for pointers in view/input classes"Narayan Kamath2014-01-164-38/+38
| |\ \
| | * | AArch64: Use long for pointers in view/input classesAshok Bhat2014-01-094-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in view/input classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Iafda9f4653c023bcba95b873637d935d0b569f5d Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-01-161-14/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | in android/os/MessageQueue" * commit '42defa02337b94d25714fe737f749f2c3300c790': AArch64: Use long for pointers in android/os/MessageQueue
| * | | Merge "AArch64: Use long for pointers in android/os/MessageQueue"Narayan Kamath2014-01-161-14/+14
| |\ \ \
| | * | | AArch64: Use long for pointers in android/os/MessageQueueAshok Bhat2014-01-101-14/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long is used in android/os/MessageQueue class to store pointers as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I7e901b8515a5b5e3afe1dadaaf3e5c186955c2a0 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-01-161-36/+62
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | in graphics/PathMeasure" * commit '6b81bfd10f63c166ff6e4afb0f267ce9e5275366': AArch64: Use long for pointers in graphics/PathMeasure
| * | | Merge "AArch64: Use long for pointers in graphics/PathMeasure"Narayan Kamath2014-01-161-36/+62
| |\ \ \
| | * | | AArch64: Use long for pointers in graphics/PathMeasureAshok Bhat2014-01-131-36/+62
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in android/graphics/PathMeasure class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I4599a9d5f7dcf9c39838db96d9033059114d3a49 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
generated by cgit v1.1 at 2025-08-05 19:33:10 +0000