summaryrefslogtreecommitdiffstats
path: root/rootdir
Commit message (Collapse)AuthorAgeFilesLines
* Revert "STOPSHIP: WifiStateMachine logging temporarily disabled"Mark Salyzyn2015-04-241-8/+0
| | | | | | This reverts commit 15ae6c2e7ce02db583ca5a6be5ca30499d56de87. Change-Id: I281a65209a5118a6c73ddec65ed40d149c23bf0b
* Merge "Revert "STOPSHIP: Additional Wifi logging temporarily disabled""Mark Salyzyn2015-04-241-2/+1
|\
| * Revert "STOPSHIP: Additional Wifi logging temporarily disabled"Mark Salyzyn2015-04-241-2/+1
| | | | | | | | | | | | This reverts commit 18b1da2033440cf362ea5c71ca687d359671096f. Change-Id: I86cde061a36a9a9e43c8a5df2df1e853ed32b7a0
* | am a8088f38: am ec389902: am 132440b0: Merge "Revert "Revert "Make init ↵Elliott Hughes2015-04-241-7/+0
|\ \ | | | | | | | | | | | | | | | | | | re-exec itself for its SELinux domain transition.""" * commit 'a8088f380932d873a39fafdd816f96328f7caa9c': Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
| * | Revert "Revert "Make init re-exec itself for its SELinux domain transition.""Elliott Hughes2015-04-241-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4217374611ada50f33aee544f015f6f9dfbf7ced. It turns out that the kernel passes any unrecognized arguments on to init, and (at least) N6 and N9 have such arguments. My lazy check of argc was thus insufficient to recognize what stage of init we were in, so we'd skip to stage 2 and not set up SELinux. And apparently you can get a very long way with SELinux off... We'll fix that in a later change. Bug: 19702273 Change-Id: I43b3fb722fed35dd217cb529cbcac9a29aff4e4b
* | | am b706a8ac: am 2db3cd3e: am 46fee19c: Merge "Revert "Make init re-exec ↵Nick Kralevich2015-04-241-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | itself for its SELinux domain transition."" * commit 'b706a8acff9c62da7b4045374b93a8739671a8a0': Revert "Make init re-exec itself for its SELinux domain transition."
| * | Merge "Revert "Make init re-exec itself for its SELinux domain transition.""Nick Kralevich2015-04-241-0/+7
| |\ \
| | * | Revert "Make init re-exec itself for its SELinux domain transition."Nick Kralevich2015-04-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shamu isn't booting. This reverts commit adf0d1bbfa4bc560c2106f14afa8258a11c48bf6. Change-Id: I89d568838cebbe14cc4a8ae3843f0f1ac54987af
* | | | am 77260323: am 20dfbb0f: am fa66b4e1: Merge "Remove long-obsolete file."Elliott Hughes2015-04-241-19/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '77260323e2e99a996351a98a44ef56db5f1e2767': Remove long-obsolete file.
| * | | Remove long-obsolete file.Elliott Hughes2015-04-231-19/+0
| | | | | | | | | | | | | | | | Change-Id: I728cc13b4a7ac93f9c923d2fc9bda2bb65ffe99d
* | | | am 77434ab3: am ef68fd3f: am d4656784: Merge "Make init re-exec itself for ↵Elliott Hughes2015-04-241-7/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | its SELinux domain transition." * commit '77434ab362b3234accf16499aaf2a5340d568553': Make init re-exec itself for its SELinux domain transition.
| * | | Merge "Make init re-exec itself for its SELinux domain transition."Elliott Hughes2015-04-241-7/+0
| |\ \ \ | | |/ /
| | * | Make init re-exec itself for its SELinux domain transition.Elliott Hughes2015-04-231-7/+0
| | | | | | | | | | | | | | | | Change-Id: I38adabe5789d671e3f7d21936071a758ec8cea8a
* | | | am 44f1356e: am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd ↵Mark Salyzyn2015-04-231-1/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | parse error" * commit '44f1356e42a64fefb194b5c74b62402f4ec2881e': rootfs: init.rc start logd parse error
| * | Merge "rootfs: init.rc start logd parse error"Mark Salyzyn2015-04-231-1/+2
| |\ \ | | |/ | |/|
| | * rootfs: init.rc start logd parse errorMark Salyzyn2015-04-201-1/+2
| | | | | | | | | | | | | | | init: /init.rc: 490: invalid option 'start' Change-Id: Ica985e45d4652dab0ebd434803344f14cc73d834
| * | create /data/misc/gatekeeperNick Kralevich2015-04-201-0/+1
| |/ | | | | | | Change-Id: I7631401ac21b60a22f6fd4052814186bf3bc2b05
* | STOPSHIP: Additional Wifi logging temporarily disabledMark Salyzyn2015-04-211-1/+2
| | | | | | | | | | Bug: 20416721 Change-Id: I1be1c742f47f0e673eef6a8d391246f47c35c336
* | STOPSHIP: WifiStateMachine logging temporarily disabledMark Salyzyn2015-04-211-0/+8
| | | | | | | | | | Bug: 20416721 Change-Id: Id60eb6ab77589ab50800532de0d2877adef1d5b7
* | Merge "Implement SID API"Andres Morales2015-04-161-1/+2
|\ \
| * | Implement SID APIAndres Morales2015-04-161-1/+2
| | | | | | | | | | | | Change-Id: Id11632a6b4b9cab6f08f97026dd65fdf49a46491
* | | am b4ef85c..b4ef85c from mirror-m-wireless-internal-releaseVinit Deshpande2015-04-141-0/+1
|\ \ \ | |/ / |/| | | | | b4ef85c Add Bluetooth SAP UIM socket
| * | Add Bluetooth SAP UIM socketDheeraj Shetty2015-04-121-0/+1
| | | | | | | | | | | | Change-Id: I1445e51f613ac3e21cf818c0b1364c334579593e
* | | am 90014d61: am 532d0a11: am 9b83b623: Merge "Executable to run on boot that ↵Neil Fuller2015-04-131-0/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | removes old tzdata if needed" * commit '90014d61c83ef5105881c171481a50f21fd4dd57': Executable to run on boot that removes old tzdata if needed
| * | Executable to run on boot that removes old tzdata if neededNeil Fuller2015-04-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tzdatacheck is exec'd from init.rc early in boot just after /data is mounted. It checks to make sure that the tz rule data in /data is newer than the version in /system. If the data is older it is deleted. This is to address problems with earlier tz rule updates that occurred: after an OTA upgrade previous updates in /data would override newer versions in the system partition. Includes change to init.rc neccessary to run it at boot time. Other changes are in external/selinux. Bug: 19941636 Bug: https://code.google.com/p/android/issues/detail?id=35730 Change-Id: I7cc61e058424c856da88f11ff9b259f34cb39dc7
* | | GateKeeper proxy serviceAndres Morales2015-04-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Until we have SELinux support for gating access to individual TEE services, we will proxy TEE requests to GateKeeper via this daemon. Change-Id: Ifa316b75f75bff79bdae613a112c8c3c2e7189a8
* | | am 4122304d: am 07e3ed46: am c19572fa: Merge "rootfs: init start logd in ↵Mark Salyzyn2015-04-081-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | post-fs" * commit '4122304de3990ca1fca2790468fb8e9ddcca11f2': rootfs: init start logd in post-fs
| * | rootfs: init start logd in post-fsMark Salyzyn2015-04-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earliest point we can start logd is after /system is mounted. Ideally on post-fs-system (does not exist), post-fs will do. As insurance, we will also make sure logd is started if a logd-reinit is requested. This results in logd starting at least 4 processes earlier than it does currently, with a tighter grouping of threads which means we are taking advantage of a lighter CPU load at the time, rather than taking cycles during heavy activity during core startup. Change-Id: If4f0bd3a53bb4c47500a54d741ca635d87c0c330
* | | am 5056cdcd: am 01190672: am de957955: Merge "Create /data/system/heapdump ↵Nick Kralevich2015-04-081-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | for system_server" * commit '5056cdcdde4901fe667522cfebf3e1f9e1af3b3b': Create /data/system/heapdump for system_server
| * | Create /data/system/heapdump for system_serverNick Kralevich2015-04-071-0/+1
| | | | | | | | | | | | | | | Bug: 20073185 Change-Id: I6fd83d33da33d048fdd6b07fa1f675ecb4f4eb2c
| * | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-03-311-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Fix build break caused by original change This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5. Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
* | | Mount point for expanded storage.Jeff Sharkey2015-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | | Managed by vold. Bug: 19993667 Change-Id: I7957b44d37d6a1f572cbec515d03856a8ed54391
* | | Merge "Revert "Revert "Adding e4crypt support"""Paul Lawrence2015-04-021-0/+11
|\ \ \
| * | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-04-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build break caused by original change This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5. (cherry picked from commit bbb4c85bdcc9a1bce315ed9d61a228bb1b992a1c) Change-Id: If0ead0f2656b69f33f72c64b03a05784455a4143
* | | | Different blkid and fsck execution domains.Jeff Sharkey2015-04-011-1/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Tell vold about which SELinux domains to use for different classes of devices. Also create a directory for vold to store private files. Bug: 19993667 Change-Id: Ib7bc80234f2b13a89b143bf90f147140109570cd
* | | Progress towards dynamic storage support.Jeff Sharkey2015-03-302-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support external storage devices that are dynamically added and removed at runtime, we're changing /mnt and /storage to be tmpfs that are managed by vold. To support primary storage being inserted/ejected at runtime in a multi-user environment, we can no longer bind-mount each user into place. Instead, we have a new /storage/self/primary symlink which is resolved through /mnt/user/n/primary, and which vold updates at runtime. Fix small mode bugs in FUSE daemon so it can be safely mounted visible to all users on device. Bug: 19993667 Change-Id: I0ebf4d10aba03d73d9a6fa37d4d43766be8a173b
* | | am 4ce3c828: am 0cd316a4: am 5db3936d: Merge "Log more timing information ↵Elliott Hughes2015-03-281-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | from init." * commit '4ce3c8288ba030c2d2a80cf94ceb5d2f84a66d26': Log more timing information from init.
| * | Log more timing information from init.Elliott Hughes2015-03-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make important events in init's life NOTICE rather than INFO, and ensure that NOTICE events actually make it to the kernel log. Also fix the logging so that if you have a printf format string error, the compiler now catches it. Also give messages from init, ueventd, and watchdogd distinct tags. (Previously they'd all call themselves "init", and dmesg doesn't include pids, so you couldn't untangle them.) Also include the tag in SELinux messages. Bug: 19544788 Change-Id: Ica6daea065bfdb80155c52c0b06f346a7df208fe
* | | Revert "Adding e4crypt support"Paul Lawrence2015-03-261-11/+0
| | | | | | | | | | | | | | | | | | This reverts commit 6095afc115fe3a4b7d151b4fcc164e00f9df9659. Change-Id: Icedfe0036223d7f42eaaefc4a35ad0f2efb14e4e
* | | Adding e4crypt supportPaul Lawrence2015-03-231-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add file encryption flag to fstab. If file encryption flag set in fstab, handle identically to block encrypted volumes. Requires matching change: https://googleplex-android-review.git.corp.google.com/#/c/642778/ Change-Id: I28c236959f2d7d5f0dccc8ea45c325ea0cf871fc
* | | Merge "Revert "lowmemorykiller: make perms 0220""Daniel Cardenas2015-03-201-2/+2
|\ \ \
| * | | Revert "lowmemorykiller: make perms 0220"Daniel Cardenas2015-03-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b3739735b84a88cccfe08c0d69b1017a07004470. Values are helpful to inspect during memory performance tuning. b/19847626 Change-Id: I004ed37d5cc67e466c1fd1a84e47348524056e87
* | | | am 169d029c: am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."Elliott Hughes2015-03-181-1/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '169d029c763a7e652e6d22ae42bb23707675541b': Switch init over to _PATH_DEFPATH.
| * | | Switch init over to _PATH_DEFPATH.Elliott Hughes2015-03-171-1/+0
| | | | | | | | | | | | | | | | | | | | Bug: 19564110 Change-Id: I343b4a360b10319dca13ab01f2d411ff940e9052
* | | | 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