summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fastbootd: erase, boot and partitioning commandsSzymon Starzycki2013-09-0620-67/+2627
| | | | Change-Id: I49ba2ba2e002fd5b6bbd37cc3fd0caa106f42010
* am 8da6e9c7: am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."Colin Cross2013-09-051-1/+1
|\ | | | | | | | | * commit '8da6e9c717ec5c1076dfedc7a37e9cfbe100977e': fix valgrind ioctl warning.
| * am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."Colin Cross2013-09-051-1/+1
| |\ | | | | | | | | | | | | * commit 'c9ff37144a7943ee1bc247cef3620c8cce22049d': fix valgrind ioctl warning.
| | * am 596e9c63: Merge "fix valgrind ioctl warning."Colin Cross2013-09-051-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '596e9c6314e4f2869499bcdbb816680ddb10c88f': fix valgrind ioctl warning.
| | | * Merge "fix valgrind ioctl warning."Colin Cross2013-09-051-1/+1
| | | |\
| | | | * fix valgrind ioctl warning.Jin Wei2013-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize local variable to avoid syscall ioctl warning. Change-Id: Ibad5b86cd799f147c71f182d654e61318e2ac15e Origin-Change-Id: Iedf5b128ae1743f633d2821ac3e402942ad6642b Signed-off-by: Jin Wei <wei.a.jin@intel.com> Signed-off-by: Jian Luo <jian.luo@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 62797
* | | | | healthd: Add average current propertyTodd Poynor2013-09-043-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibc901fe1b550c0d72095ef5590e2db8962d1a7b2
* | | | | am 61e4b4d5: am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to ↵Ben Cheng2013-09-041-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | suppress the warning." * commit '61e4b4d5a8a948c4241c26627cf8d6cb9d0544ca': Add -Wno-unused-parameter to suppress the warning.
| * | | | am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the ↵Ben Cheng2013-09-041-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | warning." * commit '8fb85b37af1753ce6bc5d88a04485a6c805bb3a3': Add -Wno-unused-parameter to suppress the warning.
| | * | | am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."Ben Cheng2013-09-041-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '2b2f1ae86fb791e9f2fff25f93e7f2c4db010bf6': Add -Wno-unused-parameter to suppress the warning.
| | | * | Merge "Add -Wno-unused-parameter to suppress the warning."Ben Cheng2013-09-041-2/+2
| | | |\ \
| | | | * | Add -Wno-unused-parameter to suppress the warning.Ben Cheng2013-09-041-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example in system/core/libcorkscrew/arch-arm/backtrace-arm.c: system/core/libcorkscrew/arch-arm/backtrace-arm.c:555:49: error: unused parameter 'siginfo' [-Werror=unused-parameter] Change-Id: Ibe13e8761a2f57324c0f0d87d9add549a20aa37a
* | | | | am d64df296: am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property ↵Colin Cross2013-09-031-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | user white list" * commit 'd64df296998bcb1528067d7e9adc40cf5e47abd1': [GNSS] Add AID_GPS to property user white list
| * | | | am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"Colin Cross2013-09-031-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9dd40e9756de23a25aaa9909c8d4055105621a76': [GNSS] Add AID_GPS to property user white list
| | * | | am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"Colin Cross2013-09-031-0/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'd171b6567023f7f840b3a145ec27b5723750dc18': [GNSS] Add AID_GPS to property user white list
| | | * | Merge "[GNSS] Add AID_GPS to property user white list"Colin Cross2013-09-041-0/+2
| | | |\ \
| | | | * | [GNSS] Add AID_GPS to property user white listNicolas SUET2013-08-261-0/+2
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "gps." and "persist.gps." to property_perms white list. Change-Id: I7177170676d774c87e08d1548f5264ac27cba3ff Orig-Change-Id: I7a94caa26be4aefd2fe4f155908e2f8f09858bee Signed-off-by: Nicolas SUET <nicolas.suet@intel.com> Signed-off-by: jerome Pantaloni <jeromex.pantaloni@intel.com> Signed-off-by: Jian Luo <jian.luo@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 118091
* | | | | am a9f6cc54: am f487e07b: am 53132840: Merge "init: call restorecon on /sys"Nick Kralevich2013-09-030-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a9f6cc54e7330a03e55291bda1d75bc78f3f8f2a': init: call restorecon on /sys
| * | | | am f487e07b: am 53132840: Merge "init: call restorecon on /sys"Nick Kralevich2013-09-030-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f487e07bce49735235b91bf5ee79b6987ff80188': init: call restorecon on /sys
| | * | | am 53132840: Merge "init: call restorecon on /sys"Nick Kralevich2013-09-033-0/+17
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '531328400ed6ce513f9bb4d9d772f02affeeaa26': init: call restorecon on /sys
| | | * | Merge "init: call restorecon on /sys"Nick Kralevich2013-09-033-0/+17
| | | |\ \
| | | | * | init: call restorecon on /sysNick Kralevich2013-09-033-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all files on /sys are not getting labeled properly. Fix them. Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
* | | | | | am 164a517b: am 49382f12: am 8328edb0: Merge "init: allow disabling selinux ↵Nick Kralevich2013-09-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via a kernel command line" * commit '164a517bc89dac39dad069c0e8e7693a677ce573': init: allow disabling selinux via a kernel command line
| * | | | | am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel ↵Nick Kralevich2013-09-030-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command line" * commit '49382f12f2e8278a02019d78482df00bb7f7fad7': init: allow disabling selinux via a kernel command line
| | * | | | am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"Nick Kralevich2013-09-031-3/+48
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '8328edb0a7d9f6eb3af82ea8bcda8bf15ffd75ab': init: allow disabling selinux via a kernel command line
| | | * | | Merge "init: allow disabling selinux via a kernel command line"Nick Kralevich2013-09-031-3/+48
| | | |\ \ \ | | | | |/ /
| | | | * | init: allow disabling selinux via a kernel command lineNick Kralevich2013-09-031-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new "androidboot.selinux" option, to control how userspace handles SELinux. This kernel command line can have three options: * disabled * permissive * enforcing "disabled" completely disables userspace support for SELinux. No policy is ever loaded, nor is the SELinux filesystem /sys/fs/selinux ever mounted. "permissive" loads the SELinux policy, but puts SELinux into permissive mode. SELinux policy violations are logged, but not rejected. "enforcing", the default, loads the SELinux policy, and places SELinux into enforcing mode. Policy violations are rejected. This change addresses post review comments for change b710ed21dec88c0dde8209264df054c842561589 . Change-Id: I912583db8e6a0e9c63380de32ad8ffc47a8a440f
* | | | | | am a46286db: am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux ↵Nick Kralevich2013-09-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into enforcing mode." * commit 'a46286db3429d50296f6fb070f948261b21c5c5d': init: move SELinux into enforcing mode.
| * | | | | am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing ↵Nick Kralevich2013-09-030-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode." * commit '5fc1acfaabd5de3a8043d0950e4946dda7b6d5c3': init: move SELinux into enforcing mode.
| | * | | | am b2423399: Merge "init: move SELinux into enforcing mode."Nick Kralevich2013-09-031-21/+20
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'b2423399883094ad1a1ddf7e02d798fd72a283a9': init: move SELinux into enforcing mode.
| | | * | | Merge "init: move SELinux into enforcing mode."Nick Kralevich2013-09-031-21/+20
| | | |\ \ \ | | | | |/ /
| | | | * | init: move SELinux into enforcing mode.Nick Kralevich2013-09-031-21/+20
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When init starts up, immediately put SELinux into enforcing mode. This is currently a no-op. We currently have everything in the unconfined domain, so this should not break anything. (if it does, I'll roll it back immediately) If the kernel doesn't have SELinux support compiled in, then don't try loading a policy and continue without SELinux protections. Change-Id: Id0279cf82c545ea0f7090137b7566a5bc3ddd641
* | | | | am 6324776b: am f3486134: Switch back to subsystem "net" for netlink events.Lorenzo Colitti2013-09-022-4/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '6324776b3efe46903f9a1291d90b52fcf51e7880': Switch back to subsystem "net" for netlink events.
| * | | | am f3486134: Switch back to subsystem "net" for netlink events.Lorenzo Colitti2013-09-022-4/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f34861346d5c207912075fba9874090e4c947869': Switch back to subsystem "net" for netlink events.
| | * | | | Switch back to subsystem "net" for netlink events.Lorenzo Colitti2013-09-032-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change to enable address tracking via netlink incorrectly changed the subsystem of rtnetlink events from "net" to "interface". This broke interface add/delete notifications, which come from the kernel with subsystem "net". Switch back to "net" and deal with address tracking via new action codes instead of a new subsystem. Bug: 10433320 Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
* | | | | | init.rc: start lmkdTodd Poynor2013-08-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
* | | | | | Add lmkd low memory killer daemonTodd Poynor2013-08-302-0/+745
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move kernel low memory killer logic to new daemon lmkd. ActivityManager communicates with this daemon over a named socket. Change-Id: Ie957da7e9b1f7150e23c689fdadf23ff260b47be
* | | | | | am 78c984ae: am 5835ac9e: Merge "Only check caller when deriving ↵Jeff Sharkey2013-08-301-0/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions." into klp-dev * commit '78c984aef222654bd337ae7f466a526e23db8f07': Only check caller when deriving permissions.
| * | | | | am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-devJeff Sharkey2013-08-301-0/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5835ac9e31aea910adb6b9d2de1d63df771df45b': Only check caller when deriving permissions.
| | * | | | Merge "Only check caller when deriving permissions." into klp-devJeff Sharkey2013-08-301-0/+5
| | |\ \ \ \
| | | * | | | Only check caller when deriving permissions.Jeff Sharkey2013-08-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10547597 Change-Id: Ied909f9047c2567e93dde0f4658d6e4b9ff161ab
* | | | | | | am ab977264: am 5856fd89: Merge "Fix recursive locking bug." into klp-devJeff Sharkey2013-08-301-21/+36
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ab9772641cad9342e615b21e5a4afb665e40cacf': Fix recursive locking bug.
| * | | | | | am 5856fd89: Merge "Fix recursive locking bug." into klp-devJeff Sharkey2013-08-301-21/+36
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5856fd8935b8aa499930daed29105f6419a96a5e': Fix recursive locking bug.
| | * | | | | Merge "Fix recursive locking bug." into klp-devJeff Sharkey2013-08-301-21/+36
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix recursive locking bug.Jeff Sharkey2013-08-301-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_rename() would end up acquiring the lock twice. Change to always derive has_rw inside earlier locks (instead of acquiring a second time), and pass the value into check_caller_access_to_name(). Bug: 10547597 Change-Id: If5744d6d226a4785676c19d0f7fdf1c05060ed76
* | | | | | | am c3c03f12: am 28e52c81: am b35f68a6: Merge "init: load factory properties"Dima Zavin2013-08-281-7/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c3c03f12ad5397588af639178ad200b56787790a': init: load factory properties
| * | | | | | am 28e52c81: am b35f68a6: Merge "init: load factory properties"Dima Zavin2013-08-281-7/+14
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '28e52c816d06d78fa823be2d310d9f4c25012c8f': init: load factory properties
| | * | | | | am b35f68a6: Merge "init: load factory properties"Dima Zavin2013-08-281-7/+14
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit 'b35f68a6974589fc3c762d6d2c7bac363794e355': init: load factory properties
| | | * | | | Merge "init: load factory properties"Dima Zavin2013-08-281-7/+14
| | | |\ \ \ \
| | | | * | | | init: load factory propertiesAndrew Boie2013-08-201-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These properties are typically set at device provisioning time or in the factory. They contain unit-specific data that isn't touched by software updates or factory data reset. Only read-only properties can be read by this mechanism. Change-Id: Ifff9184f039072c3c0ce99f825c3075afb524514 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>