summaryrefslogtreecommitdiffstats
path: root/rootdir
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* | 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
* | Make the default cgroup, the foreground cgroup.Riley Andrews2014-10-071-15/+8
|/ | | | | | | | | | | All kernel services will now be in the same cgroup as foreground applications. This will now make kernel threads not implicitly higher priority than android foreground services. Bug 17681097 Change-Id: I28e81c7aade50428d5395df86f00ce01c1e7af02
* Merge "Add bootanimation to audio group so it can play boot sound" into lmp-devMike Lockwood2014-10-061-1/+1
|\
| * Add bootanimation to audio group so it can play boot soundMike Lockwood2014-10-021-1/+1
| | | | | | | | | | | | Bug: 17674304 Change-Id: I5d31bc024fa36fedac2c0ba5c4a8b100937183ad
* | init.trace.rc: fix race condition with class_start coreFred Fettinger2014-10-011-1/+1
|/ | | | | | | | | | | | | | | | The systrace permissions from init.trace.rc and the "class_start core" which launches surfaceflinger are both in an "on boot" section. However, the init.trace.rc commands are parsed after all commands in init.rc. This means that "class_start core" is executed before the chmod command which allows processes to write to trace_marker. If any services execute their first trace command before the chmod occurs, then that service won't be able to write traces until the service is restarted. To fix this, run all of the init.trace.rc commands in the "early-boot" section to ensure they are completed first. Bug: 17612265 Change-Id: Ibf544762173d5ba98272c66ef485d8eab7d70bf3
* init.usb.rc: Change product id to for add only configBadhri Jagan Sridharan2014-09-051-3/+3
| | | | | | | Change product id from D002 to 4EE7 when adb is the only supported function Change-Id: I8f6bcb9a1dc5ea6da0493a2dd730f9ac1f0bed24
* Change /dalvik-cache to be owned by root.Alex Light2014-08-281-1/+1
| | | | | | | | Bug: 16875245 (cherry picked from commit 3878ebd72493427ea5537b36dfb9cd7cb38677bb) Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
* Move bootanim and surfaceflinger to class coreAndres Morales2014-08-261-2/+2
| | | | | | | | | They have no dependencies on /data so can be started early. This permits us to unmount /data while bootanimation is running, allowing an uninterrupted first boot encryption sequence. Bug: 17260550 Change-Id: I323fe23e8cf488d8bc136387efdd9fcea96625eb
* Merge "Enable not rebooting during default encryption" into lmp-devPaul Lawrence2014-08-251-1/+0
|\
| * Enable not rebooting during default encryptionPaul Lawrence2014-08-251-1/+0
| | | | | | | | | | | | | | | | | | | | Need to not set this property) during mount, since it can't be changed later (ro property) Also no reason to start class main on encryption cycle - we'll show surfaceflinger, which is enough UI for this short cycle. Bug: 17041092 Change-Id: Ica5339c54e45716d0fe20e23c0ab857f388d23ed
* | Merge "Remove inputflinger from init. DO NOT MERGE" into lmp-devMichael Wright2014-08-161-7/+0
|\ \ | |/ |/|
| * Remove inputflinger from init. DO NOT MERGEMichael Wright2014-08-191-7/+0
| | | | | | | | Change-Id: I6ae2815a0c3f6b9c69e712af3ed6ce9d455ef3d3
* | Remove obsolete tcp buffer size system properties.Robert Greenwalt2014-08-171-15/+0
|/ | | | Change-Id: If6fb6fdcf8975e6102e84594ee3f64a5be6166f6
* Export the new system_server classpath.Narayan Kamath2014-08-072-1/+3
| | | | | | bug: 16555230 Change-Id: I99d2d219b5bd6dc4807cb53e44dc5715cc0815b3
* Remove the /dev/.booting file before triggering boot.Riley Andrews2014-07-221-2/+3
| | | | | | | | | On mako only, there is a race condition such that core + main services must be started after releasing ueventd (by removing /dev/.booting). bug 16304711 bug 16333352
* Move unlink("/dev/.booting") until after filesystems are mounted.Riley Andrews2014-07-141-0/+7
| | | | | | | Move the unlink out of init.c and into init.rc, so that the file will be removed after all the filesystems with firmware are up. Change-Id: Ifdd5dd1e95d7e064dde5c80b70198882d949a710
* am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"Nick Kralevich2014-07-091-3/+1
|\ | | | | | | | | * commit 'f89ddf76f9e3c10af9002cdb0d9b8eadcd59bf15': restorecon_recursive /cache
| * am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"Nick Kralevich2014-07-091-3/+1
| |\ | | | | | | | | | | | | * commit 'd05245a4b10044670ed8456c5c869490fd90583f': restorecon_recursive /cache
| | * restorecon_recursive /cacheNick Kralevich2014-07-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure all files / directories within /cache are properly labeled, not just the directory itself. Addresses the following denial: type=1400 audit(0.0:26): avc: denied { getattr } for comm="Thread-85" path="/cache/lost+found" dev="mmcblk0p27" ino=11 scontext=u:r:untrusted_app:s0 tcontext=u:object_r:unlabeled:s0 tclass=dir Change-Id: I5937b30043efeb696ffaa77258b7294d20d1494e
* | | Merge "init.rc: add seclabel to flash_recovery"Nick Kralevich2014-07-071-0/+1
|\ \ \
| * | | init.rc: add seclabel to flash_recoveryNick Kralevich2014-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure flash_recovery is always running in the install_recovery SELinux domain. Change-Id: I9495eedd03f6b5dfcf2e78c03d1102f6032b327a
* | | | am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for ↵Sreeram Ramachandran2014-07-081-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | netd and other network-related files." * commit 'b12e40da2526881c1730a3d3387556e4600c7040': Create a data directory for netd and other network-related files.
| * | am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other ↵Sreeram Ramachandran2014-07-081-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | network-related files." * commit '0a7b44d55b9e9d038de390457246ec7fd0999cad': Create a data directory for netd and other network-related files.
| | * Create a data directory for netd and other network-related files.Sreeram Ramachandran2014-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | Allows the 'shell' group (which is what dumpstate uses) to read the files in this directory. Change-Id: I69deb1a64d5d6647470823405bf0cc55b24b22de
* | | am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."dcashman2014-07-081-6/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'cddb15b8a9057e7efacf2de9c9a6a887fd666663': Remove sshd.
| * | am b4e74db7: am 3fa71b8e: Merge "Remove sshd."dcashman2014-07-081-6/+0
| |\ \ | | |/ | | | | | | | | | * commit 'b4e74db79c9fda5e63ae49f299df3c0dd80a87f9': Remove sshd.
| | * Remove sshd.dcashman2014-07-071-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | This may require changes to other code, such as fastbootd, which relies on this service. sshd is not currently, used, however, so this change will force any such code to be changed. Bug: 11594902 Change-Id: I07e52008290dab5825be2ad062cbe730fa7dff71
* | | resolved conflicts for merge of fa6f2543 to masterRiley Andrews2014-06-261-0/+3
|\ \ \ | |/ / | | | | | | Change-Id: I04ce82e5d245e90e2cc62b76d688ec902c1a471d
| * | am 23340d8a: am 10f8cd1d: Merge changes Ia15b2110,I5498c725Riley Andrews2014-06-271-0/+3
| |\ \ | | |/ | | | | | | | | | | | | * commit '23340d8adac7bf68a6e47064ab7b48c1e227a077': Add ability to adjust init log level at runtime. Improve init's debug printing.
| | * Add ability to adjust init log level at runtime.Riley Andrews2014-06-261-0/+3
| | | | | | | | | | | | | | | | | | | | | + Add a new property, sys.init_log_level, which can be set after init bootstrap. This will control the level at which init does prints to klog. Change-Id: Ia15b2110157b5e6b713785ece9b0fb94889be6c8
* | | Moved symlink back up.Daniel Rosenberg2014-06-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Moving the vendor symlink down was causing issues with some devices. Moved it back up, and adjusted mount to remove symlinks if necessary. Change-Id: I77126d77cfbef32250012bea3960c99b55db4cbb Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | | Added support for vendor partition and imageDaniel Rosenberg2014-06-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Modified fastboot to flash vendor.img as well. Moved symlink for /vendor to occur after mounting partitions. Changed mount to also create the mount point. Change-Id: I78e1ba24e6bb8b4af96a67ee0569af579439e682 Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | | resolved conflicts for merge of 079c637f to masterRiley Andrews2014-06-231-0/+25
|\ \ \ | |/ / | | | | | | Change-Id: Iab9a857026de954d7497d6b0eaf3751d2d3904c7
| * | am 5b45e08a: am 7950fc47: Merge "Add ability to boot from charger mode."Riley Andrews2014-06-231-0/+25
| |\ \ | | |/ | | | | | | | | | * commit '5b45e08aabd6dcbab527d221584fe348c73c70d4': Add ability to boot from charger mode.
| | * Add ability to boot from charger mode.Riley Andrews2014-06-201-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to boot up directly from charger mode, instead of forcing charger mode to initiate a full restart to launch 'full' android. This should shave a few seconds off of boot time on supported devices (just manta for now). Change-Id: Ieec4494d929e92806e039f834d78b9002afd15c4
* | | am aab0d57d: am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"Riley Andrews2014-06-201-26/+26
|\ \ \ | |/ / | | | | | | | | | * commit 'aab0d57d18b202d059fec57c832d6443faff6ee3': Make indentation sane in init.rc
| * | am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"Riley Andrews2014-06-201-26/+26
| |\ \ | | |/ | | | | | | | | | * commit '94fa20058fbd0e4f7e3c6d1381cdb9718dd90cde': Make indentation sane in init.rc
| | * Make indentation sane in init.rcRiley Andrews2014-06-191-26/+26
| | | | | | | | | | | | Change-Id: Ic632fbe1423eeef7ec958877d74db7b87fc385c6
| * | am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if ↵Ying Wang2014-06-181-1/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | PRODUCT_BOOTCLASSPATH changed." * commit '68d97430dd2cc25bb753df748d859415520a7dcb': Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
| | * Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.Ying Wang2014-06-181-1/+9
| | | | | | | | | | | | | | | | | | (cherry picked from commit 7011a85606bfdeefbd5f8db668c69b61e8d612a5) Change-Id: I025fe1f64c87fd406b3a3bf3d20fd3b78be8a940
* | | Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.Ying Wang2014-06-141-1/+9
| | | | | | | | | | | | Change-Id: I4686c1239aa5ed361c918ce4e7a5abf9a1552ab4
* | | am f8cb68e1: am 3bff77a8: am 875dc8f3: Merge "Create ↵Nick Kralevich2014-06-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | /data/dalvik-cache/profiles" * commit 'f8cb68e15ba242200e3525fffa2f969960e18a50': Create /data/dalvik-cache/profiles
| * | am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"Nick Kralevich2014-06-121-0/+1
| |\ \ | | |/ | | | | | | | | | * commit '3bff77a8f90e673dbf41d97b7b842a3e4a6986bf': Create /data/dalvik-cache/profiles
| | * Merge "Create /data/dalvik-cache/profiles"Nick Kralevich2014-06-101-0/+1
| | |\