summaryrefslogtreecommitdiffstats
path: root/init
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of b6c60285 to stage-aosp-masterColin Cross2013-06-241-28/+5
|\
| * Merge changes Ieb94caab,I762da21eColin Cross2013-06-251-30/+5
| |\
| | * init: move initial property area allocation into bionicGreg Hackmann2013-06-191-28/+5
| | * property_service: make /dev/__properties__ readableNick Kralevich2013-06-191-4/+2
* | | am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
|\ \ \ | |/ /
| * | Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| |\ \ | | |/ | |/|
| | * init: Retain traditional restart behavior for critical and oneshot services.Mike Kasick2012-03-224-11/+35
| | * init: Safely restart services to avoid race conditions.Mike Kasick2012-03-221-4/+3
* | | resolved conflicts for merge of 95a41f6b to stage-aosp-masterColin Cross2013-06-175-88/+58
|\ \ \ | |/ /
| * | init: fix copying boot propertiesColin Cross2013-06-171-1/+3
| * | init: verify size of property buffers passed to property_getColin Cross2013-06-172-2/+18
| * | init: move the system property writer implementationColin Cross2013-06-171-51/+8
| * | init: switch property_get to use __system_property_getColin Cross2013-06-175-39/+34
| * | init: prevent action being added to the action_queue twiceColin Cross2013-06-101-1/+6
* | | am 7e723498: Merge "Add permission for bluetooth app in non-primary users" in...Matthew Xie2013-05-221-0/+8
|\ \ \
| * \ \ Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-devMatthew Xie2013-05-221-0/+8
| |\ \ \
| | * | | Add permission for bluetooth app in non-primary usersMatthew Xie2013-05-221-0/+8
* | | | | am 49be2407: Revert "Add logic to fixup file contexts after a policy update."gcondra@google.com2013-05-201-6/+1
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Add logic to fixup file contexts after a policy update."repo sync2013-05-171-6/+1
* | | | | am 477e35d6: Revert "Add persistent property for SELinux enforcment status."gcondra@google.com2013-05-201-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Add persistent property for SELinux enforcment status."repo sync2013-05-171-1/+0
* | | | | am 8a387870: Revert "Reload policy after setting up the data partition."gcondra@google.com2013-05-204-9/+3
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Reload policy after setting up the data partition."repo sync2013-05-174-9/+3
* | | | | am 3d32cd93: Revert "Remove /system from the dirs to relabel."gcondra@google.com2013-05-201-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Remove /system from the dirs to relabel."repo sync2013-05-171-0/+1
* | | | | am 52351300: Revert "Add a version check for SELinux policy on device."gcondra@google.com2013-05-201-59/+0
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Add a version check for SELinux policy on device."repo sync2013-05-171-59/+0
| |/ / /
* | | | am 921be8b6: Add a version check for SELinux policy on device.gcondra@google.com2013-05-141-0/+59
|\ \ \ \ | |/ / /
| * | | Add a version check for SELinux policy on device.repo sync2013-05-141-0/+59
* | | | am 683aa89b: Merge "Remove /system from the dirs to relabel." into jb-mr2-devgcondra@google.com2013-05-071-1/+0
|\ \ \ \ | |/ / /
| * | | Remove /system from the dirs to relabel.repo sync2013-05-071-1/+0
* | | | am f69cc564: Merge "Update ueventd set the SELinux context on sysfs"Colin Cross2013-04-301-0/+9
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Update ueventd set the SELinux context on sysfs"Colin Cross2013-05-011-0/+9
| |\ \ \
| | * | | Update ueventd set the SELinux context on sysfsStephen Smalley2013-04-031-0/+9
* | | | | am 032be7a4: Merge "Log an error if property pool is exhausted"Colin Cross2013-04-301-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Log an error if property pool is exhaustedJohan Redestig2013-04-291-1/+5
* | | | | am fee250d2: Reload policy after setting up the data partition.gcondra@google.com2013-04-304-3/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Reload policy after setting up the data partition.repo sync2013-04-304-3/+9
* | | | | am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." i...gcondra@google.com2013-04-261-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add persistent property for SELinux enforcment status.repo sync2013-04-251-0/+1
* | | | | am ebcf93e3: Add logic to fixup file contexts after a policy update.Geremy Condra2013-04-151-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Add logic to fixup file contexts after a policy update.Geremy Condra2013-04-151-1/+6
* | | | | am 1a6d9ec2: Merge "fs_mgr: Capture the output of e2fsck and add to the kerne...Ken Sumrall2013-04-151-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | fs_mgr: Capture the output of e2fsck and add to the kernel logKen Sumrall2013-04-141-0/+2
* | | | | am 1615c09a: Merge "init: Fix potential null pointer issue"Colin Cross2013-04-051-9/+9
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | init: Fix potential null pointer issueHong-Mei Li2013-04-011-9/+9
| |/ /
* | | Only handle keycodes when adb is enabled.Jeff Sharkey2013-04-041-6/+2
* | | Apply the correct SELinux label for the properties workspace.Geremy Condra2013-04-031-0/+1
* | | am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"Geremy Condra2013-03-271-1/+0
|\ \ \ | |/ /
| * | Drop /data/system as a policy file locationWilliam Roberts2013-03-261-1/+0