summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Collapse)AuthorAgeFilesLines
* am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"Mathieu Chartier2014-05-141-0/+8
|\ | | | | | | | | * commit 'c0f18b9d0cce0c140b1274055faabff732f1e27c': Add property for background GC type
| * am c4c77d63: Merge "Add property for background GC type"Mathieu Chartier2014-05-141-0/+8
| |\ | | | | | | | | | | | | * commit 'c4c77d63d889baca2abbdce6326077f0911b279e': Add property for background GC type
| | * Add property for background GC typeMathieu Chartier2014-05-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To disable background compaction do: adb shell setprop dalvik.vm.backgroundgctype CMS To enable: adb shell setprop dalvik.vm.backgroundgctype SS Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
* | | am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ \ \ | |/ / | | | | | | | | | * commit '4463cbc61d0947eccb67a52f60661a92d0cad508': Remove unused LOCAL_LDLIBS.
| * | am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| |\ \ | | |/ | | | | | | | | | * commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3': Remove unused LOCAL_LDLIBS.
| | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
| | | | | | | | | | | | Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
* | | am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."Narayan Kamath2014-05-011-7/+5
|\ \ \ | |/ / | | | | | | | | | * commit '703442238200c2f1a35b51e7aadc693322feb69d': Fix broken logging in Zygote.cpp.
| * | am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."Narayan Kamath2014-05-011-7/+5
| |\ \ | | |/ | | | | | | | | | * commit 'fbb0ab02bed5c49159acb3dba6848a154e524169': Fix broken logging in Zygote.cpp.
| | * Fix broken logging in Zygote.cpp.Narayan Kamath2014-05-011-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Differentiate between clean exits and signals. - Change the logic for the waitpid warning. We should log it only if the *first* call to waitpid returned ECHILD. Change-Id: I6bc50e4ffd100fb7f3f526d6b4056bed10b8045f
* | | am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
|\ \ \ | |/ / | | | | | | | | | * commit '91ff3c18dbb61ed0087f741dd2bdf911ecf42fef': Fix for native leaks in YuvToJpegEncoder.cpp
| * | am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
| |\ \ | | |/ | | | | | | | | | * commit '7d3f9e9730b100de4c0e643e13bf59bf54ef7819': Fix for native leaks in YuvToJpegEncoder.cpp
| | * Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
| | |\
| | | * Fix for native leaks in YuvToJpegEncoder.cppPawel Augustyn2014-02-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Objects allocated by Get<object>ArrayElements function, should be released. Add a fix to release this objects in error cases. Change-Id: Idf834523d93bb2dfd6b872e3b2179b7f1bba38f3
| * | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-2918-207/+256
| |\ \ \ | | |/ / | |/| |
| | * | am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."Narayan Kamath2014-03-251-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'ea96d791c7eca3eb5d003b8559b89a573f81dac9': Fix scaleNinePatch.
| | * \ \ am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am ↵Victoria Lease2014-03-201-1/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances * commit 'cfd46dc4847d5ef1ed14484717cf857ae5f67cae': malloc some advances
| | * \ \ \ am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s ↵Narayan Kamath2014-03-201-11/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nothing to register." * commit 'c850102d5c4b1fad47c221911c7be5567cebe8b1': Don't register methods when there's nothing to register.
| | * \ \ \ \ am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java ↵Narayan Kamath2014-03-181-7/+16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Input/Output streams." * commit 'd2133079c085cb0879facc8ee72678524d22571a': Pass int32_t for JNI calls to java Input/Output streams.
| | * \ \ \ \ \ am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"Dave Allison2014-03-141-23/+29
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '788fb96d7f1cfe27cf8dd56a053258964427286f': Move options buffers to top scope
| | * \ \ \ \ \ \ am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in ↵Narayan Kamath2014-03-131-7/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidRuntime (again)." * commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858': Remove java.io.tmpdir assignment in AndroidRuntime (again).
| | * \ \ \ \ \ \ \ am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"Brian Carlstrom2014-03-111-3/+4
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d': Only pass -Xprofile-* options to ART
| | * \ \ \ \ \ \ \ \ am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-114-20/+27
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbf826659e8e5d0be683b2459207c495303d53b6': LP64: Make 9 patches architecture agnostic.
| | * \ \ \ \ \ \ \ \ \ am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."Dave Allison2014-03-111-0/+43
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b94904ab6dfbb9db7e8042f10886042a295857d4': ART profiler usage.
| | * \ \ \ \ \ \ \ \ \ \ am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"Brian Carlstrom2014-03-111-6/+27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '485e3b459491267ae1390e1df5ff8f7d4695f819': Add dex2oat-flags plumbing to AndroidRuntime
| | * \ \ \ \ \ \ \ \ \ \ \ am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-03-111-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8fb22ae772fc62a10db6a06f283140d9233e8704': Various format string fixes for 64bit
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for ↵Narayan Kamath2014-03-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL_DEFAULT_DISPLAY" * commit '2525acf5a9855d748c008268bb26d6f6d5045d84': AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is ↵Narayan Kamath2014-03-117-30/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cast to a pointer" * commit '7fe5978bf7c4b473d8f6db5a12cfdcd110511331': Use reinterpret_cast when an integer is cast to a pointer
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"Narayan Kamath2014-03-112-32/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378': Use long for pointers in opengl/EGL classes
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9e413bf4: am bbfc08b3: Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-03-101-112/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e413bf4e562d98b6efeb157369f152edd5f0261': open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal Move time setting code from SystemClock to AlarmManagerService
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"Narayan Kamath2014-03-083-122/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104': Remove unused JNITest class
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."Narayan Kamath2014-03-072-9/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2': Fix several bad function definitions.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit ↵Narayan Kamath2014-03-071-7/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible" * commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf': AArch64: Make AssetAtlasService 64-bit compatible
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in ↵Narayan Kamath2014-03-071-7/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidRuntime." * commit '96ddea413dcf266d996877d3fc2d81738c5316c8': Remove java.io.tmpdir assignment in AndroidRuntime.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in ↵Narayan Kamath2014-03-071-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SurfaceSession class" * commit '3bec0fbb349a969934828ee726956877a3a21dee': AArch64: Use long for pointers in SurfaceSession class
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 74ca3fd3: am bc57651f: Merge "DO NOT MERGE - merge ↵Leon Scroggins III2014-03-071-22/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev * commit '74ca3fd34dac9674f61313594e2863ffecd79c7a': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into ↵Leon Scroggins III2014-03-0718-184/+207
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev-plus-aosp
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-0618-184/+207
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2855ff4f7a1e7645c69af378955868f44187376
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"Mark Salyzyn2014-04-241-16/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eacaa353e83942d3c59d0db594df0fb6179e0eea': jni: android_util_Process 64 bit issues
| * | | | | | | | | | | | | | | | | | | | | | | | | | jni: android_util_Process 64 bit issuesMark Salyzyn2014-04-241-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - critical issue with using %lld to scanf into a jlong - subsidiary issues with mix jint, jsize and jlong printing Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues"Mark Salyzyn2014-04-181-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7423510c5a6a103a77efc36f064ed716f8810b97': jni: binder ptrdiff_t compile issues
| * | | | | | | | | | | | | | | | | | | | | | | | | | jni: binder ptrdiff_t compile issuesMark Salyzyn2014-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"Mark Salyzyn2014-04-171-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4037847c0251a15ea88012a8405d0688c8b1ac53': jni: binder 64-bit compile issues
| * | | | | | | | | | | | | | | | | | | | | | | | | | jni: binder 64-bit compile issuesMark Salyzyn2014-04-171-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-163-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '936e87e12dd1335c6f773705fd0a7edb32bc4385': frameworks: 64 bit compile issues
| * | | | | | | | | | | | | | | | | | | | | | | | | | frameworks: 64 bit compile issuesMark Salyzyn2014-04-163-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues) Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
* | | | | | | | | | | | | | | | | | | | | | | | | | | am cd4c1c71: Merge "Add stringType and requiredPermissions to ↵Aravind Akella2014-04-111-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev * commit 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add stringType and requiredPermissions to SensorManager.java, as well ↵Aravind Akella2014-04-111-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a permission for the heart rate sensor" into klp-modular-dev
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Add stringType and requiredPermissions to SensorManager.java, as well as a ↵Aravind Akella2014-04-111-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission for the heart rate sensor This reverts commit 819239e5bec90ee3c861ac45fffac4a832a183a1. Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." ↵Adam Hampson2014-04-081-7/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.Narayan Kamath2014-04-071-7/+0
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This value is overridden by the framework anyway (see ActivityThread.handleBindApplication). Besides, it doesn't seem like a great idea to let tools clutter /sdcard/ with temp files. (cherry picked from commit b3802a8e2360aaa0a88faa625e15c31b56eaf125) Bug: 13763685 Bug: 13763900 Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1