summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix clang warnings about struct vs. class.Dan Albert2014-09-093-3/+3
| | | | Change-Id: I9f26cd01ac3153efa6d77a4133686842e2d63203
* Merge "Make string literal concatenation play nice with C++11."Dan Albert2014-09-095-25/+25
|\
| * Make string literal concatenation play nice with C++11.Dan Albert2014-09-085-25/+25
| | | | | | | | | | | | | | In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user defined literal. Add space around the macro. Change-Id: I2741f5be9c0b1562e0f413d1309ef9d687e89b41
* | Merge "Fix relabeling of secondary user package directories."Nick Kralevich2014-09-081-1/+1
|\ \ | |/ |/|
| * Fix relabeling of secondary user package directories.Stephen Smalley2014-09-081-1/+1
|/ | | | | | | | | When relabeling secondary user package directories, we need to use the uid of the directory rather than the primary package UID; otherwise, levelFrom=user will not work correctly. Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "Remove obsolete prunedexcache"Brian Carlstrom2014-08-283-55/+0
|\
| * Remove obsolete prunedexcacheAlex Light2014-08-283-55/+0
|/ | | | | Bug: 16875245 Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
* Merge "Add vm_safe_mode to dexopt."Calin Juravle2014-08-273-10/+16
|\
| * Add vm_safe_mode to dexopt.Calin Juravle2014-08-273-10/+16
|/ | | | | | | | | | | The flag enforces interpret-only flag for dex2oat. Bug: 12457423 (cherry picked from commit b1efac103523efccbe671e76cc0eaaeab810415b) (cherry picked from commit 97477d203eaf0c3235bbe2415356f20a0431cada) Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
* Merge "Pass isa features flag to dex2oat."Calin Juravle2014-08-261-8/+21
|\
| * Pass isa features flag to dex2oat.Calin Juravle2014-08-261-8/+21
| | | | | | | | | | | | | | | | Bug: 16716262 (cherry picked from commit 8fc7315a67fdbf9b56cc6fa061f0773be2223a81) Change-Id: I3cb1d82604612bc7212bcbdeef685bc05b695b6a
* | Merge "Fix validation of system paths in installd."Calin Juravle2014-08-222-27/+67
|\ \ | |/
| * Fix validation of system paths in installd.Calin Juravle2014-08-222-27/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System apps are now installed under their own directory (system_app_dir/app_dir/app.apk). The new path doesn't pass installd validation because of obsolete checks which verify that the path does not contain subdirectories past the system_app_dir. The CL fixes the validation to accept at most on subdirectory. Bug: 17109858 (cherry picked from commit c597b6dd895dbb2b28c757ce7a2651b3cdc9b00c) Change-Id: Ic5f15d1864c6af9f4c4b07dc27244ebbb521ad5e
* | Merge "Allow apk path to contain one subdirectory."Calin Juravle2014-08-222-26/+27
|\ \ | |/
| * Allow apk path to contain one subdirectory.Calin Juravle2014-08-222-26/+27
|/ | | | | | | | | | | In the current directory layout this prevented rm_dex and move_dex commands to validate the apk path and thus cleaning up resources. Bug: 16888084 (cherry picked from commit fd88ff2edd954117e36372fb095b6f5f35aad0e3) Change-Id: I1002529b0c35852c67540d3165d1444523460592
* Merge "Fix CAS argument type."Hans Boehm2014-08-161-1/+1
|\
| * Fix CAS argument type.Hans Boehm2014-08-191-1/+1
| | | | | | | | | | | | | | Gcc apparently doesn't check; clang does. Bug:17067219 Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
* | Merge "Use gettid directly in binder."Elliott Hughes2014-08-161-1/+1
|\ \
| * | Use gettid directly in binder.Elliott Hughes2014-08-181-1/+1
| |/ | | | | | | | | Bug: 17048545 Change-Id: I1df378135961e085a52f6cc5694ad74cd73aac19
* | Merge "Disable verification based on vold.decrypt. [frameworks/native]"Brian Carlstrom2014-08-151-1/+1
|\ \ | |/ |/|
| * Disable verification based on vold.decrypt. [frameworks/native]Brian Carlstrom2014-08-151-1/+1
|/ | | | | | | | Bug: 15165413 (cherry picked from commit e18987efb5e39ca1bed15527b7b82bde55c99669) Change-Id: Ie55ef400c9d1f231b3be64248c756ac798a11ffe
* Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 ↵Hans Boehm2014-08-122-15/+21
|\ | | | | | | use."""""
| * Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""Hans Boehm2014-08-122-15/+21
| | | | | | | | | | | | | | | | After fixing b/16874785. This reverts commit f010a05c7e9a23b6083294aff4a8183ab01f686e. Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
* | Merge "Change an accidental ALOGE to an ALOGV"Andreas Gampe2014-08-111-1/+1
|\ \
| * | Change an accidental ALOGE to an ALOGVAlex Light2014-08-111-1/+1
| | | | | | | | | | | | Change-Id: If07bcef597dd9e531ce6d92c7780ba6ad5090f9a
* | | Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup"Narayan Kamath2014-08-071-0/+5
|\ \ \ | |/ / |/| |
| * | Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroupBrian Carlstrom2014-08-081-0/+5
|/ / | | | | | | | | Bug: 15927194 Change-Id: Id8bc188de68d62fd5f91a99aaaa6c8f2dea06abd
* | Merge "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""Hans Boehm2014-08-082-21/+15
|\ \ | |/
| * Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""Hans Boehm2014-08-092-21/+15
| | | | | | | | | | | | This reverts commit 66629e0de532376fa3ef43175ad05eccd21114da. Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
* | Merge "Revert "Revert "Remove incorrect android_atomic_...64 use."""Hans Boehm2014-08-072-15/+21
|\ \ | |/
| * Revert "Revert "Remove incorrect android_atomic_...64 use.""Hans Boehm2014-08-082-15/+21
|/ | | | | | | This reverts commit 9dc5c269f74ac76f62515e3d9558e67c6e63067d. Adds a stdint.h include in case stdatomic.h stops including that. Change-Id: If3dd1db1f1132c0f2dc1efb0a44617d3f36d7cfb
* Merge "Revert "Remove incorrect android_atomic_...64 use.""Hans Boehm2014-08-062-20/+15
|\
| * Revert "Remove incorrect android_atomic_...64 use."Hans Boehm2014-08-062-20/+15
| | | | | | | | | | | | This reverts commit 88b7541d682a6ad402eff15e58c9c792497096d7. Change-Id: Ie701c308451a3697bb167aff119318b932133f90
* | Merge "Remove incorrect android_atomic_...64 use."Hans Boehm2014-08-062-15/+20
|\ \ | |/
| * Remove incorrect android_atomic_...64 use.Hans Boehm2014-07-232-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the mExtras field in Binder.h to be a stdatomic.h atomic value, and replace references to it with proper stdatomic.h calls. This removes one of a small number of remaining 64 bit android_atomic references. It also replaces the erroneously non-atomic read accesses to mExtras. It would be better if this used the C++11 <atomic> facility, but we don't quite have that yet. Bug: 16513433 Change-Id: Ibabb88d05025187ee1ce6c7f1aa670b133a547f8
* | Merge "GlES2: Add NULL check"Jesse Hall2014-08-051-1/+1
|\ \
| * | GlES2: Add NULL checkAnshuman Dani2014-08-061-1/+1
|/ / | | | | | | | | | | | | | | Check for NULL before calling thread specific glGetString. CRs-fixed: 569609 Change-Id: Ifee8257152ba7ca7a05df5d7b113171b71d16c82
* | Merge "Make system use patchoat to relocate during runtime."Brian Carlstrom2014-08-053-22/+102
|\ \
| * | Make system use patchoat to relocate during runtime.Alex Light2014-08-053-22/+102
|/ / | | | | | | | | | | | | | | Make installd understand a patchoat directive and carry it out. Bug: 15358152 Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
* | Merge "Disable compilation based on vold.decrypt. [frameworks/native]"Brian Carlstrom2014-08-011-1/+11
|\ \
| * | Disable compilation based on vold.decrypt. [frameworks/native]Brian Carlstrom2014-08-041-1/+11
| | | | | | | | | | | | | | | Bug: 15165413 Change-Id: Ibc39ab82e02e42345c6e2667ac45884f2e0cf7a4
* | | Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter ↵Brian Carlstrom2014-08-011-0/+12
|\ \ \ | |/ / | | | | | | [frameworks/native]"
| * | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter ↵Brian Carlstrom2014-07-301-0/+12
|/ / | | | | | | | | | | | | | | | | [frameworks/native] This will allow us to conditionally change the compiler-filter based on other properties. Bug: 15165413 Change-Id: Iff27dc2904f4f0d7c25a684cd6ba16a597f252fd
* | Merge "Add dumping of tombstones to dumpstate."Christopher Ferris2014-07-233-11/+65
|\ \
| * | Add dumping of tombstones to dumpstate.Christopher Ferris2014-07-233-11/+65
| |/ | | | | | | | | | | Dump only those tombstones modified within the last half an hour. Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
* | Merge "Install symlinks in multilib build."Ying Wang2014-07-231-12/+7
|\ \ | |/ |/|
| * Install symlinks in multilib build.Ying Wang2014-07-231-12/+7
|/ | | | Change-Id: Ia8a4995de127c42beebb3fe603366ce29a6f94d3
* Merge "Always #include <sys/...>, not <linux/...>."Elliott Hughes2014-07-171-1/+1
|\
| * Always #include <sys/...>, not <linux/...>.Elliott Hughes2014-07-181-1/+1
| | | | | | | | Change-Id: I9a3f574e0dd1d3ba39312254513b8b193b610c09
* | Merge "Fix implicit declaration of function 'prctl' in installd."Elliott Hughes2014-07-171-1/+1
|\ \ | |/
generated by cgit v1.1 at 2025-01-26 23:21:36 +0000