Commit graph

612 commits

Author SHA1 Message Date
Narayan Kamath
dc9af896f0 resolved conflicts for merge of 6a949b45 to master
Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
2014-04-01 17:40:45 +01:00
Narayan Kamath
6a949b45e9 am ffca173c: am 5da2dbbc: Merge "Move zygote init config to its own file."
* commit 'ffca173c853a2e312610d87f40957f696ac8364a':
  Move zygote init config to its own file.
2014-04-01 16:29:57 +00:00
Narayan Kamath
5da2dbbc93 Merge "Move zygote init config to its own file." 2014-04-01 16:22:02 +00:00
Greg Hackmann
788b272268 am ae66fbbe: am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
* commit 'ae66fbbe0e747cb2485bac0fa47c9223268a2fc9':
  rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:30:26 +00:00
Greg Hackmann
ae66fbbe0e am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
* commit '697bdc604e8f266ebd6c94fc84eb5057b1a700e3':
  rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:24:39 +00:00
Greg Hackmann
a740b3bb40 Merge "rootdir: reduce permissions on /dev/rtc0" 2014-03-31 20:13:52 +00:00
Narayan Kamath
4456a55ce6 Move zygote init config to its own file.
This allows us to choose different configs depending on
whether or not the target is 64 capable, and what its preferred
default is.

bug: 13647418
Change-Id: Ie1ce4245a3add7544c87d27c635ee390f4062523
2014-03-31 12:31:11 +01:00
Greg Hackmann
b34fed34af rootdir: reduce permissions on /dev/rtc0
Remove world-readable, reduce group permissions to readable by system
daemons

Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-27 15:52:01 -07:00
Paul Lawrence
5c789b8a31 Merge "Auto-encrypt drive at startup" 2014-03-24 22:18:58 +00:00
Paul Lawrence
166fa3de70 Auto-encrypt drive at startup
Modify fs_mgr to unmount encryptable drives after test mounting them and
then trigger an auto-encrypt via the init script

Needs matching vold changes from
 https://googleplex-android-review.googlesource.com/#/c/414200/

Feature is limited to list of serial numbers with this change

Bug: 11985952
Change-Id: I84f85a258b6a7e9809467c9149249302e203c41b
2014-03-24 15:00:53 -07:00
Mark Salyzyn
bd28bb69c7 am b5f9e65a: am 0a0cc719: init.rc: Add lmkd service back
* commit 'b5f9e65ad127261df2f7c9ed40d73b9024f492f6':
  init.rc: Add lmkd service back
2014-03-24 19:36:37 +00:00
Mark Salyzyn
44983ace85 am 68b9d5f0: am bdef5499: resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp
* commit '68b9d5f07a443b44d81e09f65a45fea8c8f4984b':
  logd: core requirement
2014-03-24 19:36:32 +00:00
Mark Salyzyn
0a0cc7192e init.rc: Add lmkd service back
- not impressed with conflict for merge f8f0531b

Change-Id: I5b9a1a93ea0cf7eda4ced8dcfc9d0ad70f7aa6c8
2014-03-21 17:41:52 -07:00
Mark Salyzyn
bdef5499d4 resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp
Change-Id: I87228aa0dbd0b909437c85812f2404ca8be39f38
2014-03-21 16:57:22 -07:00
Mark Salyzyn
3c253dc88f logd: core requirement
- has no dependency on /data, switch from main to core

Change-Id: I4bfe3e67d4cbd31e943c609f5626e533857a27a9
2014-03-21 16:06:54 -07:00
JP Abgrall
d94ed2c8fe am 7283db6d: am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60
* commit '7283db6d2694c8deae644a0d815cf292309a6176':
  init.rc: prep tcp_default_init_rwnd, set the default to 60
2014-03-14 16:32:41 +00:00
JP Abgrall
7283db6d26 am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60
* commit 'efbf36f2dad8f083de6f48dbb682461d7cfa9781':
  init.rc: prep tcp_default_init_rwnd, set the default to 60
2014-03-14 16:28:05 +00:00
JP Abgrall
efbf36f2da init.rc: prep tcp_default_init_rwnd, set the default to 60
The kernel's default is between 4~20.

Prepare for javaland to modify the value at runtime.

It can be done via
  setprop sys.sysctl.tcp_def_init_rwnd  <value>


Bug: 12020135
Change-Id: Id34194b085206fd02e316401c0fbbb9eb52522d2
(cherry picked from commit 7c862c8b5e)
2014-03-13 00:25:51 +00:00
Mark Salyzyn
1d39c53e29 am 00eaae3a: am 556c9c24: am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"
* commit '00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37':
  set /proc/sys/net/unix/max_dgram_qlen to large value
2014-03-04 01:00:21 +00:00
Mark Salyzyn
556c9c245d am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"
* commit '858d0dd1e529575181abd8de607e46f7b273cc9d':
  set /proc/sys/net/unix/max_dgram_qlen to large value
2014-03-04 00:14:13 +00:00
Mark Salyzyn
581edc1b6c set /proc/sys/net/unix/max_dgram_qlen to large value
- init: set /proc/sys/net/unix/max_dgram_qlen to 300
- libsysutils: Add listen backlog argument to startListener
- logd: set listen backlog to 300

Change-Id: Id6d37d6c937ba2d221e76258d89c9516619caeec
2014-03-03 12:48:00 -08:00
Stephen Smalley
5c3c77ed78 Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed
in the various device-specific init*.rc files but seems generic.
Move it to the main init.rc file.

Drop the separate chown for /data/misc/dhcp as this is handled by mkdir
built-in if the directory already exists.

Add a restorecon_recursive /data/misc/wifi/sockets.

Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-28 10:23:01 -08:00
Nick Kralevich
d7ce27e8ae am e6fb169f: am e570fd3a: am 9453bce4: Merge "Apply restorecon_recursive to all of /data."
* commit 'e6fb169fd69bfa6775737f37d45041c5b229321c':
  Apply restorecon_recursive to all of /data.
2014-02-26 22:39:07 +00:00
Nick Kralevich
e570fd3a32 am 9453bce4: Merge "Apply restorecon_recursive to all of /data."
* commit '9453bce4cff952aab5c90f5b30c6c12d3e1521e5':
  Apply restorecon_recursive to all of /data.
2014-02-26 22:31:02 +00:00
Nick Kralevich
1bb3489e60 resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp
Change-Id: I9ee9908a915258937b343de90dce5774d914f03a
2014-02-26 14:02:02 -08:00
Nick Kralevich
9453bce4cf Merge "Apply restorecon_recursive to all of /data." 2014-02-26 21:36:30 +00:00
Mark Salyzyn
0175b0747a logd: initial checkin.
* Create a new userspace log daemon for handling logging messages.

Original-Change-Id: I75267df16359684490121e6c31cca48614d79856
Signed-off-by: Nick Kralevich <nnk@google.com>

* Merge conflicts
* rename new syslog daemon to logd to prevent confusion with bionic syslog
* replace racy getGroups call with KISS call to client->getGid()
* Timestamps are filed at logging source
* insert entries into list in timestamp order
* Added LogTimeEntry tail filtration handling
* Added region locking around LogWriter list
* separate threads for each writer
* /dev/socket/logd* permissions

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

(cherry picked from commit 3e76e0a497)

Author: Nick Kralevich <nnk@google.com>
Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
2014-02-26 09:52:35 -08:00
JP Abgrall
7c862c8b5e init.rc: prep tcp_default_init_rwnd, set the default to 60
The kernel's default is between 4~20.

Prepare for javaland to modify the value at runtime.

It can be done via
  setprop sys.sysctl.tcp_def_init_rwnd  <value>


Bug: 12020135
Change-Id: Id34194b085206fd02e316401c0fbbb9eb52522d2
2014-02-21 12:05:01 -08:00
Mark Salyzyn
4046c132dc Merge changes I929dddc7,Ice88b141,I243b1338
* changes:
  logd: prune more aggressively when over the top
  logd: initial checkin.
  logcat: test: add clear and blocking check
2014-02-20 00:27:02 +00:00
Colin Cross
b6391ce26b am ee9de136: am bb2da79f: am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"
* commit 'ee9de136c52555e8775611ad32fc8ee47c75e3d1':
  Start debuggerd64 for 64-bit processes
2014-02-16 19:57:27 +00:00
Colin Cross
bb2da79fda am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"
* commit '27fd413d6d02a53c453cf926717b67e9a8d1eb32':
  Start debuggerd64 for 64-bit processes
2014-02-16 19:50:59 +00:00
Dan Willemsen
78ef91aa5e Start debuggerd64 for 64-bit processes
Change-Id: I2fc33d9eb2726b043d2f13bfab0c605dbb6083c7
2014-02-16 11:30:27 -08:00
Nick Kralevich
3e76e0a497 logd: initial checkin.
* Create a new userspace log daemon for handling logging messages.

Original-Change-Id: I75267df16359684490121e6c31cca48614d79856
Signed-off-by: Nick Kralevich <nnk@google.com>

* Merge conflicts
* rename new syslog daemon to logd to prevent confusion with bionic syslog
* replace racy getGroups call with KISS call to client->getGid()
* Timestamps are filed at logging source
* insert entries into list in timestamp order
* Added LogTimeEntry tail filtration handling
* Added region locking around LogWriter list
* separate threads for each writer
* /dev/socket/logd* permissions

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
2014-02-14 11:07:54 -08:00
Paul Lawrence
b6e3b3cea2 Merge "Mount default encrypted devices at boot" 2014-02-14 15:24:41 +00:00
Nick Kralevich
b3739735b8 lowmemorykiller: make perms 0220
Set

* /sys/module/lowmemorykiller/parameters/adj
* /sys/module/lowmemorykiller/parameters/minfree

to 0220. This better indicates that these files are only intended
to be written to, never read.

Change-Id: I9ef054f032b3955e04128fc1a472a17c7b1fa792
2014-02-13 13:58:21 -08:00
Paul Lawrence
13d5bb4bad Mount default encrypted devices at boot
If userdata is default encrypted, we should mount it at boot
to avoid bringing the framework up and then down unnecessarily.

Needs matching vold changes from
 https://googleplex-android-review.googlesource.com/#/c/412649/

Bug: 8769627
Change-Id: I4b8276befd832cd788e15c36edfbf8f0e18d7e6b
2014-02-07 07:23:11 -08:00
Stephen Smalley
f2b7ee7655 Apply restorecon_recursive to all of /data.
With the following prior changes:
I77bf2a0c4c34b1feef6fdf4d6c3bd92dbf32f4a1
I698b1b2c3f00f31fbb2015edf23d33b51aa5bba1
I8dd915d9bb80067339621b905ea2b4ea0fa8d71e
it should now be safe (will correctly label all files)
and reasonably performant (will skip processing unless
file_contexts has changed since the last call) to call
restorecon_recursive /data from init.rc.

The call is placed after the setprop selinux.policy_reload 1 so that
we use any policy update under /data/security if present.

Change-Id: Ib8d9751a47c8e0238cf499fcec61898937945d9d
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-06 14:33:29 -05:00
Doug Zongker
6edd1bdf53 Merge "set permissions of recovery install script" 2014-02-04 22:01:29 +00:00
Doug Zongker
9526202d84 set permissions of recovery install script
The script that writes the recovery partition after a successful
update of system needs to be made executable.  This change also moves
it from /system/etc to /system/bin.

Bug: 12893978
Change-Id: I686e2392a2392515a6859a7381b735de1007b7ea
2014-02-04 12:33:08 -08:00
Nick Kralevich
d9d8a60e42 am fbca9d94: am 7e3d72d9: am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
* commit 'fbca9d9449231839b805ef4b11e4b2d968e601e3':
  Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-02-04 19:02:48 +00:00
Nick Kralevich
7e3d72d974 am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
* commit 'ba023b063d25b73923f2df536b6258967f756ff6':
  Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-02-04 18:37:36 +00:00
Stephen Smalley
82e87ed479 Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed
in the various device-specific init*.rc files but seems generic.
Move it to the main init.rc file.

Drop the separate chown for /data/misc/dhcp as this is handled by mkdir
built-in if the directory already exists.

Add a restorecon_recursive /data/misc/wifi/sockets.

Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-01-29 14:09:28 -05:00
Nick Kralevich
35ef36456d am c3af60af: am c7e28899: am 16384312: am 0620e3dd: Merge "adbd: switch to su domain when running as root"
* commit 'c3af60aff5d097c717b19721f143499891d5ca3d':
  adbd: switch to su domain when running as root
2014-01-24 18:14:51 +00:00
Nick Kralevich
c7e28899c3 am 16384312: am 0620e3dd: Merge "adbd: switch to su domain when running as root"
* commit '16384312244b8dccd53478a7bdeeb9a492821807':
  adbd: switch to su domain when running as root
2014-01-24 18:09:26 +00:00
Nick Kralevich
1638431224 am 0620e3dd: Merge "adbd: switch to su domain when running as root"
* commit '0620e3ddb85582f66612d046d1295dc20bf1a4f5':
  adbd: switch to su domain when running as root
2014-01-24 10:06:46 -08:00
Nick Kralevich
d49aa2537c adbd: switch to su domain when running as root
When adbd runs as root, it should transition into the
su domain. This is needed to run the adbd and shell
domains in enforcing on userdebug / eng devices without
breaking developer workflows.

Introduce a new device_banner command line option.

Change-Id: Ib33c0dd2dd6172035230514ac84fcaed2ecf44d6
2014-01-22 14:20:17 -08:00
Doug Zongker
d0f2c265d8 Merge "add the pre-recovery service" 2014-01-16 22:41:24 +00:00
Doug Zongker
7baebf1345 add the pre-recovery service
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
2014-01-16 08:54:59 -08:00
Nick Kralevich
32a32c9eb2 am 11190d0c: am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media."
* commit '11190d0ccb1216307043ceecf5360f1a1a946cd1':
  restorecon /data/misc/media.
2014-01-15 20:22:16 +00:00
Nick Kralevich
4552987e6a am c93904b4: am e847f429: Merge "restorecon /data/misc/media."
* commit 'c93904b445830cd17fd9dd6d4fe236987577a478':
  restorecon /data/misc/media.
2014-01-15 20:15:56 +00:00