summaryrefslogtreecommitdiffstats
path: root/rootdir
Commit message (Collapse)AuthorAgeFilesLines
* am 6025a2bc: am bd518bce: Merge changes I3187aa34,Iadac58e6Mark Salyzyn2015-03-131-0/+6
|\ | | | | | | | | | | * commit '6025a2bc493534b3003ebd2ad7130366cf4f6723': init.rc: logd --reinit on changes to persistent properties logd: add reinit command
| * init.rc: logd --reinit on changes to persistent propertiesMark Salyzyn2015-03-121-0/+6
| | | | | | | | | | Bug: 19681572 Change-Id: I3187aa348dae79fa5822ffb7ee9566919a7a04e6
* | am 20dc9c01: am 1dd71ae1: am f33c3bc9: Merge "init: drop dontpanic & apanic ↵Mark Salyzyn2015-02-271-16/+0
|\ \ | |/ | | | | | | | | | | initialization" * commit '20dc9c01fabb33ed5a0e17b8efbdcdbe576c0941': init: drop dontpanic & apanic initialization
| * am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"Mark Salyzyn2015-02-271-16/+0
| |\ | | | | | | | | | | | | * commit 'f33c3bc9602e4a369c4cc5d28357b8f73a3eed6c': init: drop dontpanic & apanic initialization
| | * init: drop dontpanic & apanic initializationMark Salyzyn2015-02-271-16/+0
| | | | | | | | | | | | | | | | | | Bug: 19050686 Bug: 19525200 Change-Id: Id81abe3b44283b439390b42db7a9da23748dee0a
* | | am 0a316829: am 398ade81: am 7bb72b73: Merge "seclabel use on services out ↵Nick Kralevich2015-02-261-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | of system partition" * commit '0a316829fb856f98d8db3ba78667feb19fb12e22': seclabel use on services out of system partition
| * | am 7bb72b73: Merge "seclabel use on services out of system partition"Nick Kralevich2015-02-261-2/+0
| |\ \ | | |/ | | | | | | | | | * commit '7bb72b73b0291636721d83a45adad175163361ec': seclabel use on services out of system partition
| | * seclabel use on services out of system partitionWilliam Roberts2015-02-231-2/+0
| | | | | | | | | | | | | | | | | | | | | These services can make use of type transitions already present in the base policy. Change-Id: Id785c39c4ea44598c64dc499bd943c73bc55ca85
* | | Track removal of the inputflinger binary.Narayan Kamath2015-02-241-7/+0
| | | | | | | | | | | | Change-Id: Ie3c3e5a67e7dfac5bd1672da6979fb053e8483b9
* | | am 9c1bc6bb: am 29576ae8: Merge "/vendor is sometimes on a separate ↵Elliott Hughes2015-02-141-3/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | partition now." * commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31': /vendor is sometimes on a separate partition now.
| * | am 29576ae8: Merge "/vendor is sometimes on a separate partition now."Elliott Hughes2015-02-141-3/+2
| |\ \ | | |/ | | | | | | | | | * commit '29576ae8901eb95d4c8a34f242a282b2fb73d35f': /vendor is sometimes on a separate partition now.
| | * /vendor is sometimes on a separate partition now.Elliott Hughes2015-02-131-3/+2
| | | | | | | | | | | | Change-Id: I3217c272ea38ab8212056e0432d0ededacd362f6
* | | am 0903c13a: am 265df6f5: Merge "bootchart: fix bootchart can not be ↵Elliott Hughes2015-02-121-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | triggered problem" * commit '0903c13ade29e6eedecd198ac54131248a1818f3': bootchart: fix bootchart can not be triggered problem
| * | am 265df6f5: Merge "bootchart: fix bootchart can not be triggered problem"Elliott Hughes2015-02-121-0/+5
| |\ \ | | |/ | | | | | | | | | * commit '265df6f50c508710f0b717d67650732baa906976': bootchart: fix bootchart can not be triggered problem
| | * bootchart: fix bootchart can not be triggered problemYongqin Liu2015-02-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootchart uses a file on the data partition to decide if it should collect data for bootchart, but the data partition will be mounted by the mount_all command in the "on fs" section, and it will be only added into the action queue when command "trigger fs" is executed, but that's after the bootchart_init action (late_init). This change makes bootchart_init a builtin command of init, and make it executed as the first command of "on post-fs" section which will be triggered after the "on fs" section. This change also refactors the bootchart code to all be in bootchart.cpp. Change-Id: Ia74aa34ca5b785f51fcffdd383075a549b2a99d9 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
* | | am a1738915: am 317b4024: Revert "Make encryption configurable"Paul Lawrence2015-02-091-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'a1738915329e704ea52fc09c222bb4893e6e51df': Revert "Make encryption configurable"
| * | am 317b4024: Revert "Make encryption configurable"Paul Lawrence2015-02-071-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '317b4024a2a46b8c57abfa08f2a649df13572bd3': Revert "Make encryption configurable"
| | * | Revert "Make encryption configurable"Paul Lawrence2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bda6272446454886339841a62daaa1b66c07ad60. The original fix seems to have led to boot failures in QA. Rather than risk shipping, revert the change. Bug 18764230 reopened. Requires change https://googleplex-android-review.git.corp.google.com/#/c/629764/ Bug: 19278390 Bug: 19199624 Change-Id: I8b6ab585666f2b0f585ffb2a5f61ac2e3462e06e
* | | | am 86cdce1a: am f52338fe: Merge "rootdir: enable armv8_deprecated swp hook"Greg Hackmann2015-02-051-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '86cdce1aab39ddbb346e6f7be1ca86531970419f': rootdir: enable armv8_deprecated swp hook
| * | | am f52338fe: Merge "rootdir: enable armv8_deprecated swp hook"Greg Hackmann2015-02-051-0/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'f52338fe1e8f74123a895db591d6a2a53061a2b1': rootdir: enable armv8_deprecated swp hook
| | * | rootdir: enable armv8_deprecated swp hookGreg Hackmann2015-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream kernel now includes support for emulating legacy AArch32 instructions on ARMv8 devices. By default this framework emulates deprecated instructions but not obsolete instructions. Android requires support for the obsolete SWP and SWPB instructions on all ARM devices, so override this default for the swp emulation hook. Change-Id: I82b9bdb564413ec7c1a101da75a9928aebe1606b Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am e1f62802: am d07555db: Merge "ensure /data/tombstones exists on all ↵Nick Kralevich2015-01-311-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Android devices" * commit 'e1f62802f6bec8ecc89100a1bbbdc36b7d18985b': ensure /data/tombstones exists on all Android devices
| * | | am d07555db: Merge "ensure /data/tombstones exists on all Android devices"Nick Kralevich2015-01-311-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'd07555dba01d64011b0d611dd6d3b197b216c163': ensure /data/tombstones exists on all Android devices
| | * | ensure /data/tombstones exists on all Android devicesNick Kralevich2015-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /data/tombstones is referenced by core platform code, but is not guaranteed to exist on all Android devices. Move the directory creation out of device specific files and into the core init.rc file. Bug: https://code.google.com/p/android/issues/detail?id=93207 Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690
| | * | Make encryption configurablePaul Lawrence2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay mounting encryptable but unencrypted volumes until we can check the ro.vold.forceencrypt flag, then optionally encrypt. Requires matching vold change from https://googleplex-android-review.git.corp.google.com/#/c/615309/ Bug: 18764230 Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
* | | | am 7e890a4d: am bda62724: Make encryption configurablePaul Lawrence2015-01-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7e890a4d32816d34b30fb5d1f651d966d64bbf36': Make encryption configurable
| * | | am bda62724: Make encryption configurablePaul Lawrence2015-01-261-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'bda6272446454886339841a62daaa1b66c07ad60': Make encryption configurable
| | * | Make encryption configurablePaul Lawrence2015-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay mounting encryptable but unencrypted volumes until we can check the ro.vold.forceencrypt flag, then optionally encrypt. Requires matching vold change from https://googleplex-android-review.git.corp.google.com/#/c/615309/ Bug: 18764230 Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
| | * | Ensure /data/adb existsNick Kralevich2014-11-051-0/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 6672300 * commit '667230074b6e4e306a50d84a88a57bf4f1ec0291': Ensure /data/adb exists
| | | * | Ensure /data/adb existsNick Kralevich2014-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that /data/adb always exists. This directory is used for writing adb debugging information when persist.adb.trace_mask is set. Bug: https://code.google.com/p/android/issues/detail?id=72895 (cherry picked from commit 89252ce31aacb27248e708b6487f730d3a024943) Change-Id: I44e01bee50125f4e6e5fff6e74c53bb2022ce355
* | | | | am 8c7380b4: am 3802b5d4: Merge "rootdir: add pstore"Mark Salyzyn2015-01-152-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8c7380b4761d5ca02d839ccd337014116134a5b8': rootdir: add pstore
| * | | | am 3802b5d4: Merge "rootdir: add pstore"Mark Salyzyn2015-01-142-0/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '3802b5d4c5cb14864dcdd8820e9140b81a2d7d78': rootdir: add pstore
| | * | | rootdir: add pstoreMark Salyzyn2015-01-142-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /dev/pmsg0 used to record the Android log messages, then on reboot /sys/fs/pstore/pmsg-ramoops-0 provides a means to pull and triage user-space activities leading up to a panic. A companion to the pstore console logs. Change-Id: Id92cacb8a30339ae10b8bf9e5d46bb0bd4a284c4
* | | | | am 2cd0563c: am d3119b19: Merge "Add ip6-localhost to /system/etc/hosts."Yabin Cui2015-01-141-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '2cd0563c53c8aa566c924d389ff34d7c46ea43b7': Add ip6-localhost to /system/etc/hosts.
| * | | | am d3119b19: Merge "Add ip6-localhost to /system/etc/hosts."Yabin Cui2015-01-131-1/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd3119b1962ef5c0d15b9cc22beb9ded040b44dcb': Add ip6-localhost to /system/etc/hosts.
| | * | | Add ip6-localhost to /system/etc/hosts.Yabin Cui2015-01-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18791191 Change-Id: Id7cad8cfccadeb319f0dc7dcba8148a457f9f87d
* | | | | init.rc: disable ICMP redirectsGreg Hackmann2014-12-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18604139 Change-Id: I4bf22d0029f8b03b0ef4329b7b8632d8e116c8e1 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | am a0959e90: am 8eb770d3: Merge "Remove long-dead readtty."Elliott Hughes2014-11-251-322/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a0959e90f550f06969c2e21a0858b8d4cb8d4228': Remove long-dead readtty.
| * | | | am 8eb770d3: Merge "Remove long-dead readtty."Elliott Hughes2014-11-251-322/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8eb770d37cd9470630fdbe496f22b7a04549fef7': Remove long-dead readtty.
| | * | | Remove long-dead readtty.Elliott Hughes2014-11-241-322/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
| | * | | Merge commit 'b2042f7263c7bbacc5115de4a42c5a96b64a06f2' into HEADBill Yi2014-10-225-33/+52
| | |\ \ \
| | | * \ \ resolved conflicts for merge of 3f95c89d to lmp-dev-plus-aospDmitriy Ivanov2014-10-141-1/+0
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | Change-Id: I5184dcfa91a11a210c60e60a4fffc26d2c9f116f
* | | | | | am 147de7e1: am 37d70f53: am c0b4b8b0: Merge "Ensure /data/adb exists"Nick Kralevich2014-10-211-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '147de7e147c9a85158f79b6aeffd87af6b921690': Ensure /data/adb exists
| * | | | | am 37d70f53: am c0b4b8b0: Merge "Ensure /data/adb exists"Nick Kralevich2014-10-211-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | * commit '37d70f53672c8878a5ce5506d6d89b851400f8e6': Ensure /data/adb exists
| | * | | Ensure /data/adb existsNick Kralevich2014-10-211-0/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Ensure that /data/adb always exists. This directory is used for writing adb debugging information when persist.adb.trace_mask is set. Bug: https://code.google.com/p/android/issues/detail?id=72895 Change-Id: I9cee2a0202417ff72a5ede7742e25877f51732dd
* | | | am 06850f9c: am b50d0cd5: Merge "rootdir: Make trusty version readable by ↵Arve Hjønnevåg2014-10-201-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | dumpstate" into lmp-mr1-dev * commit '06850f9ccd9c7668a8ab80bdfea00c1b275b5af9': rootdir: Make trusty version readable by dumpstate
| * | | Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-devArve Hjønnevåg2014-10-201-0/+1
| |\ \ \
| | * | | rootdir: Make trusty version readable by dumpstateArve Hjønnevåg2014-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I761650d286b454f1fe01a585e7cd6ec769bfc527
| * | | | Remove libsigchain from LD_PRELOADsDmitriy Ivanov2014-10-161-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15345057 Bug: 15426766 (cherry picked from commit c9f9f35efa43b3ac75b1a7e76fe1071a2e9d52ea) Change-Id: If54e1aeaa1e2abe061ac19666af4f4e058b81df2
* | | | am b307dcd8: resolved conflicts for merge of 3f95c89d to lmp-mr1-dev-plus-aospDmitriy Ivanov2014-10-141-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'b307dcd8715ea4ffa456d819e8e8812719d5e760': Remove libsigchain from LD_PRELOADs