aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am e3bdaeb6: am 2765e4fb: Merge "Use sigemptyset to initialise signal mask ↵Jean-Baptiste Queru2012-08-151-3/+1
|\ | | | | | | | | | | | | as it is more portable. Referencing sa_restorer fails on MIPS" * commit 'e3bdaeb603ab7ac941b35b41856c6b8ebf47c6bb': Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
| * am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more ↵Jean-Baptiste Queru2012-08-151-3/+1
| |\ | | | | | | | | | | | | | | | | | | portable. Referencing sa_restorer fails on MIPS" * commit '2765e4fb39af2f8260de1177027e292f2a7198bd': Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
| | * Merge "Use sigemptyset to initialise signal mask as it is more portable. ↵Jean-Baptiste Queru2012-08-151-3/+1
| | |\ | | | | | | | | | | | | Referencing sa_restorer fails on MIPS"
| | | * Use sigemptyset to initialise signal mask as it is more portable.Chris Dearman2012-08-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Referencing sa_restorer fails on MIPS Change-Id: I81c9ed5ef027a9d5258942ffcecb96e3f787e93c Signed-off-by: Chris Dearman <chris@mips.com>
* | | | am 417e3041: am 8124e073: Merge "Fix unused parameter warnings"Jean-Baptiste Queru2012-08-153-7/+10
|\| | | | | | | | | | | | | | | | | | | * commit '417e3041b8b6ba9582c2e4d2003cfcd77435fc21': Fix unused parameter warnings
| * | | am 8124e073: Merge "Fix unused parameter warnings"Jean-Baptiste Queru2012-08-153-7/+10
| |\| | | | | | | | | | | | | | | | | | * commit '8124e0736208c47a74767170d31e3c24e0f47504': Fix unused parameter warnings
| | * | Merge "Fix unused parameter warnings"Jean-Baptiste Queru2012-08-153-7/+10
| | |\ \
| | | * | Fix unused parameter warningsEdwin Vane2012-08-133-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Werror is used for this project so these warnings were causing the clang build to fail. Change-Id: I18c447ce239645e05f59c3cf0e2b8bb17d9d3030 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Tarea A Siraj <tareq.a.siraj@intel.com>
* | | | | am 83c4398b: am cc12ed32: Merge "[MIPS] debuggerd and libcorkscrew support"Jean-Baptiste Queru2012-08-159-2/+476
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '83c4398b4adb5c2cfaf6487699a8b94901ce0fb1': [MIPS] debuggerd and libcorkscrew support
| * | | | am cc12ed32: Merge "[MIPS] debuggerd and libcorkscrew support"Jean-Baptiste Queru2012-08-159-2/+476
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cc12ed3241a4081970cdd70f88d57cb4d3bc19f2': [MIPS] debuggerd and libcorkscrew support
| | * | | Merge "[MIPS] debuggerd and libcorkscrew support"Jean-Baptiste Queru2012-08-159-2/+476
| | |\ \ \
| | | * | | [MIPS] debuggerd and libcorkscrew supportChris Dearman2012-08-109-2/+476
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a241dc2e470148be0ad2c138e31f1aba5ab8812
* | | | | | Merge "bluetooth: bring up with bluedroid stack" into jb-mr1-devIliyan Malchev2012-08-151-1/+1
|\ \ \ \ \ \
| * | | | | | bluetooth: bring up with bluedroid stackJeonghoon lim2012-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change permission of "bluetooth." property to AID_BLUETOOTH Change-Id: Ifcd97f136cfc3372412fe500e4f800d1bbbd065c
* | | | | | | am 8f19b11a: am c4c731e7: Merge "[MIPS] Enable SD-card functionality to work"Keun-young Park2012-08-141-0/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '8f19b11a42423ecd4ac8373041f64cb3001caf78': [MIPS] Enable SD-card functionality to work
| * | | | | | am c4c731e7: Merge "[MIPS] Enable SD-card functionality to work"Keun-young Park2012-08-141-0/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'c4c731e78ca1a3527093a35280381616d1cb667d': [MIPS] Enable SD-card functionality to work
| | * | | | | Merge "[MIPS] Enable SD-card functionality to work"Keun-young Park2012-08-141-0/+4
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | [MIPS] Enable SD-card functionality to workBhanu Chetlapalli2012-06-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I711f533214b9b7bce2ff1000a55d6b8f310f2399 Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* | | | | | | init: Fix mkdir command when using ISUID or ISGID bitBenoit Goby2012-08-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On first boot, the directory is created with root:root ownership and then chowned. chown clears the ISUID and ISGID bits, so we need to chmod the directory again after chown. Change-Id: I02dfe7a19a637678256b4e7cc09e6b5431e6f11e
* | | | | | | Merge "Support shared-subtree and bind mount flags." into jb-mr1-devJeff Sharkey2012-08-142-0/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Support shared-subtree and bind mount flags.Jeff Sharkey2012-08-142-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6925012 Change-Id: Id8d887d17c6b1b2f90cfd1a1de991ccaba730b7d
* | | | | | | am ee0d281a: am c95c15b1: Merge "Char device /dev/dri/card0 was not created ↵Jean-Baptiste Queru2012-08-142-0/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during startup." * commit 'ee0d281a3e5fe611bdda23db18fa0e5684ee43ed': Char device /dev/dri/card0 was not created during startup.
| * | | | | | am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup."Jean-Baptiste Queru2012-08-142-0/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'c95c15b1923611f48c44c18ad158e57b9d915fdf': Char device /dev/dri/card0 was not created during startup.
| | * | | | | Merge "Char device /dev/dri/card0 was not created during startup."Jean-Baptiste Queru2012-08-142-0/+6
| | |\ \ \ \ \
| | | * | | | | Char device /dev/dri/card0 was not created during startup.Lukasz Anaczkowski2012-07-232-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This device is required by libdrm for GPUs like IvyBridge. Change-Id: I0ac47056a9cec2100f3e6eaa5591571fe6bbc145 Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | | | | Merge "Source and destination paths for sdcard." into jb-mr1-devJeff Sharkey2012-08-131-23/+25
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Source and destination paths for sdcard.Jeff Sharkey2012-08-131-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables init.rc to provide both paths, instead of hard-coding the destination. Bug: 6925012 Change-Id: I666cde710baad965b98619b68fcbcbb104973da3
* | | | | | | | am e8e73b01: am 311a4758: Merge "Remove system/core\'s remnants of SH support."Jean-Baptiste Queru2012-08-134-522/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'e8e73b01399e8d3c3fc6b94d26ef9cc49b33dda8': Remove system/core's remnants of SH support.
| * | | | | | | am 311a4758: Merge "Remove system/core\'s remnants of SH support."Jean-Baptiste Queru2012-08-134-522/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '311a47585cb14984d2169c7e8f59949cec30fd85': Remove system/core's remnants of SH support.
| | * | | | | | Merge "Remove system/core's remnants of SH support."Jean-Baptiste Queru2012-08-134-522/+0
| | |\ \ \ \ \ \
| | | * | | | | | Remove system/core's remnants of SH support.Elliott Hughes2012-08-114-522/+0
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SH support is long dead. Change-Id: I6be2763ca9f1ad8b3f9b09a8ad2f1d67f1e7f802
* | | | | | | | am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static."Kenny Root2012-08-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c': Make setenforce usage function static.
| * | | | | | | am 53dab583: Merge "Make setenforce usage function static."Kenny Root2012-08-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '53dab583c448ae97c3472c06609c2c31d6549c07': Make setenforce usage function static.
| | * | | | | | Merge "Make setenforce usage function static."Kenny Root2012-08-131-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Make setenforce usage function static.Matt Finifter2012-08-131-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6de204dc072418805160a35d799b8948ecb39251
* | | | / / / / am 753b96cf: am dd56039c: Merge "Fixed an unused param warning in logcat"Stephen Hines2012-08-131-1/+1
|\| | | | | | | | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * commit '753b96cf67f3eaf716510600516c3c593a1ae5e1': Fixed an unused param warning in logcat
| * | | | | | am dd56039c: Merge "Fixed an unused param warning in logcat"Stephen Hines2012-08-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd56039c881db2efebfa7df6491579e3ae01748f': Fixed an unused param warning in logcat
| | * | | | | Merge "Fixed an unused param warning in logcat"Stephen Hines2012-08-131-1/+1
| | |\ \ \ \ \
| | | * | | | | Fixed an unused param warning in logcatEdwin Vane2012-08-131-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed a function to actually use its parameter instead of a global variable. All callers of the function pass the global variable as an argument anyway so behaviour is unchanged. Change-Id: Ib84d45c17d2213c4d441bf2f423feca14e7aa2f4 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
* | | | | | | Collapse IMS tags into a prefix check.Jeff Sharkey2012-08-131-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6497974 Change-Id: I7fba1a07e2552ce16131b81f30d18eb3192de7ef
* | | | | | | am 79e30b6c: am ae8927aa: Merge "Fix a print format warning"Jean-Baptiste Queru2012-08-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '79e30b6c798b482115efb94c2d9978d20c1d4a54': Fix a print format warning
| * | | | | | am ae8927aa: Merge "Fix a print format warning"Jean-Baptiste Queru2012-08-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae8927aa05adf9e5a00760b45e4634eecf6340e3': Fix a print format warning
| | * | | | | Merge "Fix a print format warning"Jean-Baptiste Queru2012-08-131-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix a print format warningEdwin Vane2012-08-131-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30a6a9835073a7c0f5751fc34aed958c91a050ee Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
* | | | | | | am 11c783f1: am 9494f297: Merge "Implement SELinux/MAC checks for property ↵Kenny Root2012-08-133-11/+123
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service." * commit '11c783f1ead9f276e8854cb1adaebeed8517e8a1': Implement SELinux/MAC checks for property service.
| * | | | | | am 9494f297: Merge "Implement SELinux/MAC checks for property service."Kenny Root2012-08-133-11/+123
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9494f2975b32b04b1460a03f5e1285b2721863a7': Implement SELinux/MAC checks for property service.
| | * | | | | Merge "Implement SELinux/MAC checks for property service."Kenny Root2012-08-133-11/+123
| | |\ \ \ \ \
| | | * | | | | Implement SELinux/MAC checks for property service.rpcraig2012-08-093-11/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a set of changes to the init property service implementation to apply a SELinux check over who can change what properties. Also included control hooks for the 'ctl' keys. Change-Id: I5a18809bf5536f6459a36b6bf0d622b9f5061aa0 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | | | | | resolved conflicts for merge of 4dcd52ab to jb-mr1-devKenny Root2012-08-136-103/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd0c03a7883a2e31adab18543c016776b7b36866
| * | | | | | | am 297f802f: Merge "Add support for reloading policy from /data/system."Kenny Root2012-08-136-103/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '297f802f25d093274c1f5fb890ee8dfacfbf159e': Add support for reloading policy from /data/system.