summaryrefslogtreecommitdiffstats
path: root/rootdir
Commit message (Collapse)AuthorAgeFilesLines
* Merge "add the pre-recovery service"Doug Zongker2014-01-161-0/+5
|\
| * add the pre-recovery serviceDoug Zongker2014-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | Add a service called "pre-recovery" which is normally stopped but can be started by the system server when we want to go into recovery. It will do any preparation needed (currently needed to handle update packages that reside on an encrypted /data partition) and then set sys.powerctl when it's ready to actually reboot. Bug: 12188746 Change-Id: I894a4cb200395a0f6d7fe643ed4c2ac0a45d2052
* | am 11190d0c: am 4552987e: am c93904b4: am e847f429: Merge "restorecon ↵Nick Kralevich2014-01-151-0/+1
|\ \ | | | | | | | | | | | | | | | | | | /data/misc/media." * commit '11190d0ccb1216307043ceecf5360f1a1a946cd1': restorecon /data/misc/media.
| * \ am c93904b4: am e847f429: Merge "restorecon /data/misc/media."Nick Kralevich2014-01-151-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'c93904b445830cd17fd9dd6d4fe236987577a478': restorecon /data/misc/media.
| | * \ am e847f429: Merge "restorecon /data/misc/media."Nick Kralevich2014-01-151-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'e847f429f43ae56aaa406697ca603c8469e2100b': restorecon /data/misc/media.
| | | * | restorecon /data/misc/media.Stephen Smalley2014-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise it will be mislabeled on upgrades with existing userdata. Change-Id: Ibde88d5d692ead45b480bb34cfe0831baeffbf94 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | am af16bf4f: am 9c1cbe83: am 53cd1484: am aead003c: Merge "Don\'t set ↵Elliott Hughes2014-01-151-1/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | LD_LIBRARY_PATH globally." * commit 'af16bf4f5160c03c858b32c40900f07f1e9c0366': Don't set LD_LIBRARY_PATH globally.
| * | | am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."Elliott Hughes2014-01-151-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '53cd1484aa13c43b4d6973c1c203dbff9c996d14': Don't set LD_LIBRARY_PATH globally.
| | * | am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."Elliott Hughes2014-01-141-1/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'aead003c8bc677218329c535b063a5bb66695414': Don't set LD_LIBRARY_PATH globally.
| | | * Don't set LD_LIBRARY_PATH globally.Elliott Hughes2014-01-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a 64-bit system, 64-bit processes will want one path, 32-bit processes another. The dynamic linker already provides the correct defaults for native code, and we've coupled the VM and dynamic linker so that LD_LIBRARY_PATH will be set correctly in any VM during startup if it's not being manually overridden. Change-Id: Icbffc0d451dbc242cdfb9267413d8bcac434e108
* | | | am 4082bf8c: am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on ↵Colin Cross2014-01-091-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | user builds" * commit '4082bf8c963dbd44fe2f6367fa687217cbac58d3': Fix tracing on user builds
| * | | am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5a3696297b2f8d463ba601772df7af5966321d2e': Fix tracing on user builds
| | * | am cd0f824a: Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'cd0f824a7cfe91f4db24511830658228487ae919': Fix tracing on user builds
| | | * Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
| | | |\
| | | | * Fix tracing on user buildsCarton He2013-12-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need the set correct permission for print-tgid option or tracing of sched can't work on user build. Change-Id: Ia88aabe58128b911afd78f01c27f7da884ed03f0 Signed-off-by: Carton He <carton.he@marvell.com>
* | | | | am 218878d4: am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing ↵Nick Kralevich2014-01-081-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | /data/mediadrm files." * commit '218878d447b58b357f0dc97bfe6b77196d35a729': Label existing /data/mediadrm files.
| * | | | am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."Nick Kralevich2014-01-081-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '72f269f3050b3e5b2fd6be7d0a6a485114cc6ee7': Label existing /data/mediadrm files.
| | * | | am 8830b53b: Merge "Label existing /data/mediadrm files."Nick Kralevich2014-01-081-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '8830b53b76c05416c021df3eb0cea1dd541bc3ac': Label existing /data/mediadrm files.
| | | * | Label existing /data/mediadrm files.rpcraig2014-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use restorecon_recursive to label devices where the directory and subfiles have already been built and labeled. Change-Id: I0dfe1e542fb153ad20adf7b2b1f1c087b4956a12 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
| * | | | init.rc: start lmkdTodd Poynor2014-01-041-0/+9
| |/ / / | | | | | | | | | | | | Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
* | | | am 88d040a3: am 3df76c0c: am 6bec36ec: am 5b8abdf6: Merge "Apply strict ↵Nick Kralevich2014-01-021-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | SELinux checking of PROT_EXEC on mmap/mprotect calls." * commit '88d040a32feac727a7e11658198c32d9cc563d8e': Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
| * | | am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on ↵Nick Kralevich2014-01-021-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | mmap/mprotect calls." * commit '5b8abdf6278a4142736d918d1371d10c54c91db3': Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
| | * | Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."Nick Kralevich2014-01-021-0/+3
| | |\ \
| | | * | Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.Stephen Smalley2013-12-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If checkreqprot == 1, SELinux only checks the protection flags passed by the application, even if the kernel internally adds PROT_EXEC for READ_IMPLIES_EXEC personality flags. Switch to checkreqprot == 0 to check the final protection flags applied by the kernel. Change-Id: Ic39242bbbd104fc9a1bcf2cd2ded7ce1aeadfac4 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | am 469035b8: am fed48bb6: am 6604f2d1: am 2dcc2759: Merge "Run the console ↵Colin Cross2013-12-271-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | service shell in the shell domain." * commit '469035b83546a847a1f12c1feca50a1c7e5e1062': Run the console service shell in the shell domain.
| * | | | am 2dcc2759: Merge "Run the console service shell in the shell domain."Colin Cross2013-12-271-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2dcc275936aefbb5badf3b4822d492260077144d': Run the console service shell in the shell domain.
| | * | | Run the console service shell in the shell domain.Stephen Smalley2013-12-231-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows it to be permissive in userdebug/eng builds but confined/enforcing in user builds. Change-Id: Ie322eaa0acdbefea2de4e71ae386778c929d042b Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | am 5ae67beb: am c042bb01: am e25864b7: am 537f53b6: Merge "rootdir: add ↵Greg Hackmann2013-12-181-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | permissions for /dev/rtc0" * commit '5ae67bebc46a4974869458eb35270b23633aba0c': rootdir: add permissions for /dev/rtc0
| * | | am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"Greg Hackmann2013-12-171-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '537f53b682eb0d99e90da2a3e7389ea474bc583d': rootdir: add permissions for /dev/rtc0
| | * | rootdir: add permissions for /dev/rtc0Greg Hackmann2013-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If9d853bdae2399b1e7434f45df375ba1fd6dbe9c Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am 8b0d10c8: am a24e9a86: am 02ad8700: am e4335483: Merge "Relabel ↵Nick Kralevich2013-12-161-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | /data/misc/zoneinfo" * commit '8b0d10c870efbe8254f407e02c406c05bedfa0b5': Relabel /data/misc/zoneinfo
| * | | am e4335483: Merge "Relabel /data/misc/zoneinfo"Nick Kralevich2013-12-161-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e4335483e78292800e27c7bf0a67d23bee47dc84': Relabel /data/misc/zoneinfo
| | * | Relabel /data/misc/zoneinfoNick Kralevich2013-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The files in zoneinfo changed from system_data_file to zoneinfo_data_file. Fixup pre-existing files. Change-Id: Idddbd6c2ecf66cd16b057a9ff288cd586a109949
* | | | am 7d1f3a3d: am bdf53e2a: Merge "Do not change ownership on ↵Nick Kralevich2013-12-091-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | /sys/fs/selinux/enforce." * commit '7d1f3a3daa721892b3247e847f72f1e948a0a68f': Do not change ownership on /sys/fs/selinux/enforce.
| * | | am bdf53e2a: Merge "Do not change ownership on /sys/fs/selinux/enforce."Nick Kralevich2013-12-091-3/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bdf53e2a59654d2b1e8469616f1b0175b275219d': Do not change ownership on /sys/fs/selinux/enforce.
| | * | Do not change ownership on /sys/fs/selinux/enforce.Stephen Smalley2013-12-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no longer any reason to permit system UID to set enforcing mode. Change-Id: Ie28beed1ca2b215c71f2847e2390cee1af1713c3 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
| | * | Merge commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c' into HEADThe Android Open Source Project2013-12-051-3/+0
| | |\ \ | | | |/ | | |/|
* | | | am 5ebd8e43: am b2406973: Merge changes I727d9135,I3bd1b59d,I0d05aa28Greg Hackmann2013-11-271-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * commit '5ebd8e43ba992d12fcdac4aedf7da51b50d6b949': rootdir: add ueventd.rc rule for adf subsystem init: add subsystem rules to ueventd.rc init: handle ueventd path truncation better
| * | | am b2406973: Merge changes I727d9135,I3bd1b59d,I0d05aa28Greg Hackmann2013-11-261-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | * commit 'b240697339b1ff1f45217a48dc9d3fa8a2f21a2b': rootdir: add ueventd.rc rule for adf subsystem init: add subsystem rules to ueventd.rc init: handle ueventd path truncation better
| | * | rootdir: add ueventd.rc rule for adf subsystemGreg Hackmann2013-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I727d91355229692c11e0e309c0fcac051269eba3 Signed-off-by: Greg Hackmann <ghackmann@google.com>
| | * | Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEADThe Android Open Source Project2013-11-223-62/+82
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
* | | \ \ am fd1dd864: am 479efb54: init.rc: mount pstore fs, set console-ramoops ↵Todd Poynor2013-11-221-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | permissions * commit 'fd1dd864a896bd6233ee8c75b84d9771148dd9b3': init.rc: mount pstore fs, set console-ramoops permissions
| * | | | am 479efb54: init.rc: mount pstore fs, set console-ramoops permissionsTodd Poynor2013-11-221-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '479efb540a198a9b7cd278387b0d45009a05bb2b': init.rc: mount pstore fs, set console-ramoops permissions
| | * | | | init.rc: mount pstore fs, set console-ramoops permissionsTodd Poynor2013-11-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I44cb00f9123c6044a03de926b6a616da753bb549
* | | | | | am b6ee39bc: am 4a4616f6: am 048bb92f: Merge "split setptop ethernet tcp ↵Elliott Hughes2013-11-211-11/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer from wifi" * commit 'b6ee39bca4b774cf2ffbad8eb12dcfc13b8814c9': split setptop ethernet tcp buffer from wifi
| * | | | | am 4a4616f6: am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"Elliott Hughes2013-11-211-11/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | * commit '4a4616f6450f191faf168a10b6e2ffaba14803bd': split setptop ethernet tcp buffer from wifi
| | * | | am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"Elliott Hughes2013-11-201-11/+12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '048bb92f3f33196d96a51b446c73805e208a5333': split setptop ethernet tcp buffer from wifi
| | | * | | split setptop ethernet tcp buffer from wifiJianzheng Zhou2013-11-151-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0582ec75fddb904ca14b9cbddf593ddbd4195c41 Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
* | | | | | am 9b41f452: am a9e453f1: Merge "vold no longer does MS_MOVE; remove tmpfs." ↵Jeff Sharkey2013-10-171-3/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '9b41f452013123d0a394e696f597467da73108ed': vold no longer does MS_MOVE; remove tmpfs.
| * | | | | am a9e453f1: Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-devJeff Sharkey2013-10-171-3/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | * commit 'a9e453f1b552699f69dca19599c7624a581089bd': vold no longer does MS_MOVE; remove tmpfs.
generated by cgit v1.1 at 2025-02-03 19:22:29 +0000