summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pass permitted_path to the linker as is.Dimitry Ivanov2016-05-161-3/+1
| | | | | | | | | | Now that we have the fixed list of whitelisted libraries there is no longer need to check if java_permitted_path is nullptr. In fact checking it prevents custom classloaders created by apps from loading libraries using absolute path. Bug: http://b/28659864 Change-Id: I1bfc16a573b090f70f078ecccd0e4016939a5dc0
* Merge "init.rc: Remove cpu weight set on the root cgroup"Treehugger Robot2016-05-121-1/+0
|\
| * init.rc: Remove cpu weight set on the root cgroupIrina Patru2016-05-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It isn't allowed to change the cpu.share value for the root cgroup. See kernel commit: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597 This fixes the following error seen in dmesg: init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument BUG: 28735908 Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af Signed-off-by: Irina Patru <irina.patru@intel.com>
* | Merge "liblog: sleep 20ms before critical property_set"Treehugger Robot2016-05-121-0/+10
|\ \ | |/ |/|
| * liblog: sleep 20ms before critical property_setMark Salyzyn2016-05-121-0/+10
|/ | | | | | | | | Going too fast can result in the property not being set and causing an extreme corner case failure being reported and blamed on is_loggable functionality. Bug: 25792367 Change-Id: Idda6f67d655d8a84d2809daf695394d5293e7431
* Merge "Report errno more often in fastboot."Elliott Hughes2016-05-111-21/+17
|\
| * Report errno more often in fastboot.Elliott Hughes2016-05-111-21/+17
| | | | | | | | Change-Id: I4b4b47c584a146b38876a379f26ceb20d071c643
* | Merge "Move linker-namespace functions declarations"Dimitry Ivanov2016-05-112-1/+91
|\ \
| * | Move linker-namespace functions declarationsDimitry Ivanov2016-05-092-1/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | They are intended for platform use only and we shouldn't have them in the public header file. This CL moves them to libnativeloader private header file. Bug: http://b/28174921 Change-Id: I01cf446d2d8d7cf6f9e31130aa3d4e54fbbbb9fc
* | | Merge "Add a fortify test to crasher."Elliott Hughes2016-05-112-6/+12
|\ \ \
| * | | Add a fortify test to crasher.Elliott Hughes2016-05-102-6/+12
| | |/ | |/| | | | | | | Change-Id: I675dbeaa39529583be5877946fd38b94ec341315
* | | Merge "nativeloader: Ignore empty java_permitted_path"Dimitry Ivanov2016-05-111-1/+3
|\ \ \
| * | | nativeloader: Ignore empty java_permitted_pathDimitry Ivanov2016-05-101-1/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing empty permitted path should result in no-op. This addresses review comment on CL with commit f334cbf0e1425633bef96a21b0ce9e30f4c6ffa9 Bug: http://b/28639227 Change-Id: I4a4540e522e90a145a374939921932c86f35e88d (cherry picked from commit d0b1531929d76411d964d4077d441d751e2c01fb)
* | | Merge "Check if public namespace has already been initialized"Dimitry Ivanov2016-05-111-0/+7
|\ \ \
| * | | Check if public namespace has already been initializedDimitry Ivanov2016-05-091-0/+7
| | |/ | |/| | | | | | | | | | | | | | | | There is no point in reading/loading the list of public libraries once public namespace is already initialized. Change-Id: I5a53c46bb57b8de241ba521a6321c12e94a76476
* | | Merge "Extend white-listed directories to include /mnt/expand"Treehugger Robot2016-05-101-2/+14
|\ \ \ | |_|/ |/| |
| * | Extend white-listed directories to include /mnt/expandDimitry Ivanov2016-05-101-2/+14
|/ / | | | | | | | | | | | | | | | | | | Apps on sdcard live under /mnt/expand and therefore this directory should be under linker namespaces permitted_path. Bug: http://b/28639227 Change-Id: I462f9f23656c95d9c2a48bb3f513abcd9d08f340 (cherry picked from commit f334cbf0e1425633bef96a21b0ce9e30f4c6ffa9)
* | Merge "<cutils/atomic.h> has been inlined for two years now."Elliott Hughes2016-05-102-27/+0
|\ \ | |/ |/|
| * <cutils/atomic.h> has been inlined for two years now.Elliott Hughes2016-05-092-27/+0
| | | | | | | | Change-Id: If4f817acc054d7336df09a5b8dde34693e0e96a5
* | Merge "nativeloader: Fix the case of search_path == null"Dimitry Ivanov2016-05-091-1/+6
|\ \
| * | nativeloader: Fix the case of search_path == nullDimitry Ivanov2016-05-091-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | When user creates custom classloader which does not extend BaseDexClassLoader the librarySearchPath gets set to null by java.lang.Runtime.doLoad(). This patch makes nativeloader correctly handle it. Bug: http://b/28659864 Change-Id: I1b61c6bc952984d7c49775a9178fc3270948e62a
* | Merge "Return correct length from pmsgRead()"Treehugger Robot2016-05-091-1/+1
|\ \ | |/ |/|
| * Return correct length from pmsgRead()Rubin Xu2016-05-051-1/+1
| | | | | | | | | | Bug: 28610769 Change-Id: I38cac786ca43ef8d9530f4e2e5a0bdd4cc3bccef
* | Merge "Add public libs from an environment variable"Dimitry Ivanov2016-05-062-7/+28
|\ \
| * | Add public libs from an environment variableDimitry Ivanov2016-05-062-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is enabled only for builds with ro.debuggable=1 It is intended for use only in tests using dalvikvm and needing access to platform libraries. Bug: http://b/28449304 Change-Id: I402457d0da542996ccf265aeaa305f09881e4333
* | | Merge "enable integer sanitizer for sdcard service"Nick Kralevich2016-05-061-0/+3
|\ \ \
| * | | enable integer sanitizer for sdcard serviceDaniel Micay2016-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous false positive fix (df9c4a01) is enough to pass tests, and it doesn't appear that there are any remaining issues. Change-Id: Ib9812f1201ff0cd2ae8c8371737754fc328765b5
* | | | Merge "Set groups before dropping privileges."Treehugger Robot2016-05-061-2/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Set groups before dropping privileges.Christopher Ferris2016-05-051-2/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for dumping tombstones tries to read the log data. This was silently failing after the change to drop root privileges. Fix this by explicitly setting the groups allowed before dropping privileges. Bug: 28590884 (cherry picked from commit edc23801091f1a909efe130e0dba8abab3329eb5) Change-Id: I225365edccb11f8752027566fd42f3b10ce10260
* | | Merge "Fix null pointer dereference."Treehugger Robot2016-05-051-3/+3
|\ \ \
| * | | Fix null pointer dereference.Christopher Ferris2016-05-051-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the function dump_thread_info, if /proc/<PID>/comm is unreadable, then threadname will be used in a strncmp causing a crash. The fix is to avoid the check if threadname is null. Bug: 28615417 (cherry picked from commit 039976e553f261c5c43f9bfc295c31b9f6189ffc) Change-Id: I1e61431b1549ecfdc49a72cbf193a364069cda79
* | | Merge "Fix problem with wait_for_gdb."Treehugger Robot2016-05-059-53/+115
|\ \ \ | |_|/ |/| |
| * | Fix problem with wait_for_gdb.Christopher Ferris2016-05-059-53/+115
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone enables wait_for_gdb, activity manager will kill the stopped process before a developer can attach to the process. To allow debugging in this case, change the code to only contact the activity manager right before continuing the process that is crashing. Also, modify the conditions under which to do a gdb attach. The previous code did a partial attach if perform_dump failed. The new version simply allows an attach regardless of whether perform_dump passes or fails. Bug: 28409358 (cherry picked from commit 9818bd2bbee00c387247210eeae2a0a0d3912c8b) Change-Id: I42f464b69332748e16b07d9d00f44b3aa26ce8b7
* | Merge "Lose ps to toybox."Elliott Hughes2016-05-052-341/+0
|\ \
| * | Lose ps to toybox.Elliott Hughes2016-05-042-341/+0
| | | | | | | | | | | | Change-Id: I890a453533e1b3066169738f55314f8813285c17
* | | Merge "nativeloader: Add CloseNativeLibrary() method"Treehugger Robot2016-05-042-0/+7
|\ \ \ | |/ / |/| |
| * | nativeloader: Add CloseNativeLibrary() methodDimitry Ivanov2016-05-042-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This method is called by art on UnloadNativeLibraries() Bug: http://b/28406866 Change-Id: Ibccff93c83d6ccd3d0a1c0294a64b09281b4e05e (cherry picked from commit 09a516bf161c5cabdaa3a67df5aa7fbac667f5f9)
* | | Merge "Remove <utils/ashmem.h>."Elliott Hughes2016-05-041-41/+0
|\ \ \ | |_|/ |/| |
| * | Remove <utils/ashmem.h>.Elliott Hughes2016-05-041-41/+0
|/ / | | | | | | | | | | | | Not to be confused with <cutils/ashmem.h> or <linux/ashmem.h>, one or other of which is what you should be using instead. Change-Id: Ie158530591b28b94c2cda9e2686cae56b7aeb1a3
* | Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10Michael Ryleev2016-05-0331-0/+4330
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: trusty: storage: implement storage proxy daemon trusty: storage: add trusty interface header trusty: add trusty-base.mk trusty: add keymaster module trusty: add gatekeeper module
| * | trusty: storage: implement storage proxy daemonMichael Ryleev2016-05-0210-0/+1285
| | | | | | | | | | | | Change-Id: I80cdf61e5ced00dd32a3e35eb81969d25b624df9
| * | trusty: storage: add trusty interface headerAndres Morales2016-05-022-0/+310
| | | | | | | | | | | | Change-Id: I9885cc8d4204690690b384bbf209f82cb64f9265
| * | trusty: add trusty-base.mkMichael Ryleev2016-05-021-0/+28
| | | | | | | | | | | | | | | | | | | | | The trusty-base.mk should be included by devices that use Trusty TEE to pull in the baseline set of Trusty specific modules. Change-Id: I47c2095a21f47a40d390c9d5426380ad9507a708
| * | trusty: add keymaster moduleAndres Morales2016-05-0210-0/+2091
| | | | | | | | | | | | Change-Id: Id240b1b33e07d4cb3ea9d188014701e3d2b3c477
| * | trusty: add gatekeeper moduleAndres Morales2016-05-028-0/+616
|/ / | | | | | | Change-Id: I3e468c103326e6a9147dbed6c803748ffd5e207a
* | Merge "nativeloader: Add Reset capabilities"Dimitry Ivanov2016-05-022-0/+13
|\ \ | |/ |/|
| * nativeloader: Add Reset capabilitiesDimitry Ivanov2016-05-022-0/+13
|/ | | | | | | | | | | In the case when VM is restarted all weak references from the old VM become invalid. In such event NativeLoader needs to clear the list of classloaders from old VM. Bug: http://b/28453840 Bug: http://b/28449304 Change-Id: I2268c1e21cf940c57ddc5f0312f56b71aa702134 (cherry picked from commit be4ca3afc0636b314d676480156eb6977739dd00)
* Merge "Remove useless #include."Elliott Hughes2016-04-301-1/+0
|\
| * Remove useless #include.Elliott Hughes2016-04-301-1/+0
|/ | | | | Bug: http://b/28432688 Change-Id: I8982f42b2bf2305168a4ba167e422173f35c69c2
* Merge "toolbox ps: replace strcpy with snprintf."Elliott Hughes2016-04-301-1/+1
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 18:29:26 +0000