summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "installd: change profile files to 0660"Nick Kralevich2014-06-101-29/+6
|\
| * installd: change profile files to 0660Nick Kralevich2014-06-121-29/+6
|/ | | | | | | | | | | Profiling information leaks data about how people interact with apps, so we don't want the data to be available to other apps. Only the app and system_server need access. Don't create the /data/dalvik-cache/profiles directory. init.rc does it for us now. Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
* Merge "Add SELinux checks when adding a service."Nick Kralevich2014-06-122-7/+85
|\
| * Add SELinux checks when adding a service.Riley Spahn2014-06-122-7/+85
| | | | | | | | | | | | | | | | | | | | | | Add a MAC check to the svc_can_register function in service_manager. The types are defined in external/sepolicy/service.te and the mapping from service names is defined in external/sepolicy/service_contexts. Currently uses the property context backend to parse the contexts file. Bug: 12909011 Change-Id: I5d90a614263c60571c7c70c2882e6fa929911ca5
* | Merge "sensorservice: 64-bit compile issues"Mark Salyzyn2014-06-122-17/+20
|\ \ | |/ |/|
| * sensorservice: 64-bit compile issuesMark Salyzyn2014-06-102-17/+20
| | | | | | | | Change-Id: Ied7b779f39e71d041791729f7355b052b63903c5
* | Merge "Pass --top-k-profile-threshold to dex2oat if available."Calin Juravle2014-06-101-16/+38
|\ \ | |/ |/|
| * Pass --top-k-profile-threshold to dex2oat if available.Calin Juravle2014-06-101-16/+38
| | | | | | | | | | | | | | Also, don't pass --profile-file if the file is empty. Bug: 12877748 Change-Id: I587d198e64da709930e2cea50a87fed1525281e5
* | Merge "Don't set LOCAL_MODULE_PATH for native tests."Ying Wang2014-06-091-4/+0
|\ \
| * | Don't set LOCAL_MODULE_PATH for native tests.Ying Wang2014-06-091-4/+0
| | | | | | | | | | | | | | | | | | The build system will set it up automatically. Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
* | | Merge "libgui: 64-bit compile issues"Mark Salyzyn2014-06-092-4/+6
|\ \ \ | |/ / |/| |
| * | libgui: 64-bit compile issuesMark Salyzyn2014-06-092-4/+6
|/ / | | | | | | Change-Id: I29961c1567b8431518a7d032ea43385e23b7bb37
* | Merge "Migrate keychain directories to /data/misc/user/0"Robin Lee2014-06-091-5/+29
|\ \
| * | Migrate keychain directories to /data/misc/user/0Robin Lee2014-06-051-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With new CA certificates being stored in /data/misc/user/<userid>/ existing ones need to be moved into the same place. After this update only the owner user will have custom trusted CAs; all other users will revert to the default set. Change-Id: I14a4cd6048685902ad5dd3b53494b03fadc41c04
* | | Merge "Don't always add profile-file option to dex2oat"Calin Juravle2014-06-091-2/+14
|\ \ \ | | |/ | |/|
| * | Don't always add profile-file option to dex2oatCalin Juravle2014-06-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add profile-file option to dex2oat only if the profiler is active and the file exists. Bug: 12877748 Bug: 15275634 Change-Id: Icef76514c912c88311ed108f2be7a6329131f741
* | | Merge "Add aarch64 EGL/GLES trampolines"Jesse Hall2014-06-063-27/+83
|\ \ \ | |/ / |/| |
| * | Add aarch64 EGL/GLES trampolinesJesse Hall2014-06-063-27/+83
|/ / | | | | | | Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
* | Merge "Fix flattening/unflattening of android::Sensor."Narayan Kamath2014-06-061-6/+6
|\ \ | |/ |/|
| * Fix flattening/unflattening of android::Sensor.Narayan Kamath2014-05-301-6/+6
| | | | | | | | | | | | | | | | | | | | Write string lengths as uint32_t so that their width is the same on 32 and 64 bit processes. Note that this fixes another bug as a side effect; getFlattenedSize was assuming that sizeof(uint32_t) == sizeof(size_t). Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
* | Merge "Add installd command to create /data/misc user dir"Robin Lee2014-06-054-10/+97
|\ \
| * | Add installd command to create /data/misc user dirRobin Lee2014-06-054-10/+97
|/ / | | | | | | | | | | | | | | New command 'mkuser <id>' sets up a user directory in /data/misc/user/, readable by all apps within that user and writeable by the local system process. Change-Id: I5ddde8c4a80f606e723bb41aa64581a0720842d5
* | Merge "Fix mips build for libbinder."Narayan Kamath2014-06-041-0/+1
|\ \
| * | Fix mips build for libbinder.Narayan Kamath2014-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mips specific code was using an uninitialized variable. (cherry picked from commit 2c68d380c9ef765a7d46e5a4735f39e6c27849f2) Change-Id: I6b562b3f6d2084b72e747736cbf43684c2049f8e
* | | Merge "binder: Turn on -Werror"Mark Salyzyn2014-06-033-68/+70
|\ \ \ | |/ / |/| |
| * | binder: Turn on -WerrorMark Salyzyn2014-06-033-68/+70
|/ / | | | | | | Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
* | Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"Narayan Kamath2014-06-034-8/+94
|\ \
| * | x86_64: Align uint64_t/int64_t structure member to 8 bytesFengwei Yin2014-05-304-8/+94
| |/ | | | | | | | | | | | | | | | | To make sure the stature which pass between 32/64bit process have same memory layout for 32/64bit. Signed-off-by: Fengwei Yin <fengwei.yin@intel.com> Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.) Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
* | am 63645c69: Merge "binder: rm utils/Debug.h"Mark Salyzyn2014-05-295-5/+0
|\ \ | |/ | | | | | | * commit '63645c69e03cf3862c52cfde6cbd5f5143ccd38a': binder: rm utils/Debug.h
| * Merge "binder: rm utils/Debug.h"Mark Salyzyn2014-05-295-5/+0
| |\
| | * binder: rm utils/Debug.hMark Salyzyn2014-05-295-5/+0
| |/ | | | | | | Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
* | am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in ↵Brian Carlstrom2014-05-291-6/+9
|\ \ | |/ | | | | | | | | | | general" * commit 'f3e4fda09106cb93bddea35a2cc7dbd4b2c281e9': Remove dependencies on runtime_libdvm and libdvm.so in general
| * Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"Brian Carlstrom2014-05-291-6/+9
| |\
| | * Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-6/+9
| |/ | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit aefe55f0fb9e69be205497ef4fc3432d2f7a2d8b) Change-Id: I05b1a7dd1ef30b3366b52b46bfc7b39cfb3be198
* | am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-291-0/+1
|\ \ | |/ | | | | | | * commit '03e2f8fa13a791d744758ec9ffe27f52cab730d0': Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
| * Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-291-0/+1
| |\
| | * Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.Brigid Smith2014-05-281-0/+1
| | | | | | | | | | | | | | | Bug: 15116468 Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc
* | | am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '97a51ad44ae3dcf4976076382923ddcae16233ee': Move to dalvik.vm.lib.2 to force default to libart
| * | Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| |\ \ | | |/ | |/|
| | * Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| |/ | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit c4ac3124ffb51f13bb4206e9f8452a3712eb09cb) Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
* | am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"Jesse Hall2014-05-273-0/+121
|\ \ | |/ | | | | | | * commit 'dc2736219fa897840d1ff12b11cd7defb636f845': EGL: add x86/64 assembly code for EGL/GLES wrappers
| * Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"Jesse Hall2014-05-273-0/+121
| |\
| | * EGL: add x86/64 assembly code for EGL/GLES wrappersmwajdecz2014-05-273-0/+121
| |/ | | | | | | | | | | | | | | There was no explicit support for x86/64 architecture in EGL/GLES wrappers. This resulted either in failures or sub-optimal implementation of the wrapper functions. Change-Id: I20d99d7372fbf642ee4b94a05c8cb971cba29988 Signed-off-by: Wajdeczko, Michal <michal.wajdeczko@intel.com>
* | am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."Narayan Kamath2014-05-162-11/+11
|\ \ | |/ | | | | | | * commit 'c9fcaf3751af078ad730913304431197e4d1ae80': Change InputMessage.motion.pointerSize to a uint32_t.
| * Merge "Change InputMessage.motion.pointerSize to a uint32_t."Narayan Kamath2014-05-162-11/+11
| |\
| | * Change InputMessage.motion.pointerSize to a uint32_t.Narayan Kamath2014-05-162-11/+11
| |/ | | | | | | | | | | | | | | | | | | This ensures it's the same size in both 32 and 64 bit processes and also brings it in line with struct MotionEntry. (cherry-picked from bc6001b026069714177526eb1120b0011d6f2a51) Change-Id: I28e87050478920a54132efbbb8138076ebad1409
* | am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when ↵Nick Kralevich2014-05-131-14/+14
|\ \ | |/ | | | | | | | | | | created." * commit 'b66ee6c32d87961d5b9f0be97b5fdccb928fd453': Ensure that app lib symlinks are correctly labeled when created.
| * Merge "Ensure that app lib symlinks are correctly labeled when created."Nick Kralevich2014-05-131-14/+14
| |\
| | * Ensure that app lib symlinks are correctly labeled when created.Stephen Smalley2014-05-131-14/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | At present, the app lib symlinks are created before setting the package directory security context, and therefore default to system_data_file. Upon a later restorecon_recursive, they are relabeled to the same type as the package directory, e.g. app_data_file. Avoid this inconsistency by setting the package directory security context before creating the symlink so that it inherits the same security context. Change-Id: I1ee6ccd8a2aa63a4d2efda67f313c97932235911 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | am bd20e551: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-125-13/+126
|\ \ | |/ | | | | | | * commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122': Use asynchronous lock/unlock API
generated by cgit v1.1 at 2025-01-27 16:48:09 +0000