summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Core/jni: Disallow relocation for decryption"Andreas Gampe2015-01-071-0/+8
|\
| * Core/jni: Disallow relocation for decryptionneo.chae2015-01-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decrypting a device, a tmpfs is temporarily mounted as /data, the size of which is usually small. When the zygote, system server and necessary apps are brought up, they will be compiled into the tmpfs. If the system image contains prebuilts, they will be relocated instead of compiled. This is unnecessary. In this special situation it is acceptable to run out of the prebuilt oat files without relocation, which can save space in the tmpfs. This patch ensures that the boot image is not being relocated. Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
* | Check for OOM in BitmapFactory's getMimeTypeString().Vladimir Marko2015-01-061-5/+10
| | | | | | | | | | Bug: 18909596 Change-Id: If65fe45f5fd569a99a0cae1d31117af262bca430
* | Merge "Fix comment. It should be 'or' not 'of'."Narayan Kamath2015-01-061-1/+1
|\ \ | |/ |/|
| * Fix comment. It should be 'or' not 'of'.Roger Hu2013-12-301-1/+1
| | | | | | | | Change-Id: Ie713e1072cd145a493480221d93e400d6d406a0e
* | Remove hardcoded include paths.Narayan Kamath2014-12-312-5/+0
| | | | | | | | | | | | | | | | | | ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS. The dependency on libc/dns/include was bogus and can be removed trivially. bug: 18581021 Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
* | Core/jni: Remove Dalvik options from AndroidRuntimeAndreas Gampe2014-12-221-205/+102
| | | | | | | | | | | | | | | | Dalvik is dead. Remove old command-line options from AndroidRuntime. Bug: 18833580 Bug: 18834205 Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
* | Move the remaining ZygoteInit native code over to Java.Elliott Hughes2014-12-173-114/+0
| | | | | | | | | | Bug: 18719692 Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
* | Rewrite selectReadable JNI in Java.Elliott Hughes2014-12-161-69/+0
| | | | | | | | | | Bug: 18719692 Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438
* | Reimplement reopenStdio in Java.Elliott Hughes2014-12-151-41/+0
| | | | | | | | | | Bug: 18719692 Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
* | Lose some unnecessary JNI from the zygote.Elliott Hughes2014-12-121-44/+0
| | | | | | | | | | Bug: 18719692 Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
* | Merge "Adjust format strings to work on both 32-bit and 64-bit builds"Chih-hung Hsieh2014-12-112-4/+4
|\ \
| * | Adjust format strings to work on both 32-bit and 64-bit buildsBernhard Rosenkränzer2014-12-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Adjust format strings to not produce Clang warnings in both 32-bit and 64-bit builds Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Merge "Add more -d dalvik details to dumpsys"Mathieu Chartier2014-12-091-3/+12
|\ \ \ | |/ / |/| |
| * | Add more -d dalvik details to dumpsysMathieu Chartier2014-12-081-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added .NonMoving for the non moving space. Added .Zygote for the zygote. Added .IndirectRef for indirect reference tables (jobjects). Example: Dalvik Details .Heap 2264 2264 0 0 .LOS 80 80 0 0 .GC 144 144 0 0 .Zygote 331 196 0 2428 .NonMoving 540 540 0 0 .IndirectRef 20 20 0 0 Bug: 18672069 Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c (cherry picked from commit 25c5e2b12d5d5d06739e3f70a0da968d97935b46)
* | | Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: RRO idmap: pad with 0xffffffff, not 0x00000000 RRO: reintroduce lost ResTable insert of assets
| * | | RRO: reintroduce lost ResTable insert of assetsMårten Kongstad2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the recent introduction of AssetManager::appendPathToResTable, overlay packages were not properly added to the AssetManager, and once added, were not properly inserted into the ResTable. Bug: 17765434 Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e
* | | | Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"Jesse Hall2014-12-021-10/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Avoid overwriting EGL14.EGL_NO_SURFACESangkyu Lee2014-11-251-10/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This is an update after the generator update.) Both EGL14 and EGLExt have the same initialization codes for EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY. Since EGLExt is initialized later, they are overwritten by EGLExt's initialization codes. Therefore, EGL_NO_SURFACE returned by methods in EGL14 is not actually EGL14.EGL_NO_SURFACE object and it makes several problems in handling error cases. For instance, "Let's fish" game application cannot be run on L. To solve the problem, this patch makes EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY initialized just once. Change-Id: Icce878164ff0b715ad2b5a2cd038a9616c7cf1e9
* | | We have POSIX clocks.Elliott Hughes2014-11-251-14/+0
| | | | | | | | | | | | Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
* | | Remove unused variables and functions, don't warn about unused parametersBernhard Rosenkränzer2014-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused variables and static functions clang complains about, disable warnings about unused parameters (needed for clang and for gcc with -Wextra enabled) Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""Chih-hung Hsieh2014-11-221-4/+0
|\ \ \
| * | | Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"Chih-hung Hsieh2014-11-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be unnecessary after c/115476. This reverts commit ba823cee8bafff98640408a777fe105a72fcea0d. Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
* | | | Merge "Frameworks/base: Consistency in core/jni"Andreas Gampe2014-11-21104-1227/+918
|\ \ \ \
| * | | | Frameworks/base: Consistency in core/jniAndreas Gampe2014-11-21104-1227/+918
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make consistent use of core_jni_helpers for registration. Translate some #ifdefs into const bools. Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
* | | | | Merge "Frameworks/base: Remove unused header"Andreas Gampe2014-11-211-63/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Frameworks/base: Remove unused headerAndreas Gampe2014-11-201-63/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android_nfc.h is used nowhere. Change-Id: I3009b3eb122674d3fe7ddb201bac18368b78bc02
* | | | | Merge "Fix clang warnings in core/jni."Dan Albert2014-11-2018-89/+90
|\ \ \ \ \
| * | | | | Fix clang warnings in core/jni.Dan Albert2014-11-2018-89/+90
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few bugs in here too (mostly people expecting + to concatenate C strings) :( Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
* | | | | Add appropriate casts for char16_t.Dan Albert2014-11-209-31/+63
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++11 defines a real char16_t, which is not implicitly convertible to uint16_t (and by extension jchar). Add casts as needed. Bug: 18300613 Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
* | | | Add zygote space to Dalvik HeapMathieu Chartier2014-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken by https://android-review.googlesource.com/#/c/115446/ This change fixes it by correctly putting the zygote in Dalvik Heap instead of Dalvik Other. Bug: 18447855 (cherry picked from commit 7fc9176c8a2102fb5be3668404bd15feb6878c89) Change-Id: I9293e5d3f55ccfb2c93c6aacbf6abc164eacb10b
* | | | Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni"Andreas Gampe2014-11-1935-817/+501
|\ \ \ \
| * | | | Frameworks/base: Replace LOG_FATAL_IF in core/jniAndreas Gampe2014-11-1935-817/+501
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use LOG_FATAL_IF in JNI setup. This is one-time on startup and important enough to always check. Add a header with common helper definitions. Move to inlined functions instead of macros to clean up the code. Change-Id: Ib12d0eed61b110c45d748e80ec36c563e9dec7e5
* | | | | Merge "Fix incorrect usage of bool"Chih-hung Hsieh2014-11-191-1/+1
|\ \ \ \ \
| * | | | | Fix incorrect usage of boolBernhard Rosenkränzer2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bool can't be < 0 Change-Id: Ie94ffadcb38c95214d1105c02610e59b4b2872b2 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | Merge "Frameworks/base: Compiled-classes support"Andreas Gampe2014-11-181-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Frameworks/base: Compiled-classes supportAndreas Gampe2014-11-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let AndroidRuntime check for /system/etc/compiled-classes and push it to the runtime for boot image creation. Bug: 18410571 (cherry picked from commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff) Change-Id: I2510316381f2661166af24d7e14b013f4e045556
* | | | | | Merge "Frameworks/base: Ignore unknown pragmas in core/jni"Andreas Gampe2014-11-181-1/+3
|\ \ \ \ \ \
| * | | | | | Frameworks/base: Ignore unknown pragmas in core/jniAndreas Gampe2014-11-181-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparation for a switch to Clang. Change-Id: Iabe1d79474a617bec66dd4bf58002b1a372f6d23
* | | | | | Merge "Use standard initializers"Chih-hung Hsieh2014-11-181-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use standard initializersBernhard Rosenkränzer2014-11-171-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use standard initializers rather than GNU extension initializers to prevent clang from spewing warnings about nonstandard code. BUG: 18193625 Change-Id: I19bf7fe9c401534af82d5a08e68fbd486bec8351 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | Merge "Fix check for PROC_QUOTES mode"Chih-hung Hsieh2014-11-171-1/+1
|\ \ \ \ \
| * | | | | Fix check for PROC_QUOTES modeBernhard Rosenkränzer2014-11-171-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since != has priority over &, the "if ((mode&PROC_QUOTES != 0))" check is the same as "if (mode & (PROC_QUOTES!=0))" - not what the code intends. Change-Id: I14840a887f26c28f2bd0aee8704c79cf353164ad Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes"Ying Wang2014-11-171-3/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Frameworks/base: AndroidRuntime standalone preloaded-classesAndreas Gampe2014-11-171-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change AndroidRuntime::startVM to give the new standalone preloaded-classes file to the runtime for compilation of images. Bug: 18305157 (cherry picked from commit 995c62d6abd4b7080e52a60d1bffa32ae4a798a3) Change-Id: I32a13357893222b25fbce60bf2367c23fb36ab22
* | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
* | | | Frameworks/base: Wall Werror in core/jniAndreas Gampe2014-11-1337-495/+428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on -Wall -Werror in core/jni. Fix warnings. Clang TODO: For GCC we need to turn off Wunused-but-set-variable in the GL bindings. However, Clang doesn't have that warning and thus complains about an unknown pragma. It is necessary to make the pragma #ifdef-ed on the compiler being GCC. Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
* | | | Frameworks/base: New GL bindingsAndreas Gampe2014-11-1211-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | Generated new bindings after glgen update. Change-Id: I96f2e3eee99f1e12ad84aa10e8f7826a905e909c
* | | | Move frameworks/base over to libc++.Dan Albert2014-11-121-2/+0
| | | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
* | | | Merge "Prevent resource leak in YuvToJpegEncoder"Elliott Hughes2014-11-121-0/+1
|\ \ \ \