Commit Graph

1481 Commits

Author SHA1 Message Date
Ajay Panicker 35a0ef524b Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)" am: 2c2a3f7a95 am: 3a9a16ee79 am: f5ffb20e6f
am: bf2b7a93b2

Change-Id: Iac994fa66eeb7b4e84cd72891ff7449bb51f9da3
2016-09-20 03:25:22 +00:00
Ajay Panicker bf2b7a93b2 Merge "Allow bluetooth service to access bluetooth directory and add /logs (1/6)" am: 2c2a3f7a95 am: 3a9a16ee79
am: f5ffb20e6f

Change-Id: Ied3f4a26681d0c1e3bd72d4f1d0de77fa9e7803a
2016-09-19 20:26:21 +00:00
Ajay Panicker 59d6a8cf8a Allow bluetooth service to access bluetooth directory and add /logs (1/6)
Bug: 31466840
Change-Id: I2c2766a2366600def81708d97cf3f3f13e0eb655
2016-09-19 17:50:56 +00:00
Todd Kjos 9453ea8ba9 resolve merge conflicts of c6937f2 to nyc-mr1-dev-plus-aosp
Change-Id: I82638b0dab5e1b5117f4ed4752fd2cbdaf8c47b1
2016-09-13 12:40:32 -07:00
TuHailong 049f38ed6e Fix zygote energy-aware scheduler tuning bug
Change-Id: Ib612e99f7b115c2fbd1503e0994948fd0b0a2dec
2016-09-13 08:14:00 -07:00
TuHailong d90a55c4bf Fix zygote energy-aware scheduler tuning bug
Change-Id: Ib612e99f7b115c2fbd1503e0994948fd0b0a2dec
2016-09-08 21:45:41 +08:00
Wei Wang d61a7e2da4 Split fstab mount into 2 phases
This will make it possible to start some key services before mounting
data partition

Bug: 30118894
Change-Id: Ia9f8cc035de6cc0df9a61605864915efa0266d7f
(cherry picked from commit abfbec342f)
2016-09-06 21:04:26 +00:00
Wei Wang 254f44363b Split fstab mount into 2 phases
This will make it possible to start some key services before mounting
data partition

(cherry picked from commit abfbec342f)

Bug: 30118894
Change-Id: Ia9f8cc035de6cc0df9a61605864915efa0266d7f
2016-09-06 11:39:05 -07:00
Wei Wang abfbec342f Split fstab mount into 2 phases
This will make it possible to start some key services before mounting
data partition

Bug: 30118894
Change-Id: Ia9f8cc035de6cc0df9a61605864915efa0266d7f
2016-09-02 18:11:06 -07:00
Andreas Gampe 9acbbbddc9 Asan.options: Use abort_on_error am: 67b7e85b18 am: 4f31cff93b
am: bdbe675fa1

Change-Id: I4f9c8b507e9f5fc84790eac8c2cc6d65aed8d5f8
2016-08-17 19:32:23 +00:00
Andreas Gampe bdbe675fa1 Asan.options: Use abort_on_error am: 67b7e85b18
am: 4f31cff93b

Change-Id: I8c06aea3ede9f93493aa905ceb0c363e8abc3c1f
2016-08-17 19:05:56 +00:00
Andreas Gampe 67b7e85b18 Asan.options: Use abort_on_error
Use abort to have debuggerd act and create a tombstone.

Bug: 30775464
Change-Id: I359c7c7c094880b7b55304cd2aa3f4b360b729d8
2016-08-16 15:45:56 -07:00
Badhri Jagan Sridharan d80cd74426 Remove redundant action triggers on persist.sys.usb.config am: 05e04a134e am: ab5c247b0d
am: 9306e7c17a

Change-Id: Ifc8ae396e1401cafc37709f88b34601d1ed37953
2016-08-10 22:31:53 +00:00
Badhri Jagan Sridharan 9306e7c17a Remove redundant action triggers on persist.sys.usb.config am: 05e04a134e
am: ab5c247b0d

Change-Id: I470da113930539b5ae0ad4a706c8dfe080a52ee2
2016-08-10 22:25:58 +00:00
Badhri Jagan Sridharan 05e04a134e Remove redundant action triggers on persist.sys.usb.config
persist.sys.usb.config stores the usb functions which need to be enabled
when the phone boots up. When the phone is actually booted, setting this
would also activate the following action trigger on sys.usb.config

From init.usb.rc:
Used to set USB configuration at boot and to switch the configuration
when changing the default configuration
on property:persist.sys.usb.config=*
    setprop sys.usb.config ${persist.sys.usb.config}

sys.usb.config is anyways set to the actual functions by UsbDeviceManager
once it is set to none. Therefore add "on boot" condition to the above
action trigger so that persist.sys.usb.config does not race with
sys.usb.config.

BUG: 30440213
Change-Id: I3333d0b8334fb627469c7faad250bf3151bb1ebf
2016-08-01 21:56:23 +00:00
Amit Pundir 451dc52cb9 Merge \\\\"init: usb: delete rndis func to unregister n/w interface\\\\" am: 060b15e20a am: 6d287b3de7 am: e2f4d9e770
am: 9c23e55189

Change-Id: I7541b31811680cfdf85432a11880623fcc6142a8
2016-07-29 17:24:34 +00:00
Amit Pundir 9c23e55189 Merge \\\"init: usb: delete rndis func to unregister n/w interface\\\" am: 060b15e20a am: 6d287b3de7
am: e2f4d9e770

Change-Id: I10e03cad4cb026c86ce5882f6c25829830bf8d9f
2016-07-29 17:06:43 +00:00
Amit Pundir 6d287b3de7 Merge \"init: usb: delete rndis func to unregister n/w interface\"
am: 060b15e20a

Change-Id: I26e6e414f81fdee55fdfeb017ac0c4f5b0941eea
2016-07-29 17:01:15 +00:00
Martijn Coenen e90c3da3ab Add hwbinder dev node permissions.
Change-Id: I8ec92a29287b17636c363c55a8565dacab19043d
(cherry picked from commit e029e7c03dd798e70b5c3e5efdffb84c7f64a417)
2016-07-22 20:59:02 +00:00
Amit Pundir aae7b4984c init: usb: delete rndis func to unregister n/w interface
Rndis n/w interface "usb0" registration/deregistration is broken. If a
user try to switch to other functions or disable usb tethering or unplug
the usb cable then it doesn't kill "usb0" interface.

Fix is to delete Rndis function to unregister tethering interface when
switching from tethering to other functions or disable/unplug the
tethering cable. If we don't do that then the rndis netdev interface
will never be freed or unregistered.

This also means the rndis function has to be created everytime user
enable tethering function from Settings instead of creating it at
"on boot" in init.$hardware.usb.rc like we do currently. A relevant fix,
Change-Id: Icb49020d624fb21ef2607d473948cbbf3b9cc469, for reference has
already been submitted for device/linaro/hikey

Change-Id: If1f922e02277cccdc8c0b263be63989ee102cc80
Reported-by: Winter Wang <wente.wang@nxp.com>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-07-19 13:11:50 +05:30
Tianjie Xu 7edd3146c7 Merge \\"Start update_verifier in cache group\\" into nyc-mr1-dev am: eddde7a130
am: 872b6e8790

Change-Id: Iac20bb4571292da8b783de8185dff93dc04850b9
2016-07-14 23:06:49 +00:00
Tianjie Xu 872b6e8790 Merge \"Start update_verifier in cache group\" into nyc-mr1-dev
am: eddde7a130

Change-Id: Ia17697a852687f319050a8cf260316f522564085
2016-07-14 22:43:16 +00:00
Tianjie Xu eddde7a130 Merge "Start update_verifier in cache group" into nyc-mr1-dev 2016-07-14 22:27:08 +00:00
Pat Tjin 5408a76637 Merge \\"core/init.rc: Add /data/cache/* directory creation\\" into nyc-mr1-dev am: 46066ef405
am: b05988b33a

Change-Id: Iae9bc319eaad99364b59772260867fb90b08eeae
2016-07-14 19:23:27 +00:00
Yueyao (Nathan) Zhu b05988b33a Merge \"core/init.rc: Add /data/cache/* directory creation\" into nyc-mr1-dev
am: 46066ef405

Change-Id: Id67c7a2177520da1f3848642a68442c55b4f863d
2016-07-14 18:34:21 +00:00
Pat Tjin 46066ef405 Merge "core/init.rc: Add /data/cache/* directory creation" into nyc-mr1-dev 2016-07-14 18:28:51 +00:00
Tianjie Xu 1e4635f0a8 Start update_verifier in cache group
Start update_verifier in cache group to avoid dac_override

Bug: 30020920
Change-Id: I227b4a0e1c07e7b9bf209b432e9db02275ffe660
2016-07-12 18:31:17 -07:00
Tim Murray e43d1d523e Merge \\"Add support for background stune group.\\" into nyc-mr1-dev am: 531bdd5a2c
am: b386d72266

Change-Id: Ib0e2efeef7e015e0e8244e29a825bf3da50297a8
2016-07-12 02:46:06 +00:00
Irina Patru 51dcc811dc Merge \\"init.rc: Remove cpu weight set on the root cgroup\\" into nyc-mr1-dev am: ac957cbd72
am: ddb0f3c612

Change-Id: Ia872bcedde94c70dadc2c3a4e69e2d5cd375c28f
2016-07-12 02:46:05 +00:00
Tim Kryger 1af798ddc5 Merge \\\\"Remove attempt to write sched_compat_yield\\\\" am: 3f2db32b8c am: 49a986bf73 am: f789bd0133
am: 3886aaeae4

Change-Id: I6da3999160ca054e0d8e819e4b35420ae19507c7
2016-07-12 02:46:05 +00:00
Tim Murray 17b1c0c061 Merge changes from topic \\'stune\\' into nyc-mr1-dev am: 4b75a86858
am: b8a19f4499

Change-Id: Iecdd4d4693534640aef408f40aa3fd1e1fa9b93e
2016-07-12 02:05:02 +00:00
TreeHugger Robot 3f947d1c58 Merge "Remove attempt to write sched_compat_yield" into nyc-mr1-dev 2016-07-12 00:09:03 +00:00
Tim Murray b386d72266 Merge \"Add support for background stune group.\" into nyc-mr1-dev
am: 531bdd5a2c

Change-Id: Ia3be10db68dffc44e2d70535544c7c59d0933f7d
2016-07-11 23:55:17 +00:00
Tim Murray 531bdd5a2c Merge "Add support for background stune group." into nyc-mr1-dev 2016-07-11 23:21:12 +00:00
Irina Patru ddb0f3c612 Merge \"init.rc: Remove cpu weight set on the root cgroup\" into nyc-mr1-dev
am: ac957cbd72

Change-Id: I00c942a5d3e283efe40541c12f7daac2d2c77770
2016-07-11 22:29:13 +00:00
Tim Kryger f3e1f13d81 Remove attempt to write sched_compat_yield
The sched_compat_yield option was eliminated in Linux 2.6.38 by commit
ac53db596cc0 ("sched: Use a buddy to implement yield_task_fair()") and
as a result, the following error is printed to the log during boot up.

init: write_file: Unable to open '/proc/sys/kernel/sched_compat_yield':
No such file or directory"

Bug: 30034121
Change-Id: Idbdb68de0cb3ab1f67d82a4d66af880bcfdfe261
(cherry picked from commit 724dfbac70)
2016-07-11 15:22:50 -07:00
TreeHugger Robot ac957cbd72 Merge "init.rc: Remove cpu weight set on the root cgroup" into nyc-mr1-dev 2016-07-11 22:20:22 +00:00
Tim Kryger 3886aaeae4 Merge \\\"Remove attempt to write sched_compat_yield\\\" am: 3f2db32b8c am: 49a986bf73
am: f789bd0133

Change-Id: I7434b27cf1662543efbe7b5d9fee6bac16cc9f26
2016-07-11 21:44:49 +00:00
Tim Kryger 49a986bf73 Merge \"Remove attempt to write sched_compat_yield\"
am: 3f2db32b8c

Change-Id: I13c56436dd00cf2d5336ba757ae2c32d2e2504b5
2016-07-11 21:31:08 +00:00
Tim Murray 5dcff8f2b1 Add support for background stune group.
bug 29512132

Change-Id: If8144bfee0fb30cf11f2bb26494ca5e83c11d4d7
2016-07-11 13:57:31 -07:00
Tim Murray b8a19f4499 Merge changes from topic \'stune\' into nyc-mr1-dev
am: 4b75a86858

Change-Id: Ib11061d5d539f2e82ad16f122ea7d7b621bd988d
2016-07-11 20:35:56 +00:00
Irina Patru 23ad7517d2 init.rc: Remove cpu weight set on the root cgroup
It isn't allowed to change the cpu.share value for the root cgroup.
See kernel commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597

This fixes the following error seen in dmesg:
init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument

BUG: 28735908

Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af
Signed-off-by: Irina Patru <irina.patru@intel.com>
(cherry picked from commit c560c6310f)
2016-07-11 12:35:51 -07:00
Tim Kryger 724dfbac70 Remove attempt to write sched_compat_yield
The sched_compat_yield option was eliminated in Linux 2.6.38 by commit
ac53db596cc0 ("sched: Use a buddy to implement yield_task_fair()") and
as a result, the following error is printed to the log during boot up.

init: write_file: Unable to open '/proc/sys/kernel/sched_compat_yield':
No such file or directory"

Bug: 30034121
Change-Id: Idbdb68de0cb3ab1f67d82a4d66af880bcfdfe261
2016-07-11 11:41:56 -07:00
Tim Murray 955694b657 Add support for top-app stune group.
bug 29512132

Change-Id: I41ec2dd80a469309f48dbb59fc27fbe43fcd67b3
2016-07-11 11:40:15 -07:00
Dan Willemsen 0a5bbe421f Merge \\\\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\\\" am: 5d420e791b am: bdd01e86a5 am: a5b9b8f452
am: d377004c98

Change-Id: I9b56d6e84a121120f1c7df054a0bfdc96076aecb
2016-07-09 06:28:31 +00:00
Dan Willemsen d377004c98 Merge \\\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\\" am: 5d420e791b am: bdd01e86a5
am: a5b9b8f452

Change-Id: Iceb0c03fa05a7f6126428128c8e5dced5e7e6cef
2016-07-09 06:08:40 +00:00
Dan Willemsen bdd01e86a5 Merge \"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\"
am: 5d420e791b

Change-Id: I3a65ccc6bc5d6b3c63484baaa6d816939bd48073
2016-07-09 06:03:09 +00:00
Dan Willemsen 0790431f75 Use BOARD_USES_VENDORIMAGE to detect vendor image presence
When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.

Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
2016-07-08 18:17:48 -07:00
Tim Murray 10b2ad167a resolve merge conflicts of 3a29e34 to nyc-mr1-dev-plus-aosp
am: 6469fa2a7e

Change-Id: I36b1580a9ce0548b27059699998289aa34fade7d
2016-07-07 20:47:56 +00:00
Tim Murray 6469fa2a7e resolve merge conflicts of 3a29e34 to nyc-mr1-dev-plus-aosp
Change-Id: I4edd53094a98fcb3cd3e1b063122d13f80d36d3c
2016-07-07 13:40:18 -07:00
Tim Murray 3a29e344b0 Update FIFO settings for new uses of FIFO.
Adjust FIFO timings as well as allow SurfaceFlinger to use FIFO.

bug 24503801

Change-Id: I2c21d4c1788777c2d0d77227bb872701b35c4ff6
2016-07-07 11:35:41 -07:00
Andreas Gampe 6265780094 Rootdir: Add more asan.options support am: 8ccc1ad0f7
am: e33c9e426b

Change-Id: Ia6a03d301832ec649976bc9889694a0b4203696f
2016-06-24 00:50:29 +00:00
Andreas Gampe e33c9e426b Rootdir: Add more asan.options support
am: 8ccc1ad0f7

Change-Id: Ia72be83e461a3f09d6cd86fca99a89d9b6a71bb2
2016-06-24 00:47:52 +00:00
Andreas Gampe 8ccc1ad0f7 Rootdir: Add more asan.options support
Extend the asan.options file to read binary-specific configuration
from files out of /system. For early services, the system image
location is important as /data may not be available when they are
started.

Add a template that turns most sanitization off. At this point in
time, it is, however, impossible to get to a zero overhead state
after the fact. The template is meant to adapt a build after the
fact, and work around issues with LOCAL_SANITIZE := never.

Add a Make variable and rule copying the template to the path and
name expected by ASAN. Add SANITIZE_LITE to automatically add a
large set of options files.

Bug: 29498013
Change-Id: I8e9e6929a55cee3f3fa0acb377a886bfa7006c91
2016-06-23 14:45:35 -07:00
Yueyao (Nathan) Zhu 60c6dacd62 core/init.rc: Add /data/cache/* directory creation
Bug: 28845422
Change-Id: I2abcc67176cf94f34706f8f005a24ef5f70e0494
2016-06-21 12:14:53 -07:00
Vitalii Tomkiv c9a21ef605 Merge \\\\"Set zygote process priority to -20 to speed up VM startup time.\\\\" am: 92774329dd am: bf5f0fae07 am: b20a94398b
am: 7a1a6b91a7

Change-Id: I59cd191b21693481ab004a8d1abc092620b178ed
2016-06-16 17:28:10 +00:00
Vitalii Tomkiv 7a1a6b91a7 Merge \\\"Set zygote process priority to -20 to speed up VM startup time.\\\" am: 92774329dd am: bf5f0fae07
am: b20a94398b

Change-Id: I65c0b4e96718c89ff3706516727cd6e6fed3d66b
2016-06-16 17:18:30 +00:00
Vitalii Tomkiv bf5f0fae07 Merge \"Set zygote process priority to -20 to speed up VM startup time.\"
am: 92774329dd

Change-Id: I3c70a90e4d4e07f7c733a3a2738b0067ac09b6dd
2016-06-16 17:09:36 +00:00
Vitalii Tomkiv 372e5474d4 Set zygote process priority to -20 to speed up VM startup time.
Tests for Nexus9 device shows 450ms boot time speedup, 180ms for Nexus
5X.

Bug: 28866384

Change-Id: Icefd130d4bfe5538dae5b9518250807351b0789e
2016-06-08 10:54:03 -07:00
Tao Bao abb1165236 Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev am: f9b7f7fdba
am: 27bbf8953d

* commit '27bbf8953d5a141912fe9325a4995da18ca86a6d':
  Create /data/ota_package for OTA packages.

Change-Id: I243ec91e45bf202a6867645504eb963b64262556
2016-06-07 04:45:48 +00:00
Tao Bao 27bbf8953d Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev
am: f9b7f7fdba

* commit 'f9b7f7fdba6f62309372fee7c619de1edd8aa389':
  Create /data/ota_package for OTA packages.

Change-Id: I8d0cb3b8687d376efbfbbf186f858bef1c7ccf8e
2016-06-07 04:43:14 +00:00
Tao Bao 380d6b1b4d Create /data/ota_package for OTA packages.
We will store OTA packages there for both A/B and non-A/B OTAs. The
directory will be accessed by GMSCore (for both), uncrypt (non-A/B),
update_engine (A/B), update_verifier (A/B) and possibly system server
(for non-A/B OTAs to clean up half-way uncrypt'd packages).

Bug: 28944800
Change-Id: I5aa8156ec5052bd15dfadd4d8c28925d464e4401
2016-06-03 13:11:29 -07:00
Daniel Micay 52ebee9865 add a property for controlling perf_event_paranoid
am: fe01f56c0d

* commit 'fe01f56c0d5c42508e1e82f5976e4c10bb00f632':
  add a property for controlling perf_event_paranoid

Change-Id: I1059ecb2c1d1aba95cd3c93f208ae7ca904cf95e
2016-06-02 02:05:20 +00:00
Jeffrey Vander Stoep f97ae58686 Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3 am: a6d6f45037 am: 680b2f3cb6
am: 0e7344f1ca

* commit '0e7344f1cad902133480d5137af2bdae1bf255e4':
  add a property for controlling perf_event_paranoid

Change-Id: Ib4536fb05b7a3842f208e29bb6ace43ec87f1a39
2016-06-02 01:30:50 +00:00
Daniel Micay fe01f56c0d add a property for controlling perf_event_paranoid
(Cherry picked from commit 2b22a66382)

This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-06-01 16:58:48 -07:00
Daniel Micay 0e7344f1ca Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3 am: a6d6f45037
am: 680b2f3cb6

* commit '680b2f3cb61e29a46d0d6bdf89394dd96e82f201':
  add a property for controlling perf_event_paranoid

Change-Id: I23b928d61d2fa81637aefa09c34bf0e20777ad55
2016-06-01 23:47:44 +00:00
Jeffrey Vander Stoep 680b2f3cb6 Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3
am: a6d6f45037

* commit 'a6d6f45037025175b3074661c9d2d80931d71817':
  add a property for controlling perf_event_paranoid

Change-Id: Ic1e1a1365735f73edde6767bf71da8c6e59b46a4
2016-06-01 23:33:12 +00:00
David Sehr bc3ff3a7a2 add /data/misc/profman for output am: 0eb24e1bc7 am: cdc503c13b
am: 0be76bb96f

* commit '0be76bb96f718d802cfed09b41202fb07ba867af':
  add /data/misc/profman for output

Change-Id: Ic2c4c42e2cb59cfb609963a36b29325f7044041d
2016-06-01 14:13:40 +00:00
David Sehr 0be76bb96f add /data/misc/profman for output am: 0eb24e1bc7
am: cdc503c13b

* commit 'cdc503c13b153c8a9216725dcd0f03ee6414161e':
  add /data/misc/profman for output

Change-Id: I60764f97eacd6853f17baed62bb6beee67fbc6fa
2016-06-01 14:05:15 +00:00
David Sehr cdc503c13b add /data/misc/profman for output
am: 0eb24e1bc7

* commit '0eb24e1bc7317eb5764567223cdd9405d16aefa7':
  add /data/misc/profman for output

Change-Id: I8d8ebc0dc37aee1ac54f8e50e374cad77a6fe77a
2016-06-01 14:01:10 +00:00
David Sehr b829f909f7 add /data/misc/profman for output
am: 0eb24e1bc7

* commit '0eb24e1bc7317eb5764567223cdd9405d16aefa7':
  add /data/misc/profman for output

Change-Id: Id672a7e5f4b64c9b3d707b4f45f1e7f8ce40ca34
2016-06-01 14:01:10 +00:00
David Sehr 0eb24e1bc7 add /data/misc/profman for output
Bug: 28748264
Change-Id: Ib57ccc570de446e03ea8c27ce8e404929138b213
2016-05-31 17:36:41 -07:00
Daniel Micay 2b22a66382 add a property for controlling perf_event_paranoid
This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-05-31 17:45:05 -04:00
Srinath Sridharan 492883c839 Merge "Only apply schedTune boost to top-app tasks" into nyc-mr1-dev am: 87a4f046f0
am: e7b8d06f18

* commit 'e7b8d06f186450977426cb07b5ee212cdc93246d':
  Only apply schedTune boost to top-app tasks

Change-Id: I25d51e00c5dfc1e3bca359c6332bd388a37c513c
2016-05-24 00:20:41 +00:00
Srinath Sridharan e7b8d06f18 Merge "Only apply schedTune boost to top-app tasks" into nyc-mr1-dev
am: 87a4f046f0

* commit '87a4f046f01ff49d69e4ff2446266c29557fb5e1':
  Only apply schedTune boost to top-app tasks

Change-Id: I32ec1f0811971a527234672cadeeddcb50fd1369
2016-05-24 00:14:03 +00:00
Srinath Sridharan 87a4f046f0 Merge "Only apply schedTune boost to top-app tasks" into nyc-mr1-dev 2016-05-24 00:00:06 +00:00
Srinath Sridharan 1339871138 Only apply schedTune boost to top-app tasks
When using EAS, the foreground tasks were all getting boosted
during touchboosts. Limit it to top-app tasks.


BUG: 28378389
Change-Id: I72b7158a614bfd9b6c61024774e408ceba61fc9c
2016-05-23 23:59:38 +00:00
Badhri Jagan Sridharan 032a45f435 Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836 am: b61ecb5213 am: 7e11db1b32
am: 66d69b902f

* commit '66d69b902f4ba15f2d2ad6b3d8214ae3355076cd':
  init: usb: disable usb function switch until adbd is ready

Change-Id: Ib9022f062bece4a7fee2772df1d8f917c04f8e55
2016-05-16 19:53:30 +00:00
Winter Wang 66d69b902f Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836 am: b61ecb5213
am: 7e11db1b32

* commit '7e11db1b3206cd92d52fca0b324f6a5260a68aec':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I12e8fab36f39a9b97e52ace30ab54b3a9fd7bf0f
2016-05-16 19:48:39 +00:00
Badhri Jagan Sridharan 7e11db1b32 Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836
am: b61ecb5213

* commit 'b61ecb5213e1c94e823f23d7f5a8a0a93db617d6':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I5fc733ee946b4d0accf58f56c80270f9e13d9f63
2016-05-16 19:43:50 +00:00
Badhri Jagan Sridharan 2a26c2a836 Merge "init: usb: disable usb function switch until adbd is ready" 2016-05-16 19:34:51 +00:00
Patrick Tjin f44442215d Create symlink in the case where device has no cache partition am: c6535a343f
am: 31788415ed

* commit '31788415ed6d89eba11ee757f04ff32ee260a7c1':
  Create symlink in the case where device has no cache partition

Change-Id: Ic5813d8f9fab4a02d6e0fab4add2fa0a8a72c008
2016-05-14 03:39:11 +00:00
Patrick Tjin 31788415ed Create symlink in the case where device has no cache partition
am: c6535a343f

* commit 'c6535a343f0b0bdd0f4171f0b4c9be401beebf77':
  Create symlink in the case where device has no cache partition

Change-Id: Ibcec898104e6509e70647576611ecc7d887f163d
2016-05-14 03:36:41 +00:00
Patrick Tjin c6535a343f Create symlink in the case where device has no cache partition
Create symlink from /cache to /data/cache for devices
which have no cache partition.

Bug: 28747374
Change-Id: Ifb0c3250f1be345ce46fcdb78533e36c2250bb85
2016-05-13 15:25:04 -07:00
Irina Patru 0ba7983b9f Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506 am: 2618d90c2f am: 12397f202f
am: 403461f67d

* commit '403461f67d47e1156115d6e1be3925e48cb182f7':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: Iabaf0f78e60a5e3ac28f88d6951d49cde8717940
2016-05-12 18:22:58 +00:00
Irina Patru 403461f67d Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506 am: 2618d90c2f
am: 12397f202f

* commit '12397f202f97da7dcd40d45159696bc6be50aaf6':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I256d702368c1b4ed8688006abb5202dcc0d11f83
2016-05-12 18:16:09 +00:00
Irina Patru 12397f202f Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506
am: 2618d90c2f

* commit '2618d90c2fa3f952a195dfd4ecd9f92ec462bccb':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I2663c368032a3c9f851de7d1e47f68c3a25b0d52
2016-05-12 18:13:14 +00:00
Irina Patru c560c6310f init.rc: Remove cpu weight set on the root cgroup
It isn't allowed to change the cpu.share value for the root cgroup.
See kernel commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597

This fixes the following error seen in dmesg:
init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument

BUG: 28735908

Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af
Signed-off-by: Irina Patru <irina.patru@intel.com>
2016-05-12 14:57:31 +03:00
Srinath Sridharan 54c2ab9732 marlin/eas: Fixing foreground/schedtune.boost path. am: 7ac34d0
am: f746166

* commit 'f746166fdc627d48a3e8b3a6baf0a86cd93b7271':
  marlin/eas: Fixing foreground/schedtune.boost path.

Change-Id: I8e5a7a6742bbec4a5d00e852780e827bb7833f52
2016-04-26 16:36:50 +00:00
Srinath Sridharan f746166fdc marlin/eas: Fixing foreground/schedtune.boost path.
am: 7ac34d0

* commit '7ac34d08efb3290bab77c6ed3bbbec067aeddf09':
  marlin/eas: Fixing foreground/schedtune.boost path.

Change-Id: I0a549cb1fe0e5bd5ce89a7178d1468f808f175f7
2016-04-25 23:23:49 +00:00
Srinath Sridharan 7ac34d08ef marlin/eas: Fixing foreground/schedtune.boost path.
BUG: 28378389
Change-Id: I613fd5622d3d27deafe6054bbf2a4799d97f9170
2016-04-25 13:09:05 -07:00
Paul Lawrence 77e05cd29a Merge "Don\'t start defaultcrypto twice" into nyc-dev am: fe5d55a am: 1a920d7
am: fa3e4ea

* commit 'fa3e4ea7c3dec9e7715ac46553714b8493005bb1':
  Don't start defaultcrypto twice

Change-Id: I7d225afe784949d96e5a628d97c18f90c1038721
2016-04-19 14:52:45 +00:00
Paul Lawrence 1a920d72dc Merge "Don\'t start defaultcrypto twice" into nyc-dev
am: fe5d55a

* commit 'fe5d55a68b9dc3a593d3f6ee5be919b8a9de710c':
  Don't start defaultcrypto twice

Change-Id: I0e9a27208ea046a2cf738992ba97141da9026c08
2016-04-19 14:46:48 +00:00
Paul Lawrence fe5d55a68b Merge "Don't start defaultcrypto twice" into nyc-dev 2016-04-19 14:44:26 +00:00
Paul Lawrence 1f99218612 Don't start defaultcrypto twice
The old way (using triggers) starts defaultcrypto twice because
queue_property_triggers_action retriggers the action.

Bug: 27452459
Change-Id: I48c844836f551673d0dbfed6c33bd8ee1e035f40
2016-04-18 15:37:31 -07:00
Jeff Sharkey 2deb078895 Merge "Create legacy /data/system/user directory." into nyc-dev am: e4f870a am: 2a9974a
am: 1b59b81

* commit '1b59b815bab116d11347011791c020981432a99d':
  Create legacy /data/system/user directory.

Change-Id: Ib1983ee798a81b316d055cf2f8c9a239bdfd1253
2016-04-18 20:18:03 +00:00
Jeff Sharkey 1b59b815ba Merge "Create legacy /data/system/user directory." into nyc-dev am: e4f870a
am: 2a9974a

* commit '2a9974a9682291f4e7dcbb2e940ac2e42a0d6c2c':
  Create legacy /data/system/user directory.

Change-Id: I20b29a6fb802966be184cb78534b4dd7d36eee66
2016-04-18 20:05:44 +00:00
Jeff Sharkey 0ef5c5cb20 Merge "Create legacy /data/system/user directory." into nyc-dev
am: e4f870a

* commit 'e4f870a0bb260f351208b9fe3cf7334e58c16a14':
  Create legacy /data/system/user directory.

Change-Id: I9b18134310c101974eb353d635c9cc8f8488877f
2016-04-18 19:59:34 +00:00
Jeff Sharkey c9b84a362a Create legacy /data/system/user directory.
We create per-user directories under this location, so it should
only be created once by init, similar to all the other user-specific
directories.

Bug: 27896918
Change-Id: I9ec55e4fd763c0eda6c6e50483694a6377344586
2016-04-15 13:42:29 -06:00
Nick Kralevich bc725db93a init.rc: Restore the /mnt/sdcard symlink am: d2f0a2c
am: bcf98cf

* commit 'bcf98cfcd40f2d408f601061ba1071b52d92ffbc':
  init.rc: Restore the /mnt/sdcard symlink

Change-Id: I50ec25bcc48f4cc312b8559b5985a8371feef5ae
2016-04-13 14:37:27 +00:00
Nick Kralevich bcf98cfcd4 init.rc: Restore the /mnt/sdcard symlink
am: d2f0a2c

* commit 'd2f0a2c0653e332b906875077b9048e64b929d94':
  init.rc: Restore the /mnt/sdcard symlink

Change-Id: Icd4eea67bdf9ea416f1e15ec9f1666e74e85b3eb
2016-04-13 14:33:52 +00:00
Nick Kralevich d2f0a2c065 init.rc: Restore the /mnt/sdcard symlink
"You are in a maze of twisty little symlinks, all alike."

Restore the /mnt/sdcard symlink, for compatibility with older Android
apps. This symlink was suppose to have been removed in the Gingerbread
time frame, but lives on.

Note: The /mnt/sdcard symlink was originally created in device specific
*.rc files in the device/vendor/hardware/* directory. This change moves
the creation of the symlink into the common init.rc file.

Bug: 25801877
Bug: 28108983
Change-Id: I2f9bf71bddffadb587d7376dfdfc8a546c84ec28
2016-04-12 20:36:01 -07:00
Winter Wang 46c313b694 init: usb: disable usb function switch until adbd is ready
In the case of adb enabled, When a usb function switch happens
e.g mtp,adb -> ptp,adb, framework will set sys.usb.config from
"mtp,adb" to "none" and stop adbd first.
At this time, the property "sys.usb.ffs.ready", which is set after
the ready of the perious start adbd, is still "1".
So , when framework goes on setting the sys.usb.config to "ptp,adb",
init.usb.configfs.rc will trigger actions to bind() f_fs without
waiting for adbd is actually ready.

This will produce some error messages:
------------
configfs-gadget ci_hdrc.0: failed to start g1: -19
init: write_file: Unable to write to '/config/usb_gadget/g1/UDC': No such device
------------
this error msg is caused by configFS start binding f_fs before adbd is ready.

Add setting the "sys.usb.ffs.ready" to "0" will help clear this error msg,
as the bind process in kernel gadget driver will wait for the set of
this property, which is the sign of adbd is ready.

Signed-off-by: Winter Wang <wente.wang@nxp.com>
2016-04-08 19:23:00 +08:00
Eino-Ville Talvala 7c17b0c87d Add camera2 NDK library to public library lists am: 5f31ca2
am: 3c30fe1

* commit '3c30fe1106c5a0b52d387231e3dd87c192edebf1':
  Add camera2 NDK library to public library lists
2016-03-18 19:48:43 +00:00
Eino-Ville Talvala 3c30fe1106 Add camera2 NDK library to public library lists
am: 5f31ca2

* commit '5f31ca2231a2d743b09d0f9f902d20b30a4baca7':
  Add camera2 NDK library to public library lists
2016-03-18 19:46:26 +00:00
Eino-Ville Talvala 5f31ca2231 Add camera2 NDK library to public library lists
It was dropped in the migration to the public.libraries format
NDK is the same on standard Android and Wear.

Bug: 27742249
Change-Id: I1eafbb649c0ccc5b9a93471fa387624d838bd3d0
2016-03-18 12:33:19 -07:00
Daniel Rosenberg afef45141f Merge "Set up configfs" into nyc-dev am: 290127b
am: 7972040

* commit '7972040588b1921c743d93a68435e095cb352858':
  Set up configfs
2016-03-17 21:18:45 +00:00
Daniel Rosenberg 7972040588 Merge "Set up configfs" into nyc-dev
am: 290127b

* commit '290127b29290c133f759eda3fc992e3dcbfb7cb1':
  Set up configfs
2016-03-17 21:16:24 +00:00
Daniel Rosenberg 290127b292 Merge "Set up configfs" into nyc-dev 2016-03-17 21:11:03 +00:00
Dimitry Ivanov 5e11727101 Merge "Add libvulkan.so to the list of public libraries" into nyc-dev am: eb43104
am: 44837bd

* commit '44837bd892abababf0884ad3a882268f2808b196':
  Add libvulkan.so to the list of public libraries
2016-03-17 19:34:28 +00:00
Dimitry Ivanov 8239061a22 Merge changes from topic \'fix-nativeloader-todo\' into nyc-dev am: c8bc211
am: 0583bc6

* commit '0583bc610b56dfba646d16e5ee88131b6b918cdd':
  Move list of public libraries to a config file
  Revert "libnativeloader: Make webviewchromium so file optional"
2016-03-17 19:34:28 +00:00
Dimitry Ivanov 44837bd892 Merge "Add libvulkan.so to the list of public libraries" into nyc-dev
am: eb43104

* commit 'eb43104db148976581c6525b12b1abf25f65987b':
  Add libvulkan.so to the list of public libraries
2016-03-17 18:21:15 +00:00
Dimitry Ivanov 0583bc610b Merge changes from topic \'fix-nativeloader-todo\' into nyc-dev
am: c8bc211

* commit 'c8bc211e6658cf56c5ac8ff5217a1d9a3a64143b':
  Move list of public libraries to a config file
  Revert "libnativeloader: Make webviewchromium so file optional"
2016-03-17 18:21:15 +00:00
Dimitry Ivanov dbae9a9b77 Add libvulkan.so to the list of public libraries
Accidentally dropped it in 4b0e963872

Bug: http://b/27546414
Change-Id: I28835ce3229f778387efedf269d7f32572e09184
2016-03-17 10:57:22 -07:00
Dimitry Ivanov d1fdb98830 Move list of public libraries to a config file
This list contains libraries that should directly or indirectly
be accessible to apps for the platform. Note that this list is
not device specific but rather device class specific.

For now we have 2 separate lists; one for Android Phones and Tablets,
and another one for Android Wear devices.

Bug: http://b/27546414
Bug: http://b/22548808
Change-Id: I83de5e3cf67392d0e9af66f70123898bd5997146
(cherry picked from commit 4b0e963872)
2016-03-17 10:54:19 -07:00
Dimitry Ivanov 4b0e963872 Move list of public libraries to a config file
This list contains libraries that should directly or indirectly
be accessible to apps for the platform. Note that this list is
not device specific but rather device class specific.

For now we have 2 separate lists; one for Android Phones and Tablets,
and another one for Android Wear devices.

Bug: http://b/27546414
Bug: http://b/22548808
Change-Id: I83de5e3cf67392d0e9af66f70123898bd5997146
2016-03-17 09:45:52 -07:00
Daniel Rosenberg 4edec25396 Set up configfs
Bug: 19160983
Change-Id: I8fddf11fb6124950dfa2528a4f420abd9d461df6
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2016-03-16 15:58:24 -07:00
Mihai Serban e45d59b05b Merge "init-debug.rc: mount debugfs" am: bf6c67f234
am: 8bf6e6908b

* commit '8bf6e6908b97f785b5d7036e616438f839e9da1d':
  init-debug.rc: mount debugfs
2016-03-14 18:08:23 +00:00
Mihai Serban 8bf6e6908b Merge "init-debug.rc: mount debugfs"
am: bf6c67f234

* commit 'bf6c67f234b591afd3cf936632ca00730b89eb73':
  init-debug.rc: mount debugfs
2016-03-14 18:06:27 +00:00
Elliott Hughes bf6c67f234 Merge "init-debug.rc: mount debugfs" 2016-03-14 17:57:16 +00:00
Janis Danisevskis bae1efe500 Merge "Leftovers of the SELinux policy update mechanism" am: b9c0788806
am: 0af61f0024

* commit '0af61f0024d137e7a2f1ac0d9e002711cd01092c':
  Leftovers of the SELinux policy update mechanism
2016-03-13 14:55:12 +00:00
Janis Danisevskis 0af61f0024 Merge "Leftovers of the SELinux policy update mechanism"
am: b9c0788806

* commit 'b9c078880644b51bc9e6c314eed157f230fce43c':
  Leftovers of the SELinux policy update mechanism
2016-03-13 14:53:00 +00:00
Janis Danisevskis 3d1dff2231 Leftovers of the SELinux policy update mechanism
Remove references to SELinux policy files in /data/security
from libselinux/android.c. In the process all code that is
apparently related to handling an alternate policy and/or
reloading the policy has been removed.

Bug: 26544104
Change-Id: I47bf76ac3c26c5d71f92a21ffac2b17ba14262ea
2016-03-11 17:47:30 +00:00
Hidehiko Abe ec8637ef6d Split slave-bind mount into two.
mount(2) does not work with MS_BIND | MS_SLAVE at a time.
Instead, this CL calls mount twice.

Change-Id: I36b2eb2853f19efc2b0677fb07b6822392aac37c
2016-03-09 16:41:50 +09:00
Mihai Serban afebc25bdd init-debug.rc: mount debugfs
Enable debugfs on non "user" builds.

BUG=27520850
Change-Id: I2bcc72b686d0477b553c0605adfd4c023e72cbfb
Signed-off-by: Mihai Serban <mihai.serban@intel.com>
2016-03-07 16:56:06 +02:00
Alex Deymo e120b471ac Add /postinstall partition when using the A/B updater.
The new top level directory /postinstall is used by the A/B updater to
mount the new partition and run a post-install program before rebooting
into that new system.

init.rc was extended to label this new directory since the initrd has
no extended attributes.

Bug: 27177071
TEST=`ls -laZ /` shows the /postinstall directory on edison-eng

(cherry picked from commit bb968fb04d)

Change-Id: Iff993135c7ce3a1a0f6450892ef7382da408fd5e
2016-03-04 15:45:52 -08:00
Alex Deymo 40345ef6b8 Merge "Add /postinstall partition when using the A/B updater." am: 700b15dacf
am: e2ad3cfae4

* commit 'e2ad3cfae4f9f9ddec2746c0c57cdb3dc1991a43':
  Add /postinstall partition when using the A/B updater.
2016-03-04 08:03:35 +00:00
Alex Deymo e2ad3cfae4 Merge "Add /postinstall partition when using the A/B updater."
am: 700b15dacf

* commit '700b15dacfa42bcc5c4d768b92530e9f20f0211b':
  Add /postinstall partition when using the A/B updater.
2016-03-04 08:01:40 +00:00
Alex Deymo bb968fb04d Add /postinstall partition when using the A/B updater.
The new top level directory /postinstall is used by the A/B updater to
mount the new partition and run a post-install program before rebooting
into that new system.

init.rc was extended to label this new directory since the initrd has
no extended attributes.

Bug: 27177071
TEST=`ls -laZ /` shows the /postinstall directory on edison-eng

Change-Id: I6cdee7eb1d61ac7d447528962a4fad1a7bbf138d
2016-03-02 14:17:42 -08:00
Keun Soo Yim be54c543bd mkdir /data/misc/cameraserver for AVD's camera HALs
cameraserver from nyc uses cameraserver as its username.
thus this change is needed for AVD (android virtual device)'s
camera HAL which is attached to cameraserver to work as that
HAL writes some files to /data/misc/media. the backward compatibility
issue should be handled as separate changes. this approach is 
preferred for finer-grained security isolation.

Change-Id: If028667d62df8fcac634ff1001759c39703b00dd
2016-03-01 22:44:59 +00:00
Todd Kjos d125f6e8a9 Merge "Mount schedTune cgroup as /dev/stune" into nyc-dev 2016-02-26 17:35:50 +00:00
Chien-Yu Chen 0836c9e386 Sync internal<->AOSP user list.
Bug: 27299198

Cherry-picked from:

Restart cameraserver

Bug: 24511454
Change-Id: Ia27f4ef0eb71f891c789f637a21b04afe0b1c4e9
2016-02-23 15:56:55 -08:00
Glenn Kasten 845a4ffef8 Restore audio tee sink
Bug: 27323882
Change-Id: I1131c0537942c8f7cbf9ff6cc6847ab7e93e6187
2016-02-23 15:23:46 -08:00
Todd Kjos 11cde567a8 Mount schedTune cgroup as /dev/stune
Make stune consistent with the other cgroups mounted under /dev

Change-Id: I0fe7120ad2afbe8e6a3c9f72cc3f465de618d344
2016-02-23 09:08:54 -08:00
Calin Juravle aed972dead Merge "Create profiles folders" into nyc-dev 2016-02-22 11:42:02 +00:00
Jeff Sharkey 002aecf6e8 Temporary fix for bugreport symlink.
Bug: 27262109
Change-Id: I011da38f8ad1eeaf717dc03a0fb6f9fdc5654c4c
2016-02-19 15:51:42 -07:00
Calin Juravle 807f23aff2 Create profiles folders
Current profiles (the ones which have not been used for
compilation) are stored in /data/misc/profiles/cur/0/pkgname/.

Reference profiles (the merged of all user profiles, used for
compilation) are stored in /data/misc/profiles/ref/pkgname/.

Add a method to get the shared app gid from an uid or appid.

Bug: 26719109
Bug: 26563023
Change-Id: I89601d7dbeb3041df882c141a9127dac200a645e
2016-02-19 13:42:37 +00:00
Bill Yi 4409f1446c Merge commit '4352ee87fd74b931d4b58192fb8974e91aa899d0' into HEAD 2016-02-17 11:37:00 -08:00
Martijn Coenen 623b56af5d Fix libprocessgroup SELinux denials.
libprocessgroup checks whether it can use memory
cgroups for keeping track of forked processes by
seeing whether /dev/memcg/apps is writable. However,
on systems with memory cgroups disabled, SELinux
(correctly) no longer classifies this directory as a cgroup,
and starts denying zygote access. To fix this,
first check whether /dev/memcg/apps/tasks exists to
see if the cgroup is mounted; only then check whether
we can write to the directory.

Bug: 27046965
Change-Id: I6e44cd62d8c396e20ceb162c50606b3e86f2cb3e
2016-02-08 11:45:27 +01:00
Jeff Sharkey c457610e78 Follow migration of Shell app to DE storage.
The Shell app that stores bugreports now lives under DE storage for
all devices, both FBE and non-FBE.

Bug: 26668510
Change-Id: Iead1dcb98181a5caccf4d0c1e86de62abc6dc990
2016-02-06 20:15:24 -07:00
Jeff Sharkey c895f11cf1 Merge "User 0 directories are created by vold now." 2016-02-05 21:01:21 +00:00
Mark Salyzyn a2eba56f98 Merge "init-debug.rc: add runtime mmc max speed property actors" am: 20a6f0ff3b
am: c883cdec82

* commit 'c883cdec825e021007672d3ce9b199589ed2cba6':
  init-debug.rc: add runtime mmc max speed property actors
2016-02-05 17:38:44 +00:00
Mark Salyzyn c883cdec82 Merge "init-debug.rc: add runtime mmc max speed property actors"
am: 20a6f0ff3b

* commit '20a6f0ff3bf21e2bc82ebfe06357f6225c991ee9':
  init-debug.rc: add runtime mmc max speed property actors
2016-02-05 15:25:14 +00:00
Jeff Sharkey 3b9c83a0f6 User 0 directories are created by vold now.
This ensures that all users on device follow a consistent path for
setup and validation of encryption policy.

Also add remaining user-specific directories and fix linking order.

Bug: 25796509
Change-Id: I8c2e42a78569817f7f5ea03f54b743a6661fdb9c
2016-02-04 15:26:23 -07:00
Mark Salyzyn 7864e36751 init-debug.rc: add runtime mmc max speed property actors
persist.mmc.max_read_speed  - KB/s speed cap
persist.mmc.max_write_speed - KB/s speed cap
persist.mmc.cache_size      - MB of high-speed on-device write cache

device default directly to associated /sys/block/mmcblk0/ attributes,
not delivered on "user" builds.

Bug: 26976972
Change-Id: Ic82b9614489b6406ce830d127c85affc9095e256
2016-02-04 13:10:19 -08:00
Mark Salyzyn 95c220e6b7 Merge "init.rc: too many start logd" am: 989daeaf5b
am: d8e0e52099

* commit 'd8e0e520998e83ae16fcff317704bb6c00b7fb31':
  init.rc: too many start logd
2016-02-03 16:45:03 +00:00
Mark Salyzyn d8e0e52099 Merge "init.rc: too many start logd"
am: 989daeaf5b

* commit '989daeaf5b2f50d96da69ad476adf434522e35e7':
  init.rc: too many start logd
2016-02-03 15:51:31 +00:00
Andreas Gampe fcad79fe10 Merge "Init: add OTA directory" 2016-02-03 01:28:32 +00:00
Mark Salyzyn 0604f6fbae init.rc: too many start logd
Bug: 26934873
Change-Id: Ia00da6253a50bedc8ba825df1cf641b86cdebeed
2016-02-02 16:01:17 -08:00
Elliott Hughes 1ee7abd066 Merge "Start debuggerd as soon as logd is up." am: 1b729b3e04
am: 1ef5b78a2f

* commit '1ef5b78a2ffc471e5ac2e30b424f00d15d581a8c':
  Start debuggerd as soon as logd is up.
2016-02-02 21:12:49 +00:00
Elliott Hughes 1ef5b78a2f Merge "Start debuggerd as soon as logd is up."
am: 1b729b3e04

* commit '1b729b3e04b210d096ee2d447945f6b2c53b6029':
  Start debuggerd as soon as logd is up.
2016-02-02 21:10:47 +00:00
Elliott Hughes 2f74a5dae5 Start debuggerd as soon as logd is up.
Makes debugging early boot crashes easier.

Bug: http://b/26918597
Change-Id: I5bb883f1350ea5f7a545cb0e9f1034ecfcf47cdb
2016-02-02 13:03:41 -08:00
Martijn Coenen 2f07673957 Merge "Reuse mem cgroups for tracking forked PIDs." 2016-02-02 10:23:57 +00:00
Tim Murray 88185f9ee8 Merge "Enable top-app cpuset support." 2016-02-02 02:13:31 +00:00
Tim Murray 6647bb5130 Enable top-app cpuset support.
Allows ActivityManager to use the top-app cpuset to grant the currently
focused app exclusive access to a CPU core.

Change-Id: I45bca5170477e413dec6e5889338399d0859706c
2016-02-01 15:03:16 -08:00
Greg Hackmann 7026d48d84 Merge "init.rc: add missing /dev/fd symlink" am: 54bf0718f4
am: ef605cb749

* commit 'ef605cb7495cec368f7be015f924479969dd8fc2':
  init.rc: add missing /dev/fd symlink
2016-02-01 22:07:42 +00:00
Greg Hackmann ef605cb749 Merge "init.rc: add missing /dev/fd symlink"
am: 54bf0718f4

* commit '54bf0718f4eb1b170f55bbd07207cd6ad2e7e0f5':
  init.rc: add missing /dev/fd symlink
2016-02-01 22:04:06 +00:00
Martijn Coenen b82bab66f3 Reuse mem cgroups for tracking forked PIDs.
It turns out we were using the CPU accounting
cgroups for keeping track of processes that were
forked by an app without the framework's knowledge,
so we could kill all of them reliably (see b/15313911
for context).

Since we want to use memory cgroups for other purposes,
we might as well use memory cgroups for tracking forked
PIDs if they're enabled. This also gets us automatic cleanup
of empty mem cgroups.

Also, removed old mem cgroup mount point that is no
longer used, as well as cgroup release agent code that
we're not using.

Change-Id: I69d5cc31c162ffa49ef6945755f41381e306cc8b
2016-02-01 21:04:24 +01:00
Greg Hackmann 40a96e4ba0 init.rc: add missing /dev/fd symlink
The Linux kernel implicitly expects /dev/fd to symlink to /proc/self/fd.

This change fixes the exec/execveat.c kernel selftest.

Change-Id: Ia08d50023336fdbfc098527299c326d9d59039a9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2016-02-01 10:02:19 -08:00
Paul Crowley 5949745534 On FDE devices, initialize user 0
Fix ugly special cases for user 0: initialize them explicitly.

Bug: 26704408
Change-Id: I1b8536b9e5e87ea98b4009a309f2e22c56006651
2016-02-01 16:44:46 +00:00
Christopher Tate 63c463fe28 Have init set up the backup stage dir on /cache
Bug 26834865

Change-Id: Idc63c1706f68d42b2a9cee05997c63a9bbcb0fb9
2016-01-29 12:47:46 -08:00
Andreas Gampe 7dfcc92bee Init: add OTA directory
Add /data/ota in init so that the right selinux labels are applied.

Bug: 25612095
Change-Id: I8fd093147f8e0a5c3bd1a4007a61b0b759911cf2
2016-01-28 11:42:57 -08:00
Chien-Yu Chen 113f88e365 Merge "Restart cameraserver" 2016-01-28 02:04:44 +00:00
Kevin Cernekee 89a31c4499 Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes" am: fa432b0e2f
am: 54b47105ae

* commit '54b47105aea0e93ee287f76d4a4dc6bfe6ddf698':
  ueventd.rc: Document the different rule formats for /dev and /sys nodes
2016-01-26 23:51:38 +00:00
Kevin Cernekee 54b47105ae Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes"
am: fa432b0e2f

* commit 'fa432b0e2f87e9a029ac0094e5bceaaff258368a':
  ueventd.rc: Document the different rule formats for /dev and /sys nodes
2016-01-26 23:48:43 +00:00
Kevin Cernekee fa432b0e2f Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes" 2016-01-26 23:44:56 +00:00
Chien-Yu Chen cd2ef4ef1c Restart cameraserver
Bug: 24511454
Change-Id: Ia27f4ef0eb71f891c789f637a21b04afe0b1c4e9
2016-01-25 11:52:40 -08:00
Tim Murray 1293fed9a3 Merge "Improve cpuset support for surfaceflinger." 2016-01-25 18:45:01 +00:00
Nick Kralevich b797e78f8b Merge "init.rc: mix device-specific data into the Linux RNG" am: e04b60d2b9
am: 9deaf7c8a6

* commit '9deaf7c8a6eca900e1e50cccc1aeef17d04d70e2':
  init.rc: mix device-specific data into the Linux RNG
2016-01-23 04:04:38 +00:00
Nick Kralevich 9deaf7c8a6 Merge "init.rc: mix device-specific data into the Linux RNG"
am: e04b60d2b9

* commit 'e04b60d2b9bf0e6560e3cde6f671f294b796fcdb':
  init.rc: mix device-specific data into the Linux RNG
2016-01-23 04:02:51 +00:00
Nick Kralevich 27cb410352 init.rc: mix device-specific data into the Linux RNG
Mix the contents of /proc/cmdline and /default.prop
into /dev/urandom. /proc/cmdline often contains
androidboot.serialno, a device-specific unique
identifier. Similarly, /default.prop contains the
build fingerprint and timestamp, which vary between
device families.

Change-Id: I8803b38c7089b2a1217b99a7c1808b29a3b138cf
2016-01-22 19:58:21 -08:00
Tim Murray 4284f9f3a3 Improve cpuset support for surfaceflinger.
SurfaceFlinger needs some of its threads in the system-background cpuset
and some of its threads (the binder pool) outside of the
system-background cpuset in order to improve UI perf/power
consumption. Remove surfaceflinger from the system-background cpuset in
init.rc and allow a thread to place itself in the system-background
cpuset given enough permissions.

bug 25745866

Change-Id: I85f7e41c5439e6ad7cc2d355e51f5dfb3a0c7088
2016-01-22 14:06:50 -08:00
Paul Crowley 558d8f4364 Remove no-longer-needed crypto init builtins
Changes to the way FBE works to support lifecycles mean that these
commands aren't needed any more.

Bug: 22358539
Change-Id: Id73339e0aa8070dd688f35b5d59de75236961395
2016-01-20 11:20:23 +00:00
Jeff Sharkey d78b55fba2 Move some directory creation out of installd.
Core system directories should be created here in init.rc instead
of making installd do the creation.

Bug: 26466827
Change-Id: I313a332e74699641872c41fce5a7ca35bfce8f82
2016-01-14 23:23:53 -07:00
Elliott Hughes e8b97fc0b0 Merge "init.rc: Reland "mkdir /data/misc/vold""
am: 19616ce100

* commit '19616ce100771d0f570bc9cf19d08fbbe8feec0f':
  init.rc: Reland "mkdir /data/misc/vold"
2016-01-08 17:16:34 +00:00
Yu Ning c1149ff0c3 init.rc: Reland "mkdir /data/misc/vold"
Creation of /data/misc/vold was first introduced by commit 25775e8. It
then got reverted, probably inadvertently, by:

 commit 2e24bcfdce
 Author: Paul Lawrence <paullawrence@google.com>
 Date:   Fri May 22 18:31:55 2015 +0000

     Revert "Set up crypto for user directories in init."

This folder is required by vold. In its absence, if one tries to format
an SD card as internal storage, an error will occur, with the following
message printed to logcat:

 01-08 06:31:48.389  1002  1069 E vold    : Failed to persist key

Restoring /data/misc/vold fixes this bug.

This fix has been verified on the emulator, which currently does not
allow its virtual SD card to be adopted, but another CL will be uploaded
to enable that.

Change-Id: Ibb87ee821630a038a6f9b7b6a9da50fe03ca690d
Signed-off-by: Yu Ning <yu.ning@intel.com>
2016-01-08 14:51:32 +08:00
Pavlin Radoslavov 7705e0384e Merge "Use GID "wakelock" to control access to kernel wakelock"
am: 0f0498ad50

* commit '0f0498ad508e6747dc7b72a6e63de2f2befa2e1c':
  Use GID "wakelock" to control access to kernel wakelock
2015-12-29 01:28:48 +00:00
Pavlin Radoslavov 17d80c84e1 Use GID "wakelock" to control access to kernel wakelock
* Added new kernel GID named "wakelock" (AID_WAKELOCK = 3010)
* Changed the group access for /sys/power/wake_lock and
  /sys/power/wake_unlock from "system" to "wakelock"
* Added "wakelock" to the list of groups for the healthd process/service

Bug: 25864142
Change-Id: Ieabee9964cccec3107971a361a43aa9805164aa9
2015-12-28 14:57:28 -08:00
Pavlin Radoslavov 0eca107512 Use GID "wakelock" to control access to kernel wakelock
* Added new kernel GID named "wakelock" (AID_WAKELOCK = 3010)
* Changed the group access for /sys/power/wake_lock and
  /sys/power/wake_unlock from "system" to "wakelock"
* Added "wakelock" to the list of groups for the healthd process/service

Bug: 25864142
Change-Id: Ieabee9964cccec3107971a361a43aa9805164aa9
2015-12-28 19:33:30 +00:00
Felipe Leme 1a9c4531c7 Moved 'bugreportplus' from init.rc to dumpstate.rc
BUG: 26034608
Change-Id: Id6923cff0b2b3bd9d2ec9320ebcdb3fbead8df83
2015-12-14 13:43:00 -08:00
Andy Hung c7ae5210a7 Merge "Add audioserver uid and restart service when needed" 2015-12-11 20:08:51 +00:00
Daichi Hirono db85484423 Merge "Add /mnt/appfuse mount point to init.rc." 2015-12-11 06:16:29 +00:00
Daichi Hirono 7abc71ecd3 Add /mnt/appfuse mount point to init.rc.
BUG=25755834

Change-Id: I00b1185aec7a95baa6ef2f345a49761f3d006c4d
2015-12-11 13:29:04 +09:00
Paul Lawrence c5733cfadb Add createuserkey
Needed so we can make the user0 key on first boot

Change-Id: I4699dbf2efdec44bb09bc4cfa7eeb59e56cb93ab
2015-12-09 15:34:18 -08:00
Tao Bao 27ca1eb294 Merge "rootdir: Execute update_verifier for A/B update." am: df13f60ce0
am: 8ca8664956

* commit '8ca8664956bf4bce783d9b84a9f0fd0ff8a9c11f':
  rootdir: Execute update_verifier for A/B update.
2015-12-09 19:57:52 +00:00
Tao Bao 8ca8664956 Merge "rootdir: Execute update_verifier for A/B update."
am: df13f60ce0

* commit 'df13f60ce0152bc9a38e18fcb9c7c839d8eba5e3':
  rootdir: Execute update_verifier for A/B update.
2015-12-09 19:55:09 +00:00
Tao Bao df13f60ce0 Merge "rootdir: Execute update_verifier for A/B update." 2015-12-09 19:50:31 +00:00
Nick Kralevich c94d92f5ad Merge "init.rc: restorecon_recursive /sys/kernel/debug" am: 6d85c06aa1 am: 070288241d
am: baaeddfa23

* commit 'baaeddfa239625a9d54091c628242d84a9191514':
  init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:54:15 +00:00
Nick Kralevich baaeddfa23 Merge "init.rc: restorecon_recursive /sys/kernel/debug" am: 6d85c06aa1
am: 070288241d

* commit '070288241d5c3d1a169e21ba4439a5943ce476d8':
  init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:50:55 +00:00
Nick Kralevich 070288241d Merge "init.rc: restorecon_recursive /sys/kernel/debug"
am: 6d85c06aa1

* commit '6d85c06aa1600e905cf3e0b093e939fa3866ee59':
  init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:48:06 +00:00
Nick Kralevich 715c4dc3f9 init.rc: restorecon_recursive /sys/kernel/debug
If /sys/kernel/debug is present, make sure it has all the appropriate
SELinux labels.

Labeling of /sys/kernel/debug depends on kernel support
added in commit https://android-review.googlesource.com/122130

This patch depends on an external/sepolicy change with the
same Change-Id as this patch.

Change-Id: Id1d6a9ad6d0759d6de839458890e8cb24685db6d
2015-12-07 17:00:40 -08:00
Tao Bao 97df395683 rootdir: Execute update_verifier for A/B update.
update_verifier verifies the updated partitions and marks the current
slot as having booted successfully. It needs to be triggered prior to
the start of the framework, otherwise it won't be able to fall back to
the old system without a data wipe.

Bug: 26039641
Change-Id: I6fd183cdd3dfcc72feff2a896368158875b28591
2015-12-07 16:23:13 -08:00
Todd Kennedy 088113f419 Merge "Create new ephemeral app directory" 2015-12-07 15:33:06 +00:00
Felipe Leme 171b5d8be3 Created service 'bugreportplus'
This service is an enhanced version of bugreport that provides a better
user interface (like displaying progress and allowing user to enter
details).

It will be  typically triggered by the 'Take Bug Report' UI, which will
now offer the option for the traditional or enhanced options (services
'bugreport' and 'bugreportplus' respectively).

BUG: 26034608
Change-Id: I39ea92c3e329a801b51f60a558c73faaf890c068
2015-12-04 14:51:38 -08:00
Jeff Sharkey a5954de3bb Create credential-encrypted system dir for owner.
Other user directories are created correctly, but owner is still
special cased.

Bug: 22358539
Change-Id: I2bbd3023cdbcbb5315ebc32ba54dc3ddb9a280d6
2015-11-30 16:56:01 -07:00
Todd Kennedy 0a2733582d Create new ephemeral app directory
Bug: 25119046
Change-Id: Ie005430700a73ef1ba492dae4101419a41da4071
2015-11-23 15:24:13 -08:00
Jeff Sharkey af1e35e07b Create user_de directory for user 0.
This mirrors what we do for "/data/data" for user 0.  Eventually we
should move to vold/installd doing the user 0 initialization.

Bug: 22358539
Change-Id: I48cd27b990e6bd6e37870c41aef0e7dc3106caa4
2015-11-19 11:14:40 -07:00
Daniel Rosenberg 5c331c5be8 Remove creation of root directory folders
am: c97e1cb39d

* commit 'c97e1cb39d9ba129d8326605d121a10c9ae491e7':
  Remove creation of root directory folders
2015-11-18 21:39:01 +00:00
Junichi Uekawa 13c8e8d8ac Merge "Fix non-vendor.img configuration." am: 1337349ea1 am: ef7197eefa
am: 1aa74e687e

* commit '1aa74e687ecdd2bef8fb786d8027512b6953b6ad':
  Fix non-vendor.img configuration.
2015-11-18 17:52:39 +00:00
Todd Kjos 88b5892d74 resolve merge conflicts of ed60788968 to mnc-dr2-dev-plus-aosp.
Change-Id: I9b07dd8dcb8fc74b658466b8dd47546cefffab1d
2015-11-18 08:31:03 -08:00
Calin Juravle 6426874cdd Merge "Don\'t create profiles directory under dalvik-cache." am: 942f8ea84f am: 2a095e186b
am: cdef6fb917

* commit 'cdef6fb91725f771ab23d0eea03a97aa3c161d75':
  Don't create profiles directory under dalvik-cache.
2015-11-18 00:20:51 +00:00
Junichi Uekawa ef7197eefa Merge "Fix non-vendor.img configuration."
am: 1337349ea1

* commit '1337349ea11a6bb5c44ba5c5bb064c750bd626c5':
  Fix non-vendor.img configuration.
2015-11-17 03:36:23 +00:00
Junichi Uekawa 07b69961f2 Fix non-vendor.img configuration.
If / is not write-able and system.img contains system/vendor, symlink
for `/vendor/ -> /system/vendor/` that is otherwise done in init.rc
should be done at build time.

BUG=b:25512724

Change-Id: Iaa63d6440373a4fd754a933c9f1960b3787a6d98
2015-11-17 11:20:21 +09:00
Daniel Rosenberg d792c98606 Remove creation of root directory folders
am: c97e1cb39d

* commit 'c97e1cb39d9ba129d8326605d121a10c9ae491e7':
  Remove creation of root directory folders
2015-11-17 00:52:55 +00:00
Todd Kjos ba8a47531c Actively mangage EAS schedtune nodes
Move foreground tasks to /sys/fs/cgroup/stune/boost/tasks (boosted
weight in EAS scheduler). Move background tasks to
/sys/fs/cgroup/stune/tasks (default weight). For services started
with init, set "foreground" services to boosted.

Change-Id: I0e489fad9510727c13e6754dabaf311c2391f395
2015-11-16 14:57:47 -08:00
Daniel Rosenberg c97e1cb39d Remove creation of root directory folders
Folders in the root directory are now created during the build,
as we may be building without a ramdisk, and when we do that,
the root directory will be read-only.  With those changes,
these mkdirs will never need to run.

Change-Id: I49c63e8bfc71d28e3f938ed41f81d108359fa57a
2015-11-16 08:53:04 -08:00
Todd Kjos ed60788968 Actively mangage EAS schedtune nodes
Move foreground tasks to /sys/fs/cgroup/stune/boost/tasks (boosted
weight in EAS scheduler). Move background tasks to
/sys/fs/cgroup/stune/tasks (default weight). For services started
with init, set "foreground" services to boosted.

Change-Id: I0e489fad9510727c13e6754dabaf311c2391f395
2015-11-16 08:53:04 -08:00
Daniel Rosenberg 4c9c516d20 rootdir: Create cache folder in Android.mk
system.img may contain the root directory as well. In that case, we
need to create some folders init.rc would during the build.

Change-Id: I312104ff926fb08d98ac8256b76d01b0a90ea5e5
2015-11-16 08:53:04 -08:00
Daniel Rosenberg 9262546184 rootdir: Create folders in Android.mk
system.img may contain the root directory as well. In that case, we
need to create some folders init.rc would during the build.

Change-Id: I157ccbebf36bee9916f3f584551704ec481ae1d1
2015-11-16 08:53:04 -08:00
Calin Juravle 2a095e186b Merge "Don\'t create profiles directory under dalvik-cache."
am: 942f8ea84f

* commit '942f8ea84f3f96c2e2556fe90ebba0ec76730553':
  Don't create profiles directory under dalvik-cache.
2015-11-16 11:21:48 +00:00
Calin Juravle 942f8ea84f Merge "Don't create profiles directory under dalvik-cache." 2015-11-16 11:08:46 +00:00
Jeff Sharkey 439419b713 Merge "Create some new encryption paths." 2015-11-12 00:20:28 +00:00
Calin Juravle 8e9791357e Merge "Create a folder to store method traces activated with -Xmethod-trace" am: 7605a56fbc am: 5d1a9688b8
am: a8dcfc0622

* commit 'a8dcfc062260bdce7ca471baa5f081e512d5da7f':
  Create a folder to store method traces activated with -Xmethod-trace
2015-11-11 18:39:23 +00:00
Calin Juravle 5d1a9688b8 Merge "Create a folder to store method traces activated with -Xmethod-trace"
am: 7605a56fbc

* commit '7605a56fbcf5706b6e2892da9d9dc0fd20efb395':
  Create a folder to store method traces activated with -Xmethod-trace
2015-11-11 18:12:03 +00:00
Jeff Sharkey 11705863ff Create some new encryption paths.
Bug: 22358539
Change-Id: I2e7533cd3dbd18e9ae115f611c5714b0c7ba4917
2015-11-11 09:49:46 -08:00
Calin Juravle 9b3e5d59fe Create a folder to store method traces activated with -Xmethod-trace
Bug: 25612377
Change-Id: I370b858594ccc88c12099b23a0d1aac22acd4969
2015-11-10 21:26:40 +00:00
Nick Kralevich bdf20142b9 Merge "Enable hidepid=2 on /proc" am: 2d8f1d4c47 am: ea8452cc72
am: 7dafe5b818

* commit '7dafe5b818f7771cb00c4a0ea3ab1dbf74593185':
  Enable hidepid=2 on /proc
2015-11-09 20:41:19 +00:00
Nick Kralevich ea8452cc72 Merge "Enable hidepid=2 on /proc"
am: 2d8f1d4c47

* commit '2d8f1d4c478b9d921730d3fc9b290315e2ff9f04':
  Enable hidepid=2 on /proc
2015-11-09 20:29:44 +00:00
Nick Kralevich c39ba5ae32 Enable hidepid=2 on /proc
Add the following mount options to the /proc filesystem:

  hidepid=2,gid=3009

This change blocks /proc access unless you're in group 3009
(aka AID_READPROC).

Please see
  https://github.com/torvalds/linux/blob/master/Documentation/filesystems/proc.txt
for documentation on the hidepid option.

hidepid=2 is preferred over hidepid=1 since it leaks less information
and doesn't generate SELinux ptrace denials when trying to access
/proc without being in the proper group.

Add AID_READPROC to processes which need to access /proc entries for
other UIDs.

Bug: 23310674
Change-Id: I22bb55ff7b80ff722945e224845215196f09dafa
2015-11-09 09:08:46 -08:00
Calin Juravle 933bc0a3d1 Don't create profiles directory under dalvik-cache.
Bug: 24698874
Bug: 17173268
Change-Id: Ic81258a8df90818fa6b4ee64fd1507ac18fe3f04
2015-11-04 14:59:41 +00:00
Bill Yi 1ec36aaeb0 Merge commit 'f85d6cd8045ce933dfdc19bc888228cd9382e48c' into HEAD 2015-11-03 14:30:40 -08:00
Daniel Rosenberg eba626f56d Merge "rootdir: Allow board specific folders and symlinks in root directory" am: 6e699df21e am: 64ea814c31
am: 1c1a7906c5

* commit '1c1a7906c5f1131fb1295c54e0669ea76111ff90':
  rootdir: Allow board specific folders and symlinks in root directory
2015-11-03 00:14:20 +00:00
Daniel Rosenberg 1c1a7906c5 Merge "rootdir: Allow board specific folders and symlinks in root directory" am: 6e699df21e
am: 64ea814c31

* commit '64ea814c312ec43c59e9f132909be121cdf02ab3':
  rootdir: Allow board specific folders and symlinks in root directory
2015-11-02 22:01:38 +00:00
Daniel Rosenberg 64ea814c31 Merge "rootdir: Allow board specific folders and symlinks in root directory"
am: 6e699df21e

* commit '6e699df21e1b08aa2e9eb18ef1c44788549ae8ed':
  rootdir: Allow board specific folders and symlinks in root directory
2015-11-02 21:58:22 +00:00
Daniel Rosenberg 52b5915945 rootdir: Allow board specific folders and symlinks in root directory
Building without ramdisk requires a way to specify board specific
directoryies and symlinks in the root directory at build time.

Change-Id: I11301e98228bc4761f3aee177a546146651b9f25
(cherry picked from commit d7549c9a65cad886f672af41f5fca6f0bd0c12fa)
2015-11-02 12:47:46 -08:00
Andy Hung fec47527b4 Add audioserver uid and restart service when needed
Bug: 24511453
Change-Id: I6987a82149d23ad671478cf21488c62cb1ecfc93
2015-10-30 16:58:59 -07:00
Evgenii Stepanov f2630adeef Merge "Disable container overflow detect on target." am: 151e49726b am: 5562351b50
am: ec6ff936b0

* commit 'ec6ff936b0e994b3f6d2b812e4b67aa950fe35f2':
  Disable container overflow detect on target.
2015-10-23 22:23:56 +00:00
Evgenii Stepanov ec6ff936b0 Merge "Disable container overflow detect on target." am: 151e49726b
am: 5562351b50

* commit '5562351b50fbbcda030ddfffcb3b2dbef82bcdc9':
  Disable container overflow detect on target.
2015-10-23 22:14:52 +00:00
Evgenii Stepanov 5562351b50 Merge "Disable container overflow detect on target."
am: 151e49726b

* commit '151e49726bf743bfbd7e44695f9d673735e62119':
  Disable container overflow detect on target.
2015-10-23 22:10:27 +00:00
Evgenii Stepanov 151e49726b Merge "Disable container overflow detect on target." 2015-10-23 22:03:52 +00:00
Evgenii Stepanov f3009f21d5 Disable container overflow detect on target.
Container overflow annotations may cause false positives in partially
instrumented binaries.

Bug: 25228125, 25212198
Change-Id: Ic587d41698c02e306dece4ad7c6a2a8810c52dbd
2015-10-23 14:57:47 -07:00
Tim Murray e41937d9b3 Reorder init.rc to avoid a kernel warning. am: f429d37807 am: e56b566401
am: 538697b315

* commit '538697b3153a9a71bdfd197d0461a74d29fd2fae':
  Reorder init.rc to avoid a kernel warning.
2015-10-21 14:50:03 +00:00
Paul Lawrence 2b216aa89b Merge "Don't show UI on default encryption" into mnc-dr-dev 2015-10-21 14:27:38 +00:00
Tim Murray 538697b315 Reorder init.rc to avoid a kernel warning. am: f429d37807
am: e56b566401

* commit 'e56b566401aad8e7175306b2969f78baa0b8f9c6':
  Reorder init.rc to avoid a kernel warning.
2015-10-20 22:14:47 +00:00
Tim Murray f429d37807 Reorder init.rc to avoid a kernel warning.
3.18 has a warning in dmesg that appears when the parent cpuset's cpus
and mems are changed to something other than what the child has. Reorder
init.rc to prevent this warning from appearing.

bug 24941443

Change-Id: I49d8394063b23dce03222dcc9ddccdc32bb97ea2
2015-10-15 12:38:15 -07:00
Nick Kralevich 09cf06fc74 am 2f63adce: am 28107143: am 9e27cab6: Merge "init.rc: Disable sysrq from the keyboard"
* commit '2f63adcea8e4e4a64d85b59044224f198016e093':
  init.rc: Disable sysrq from the keyboard
2015-10-10 05:47:41 +00:00
Nick Kralevich 281071435a am 9e27cab6: Merge "init.rc: Disable sysrq from the keyboard"
* commit '9e27cab695b0e2a4910cf576d306a3379991f1f7':
  init.rc: Disable sysrq from the keyboard
2015-10-10 00:38:18 +00:00
Nick Kralevich d28a535d9a init.rc: Disable sysrq from the keyboard
Don't allow the accidental triggering of sysrq functionality
from the keyboard. The only expected use of sysrq functionality
is via /proc/sysrq-trigger

Please see https://www.kernel.org/doc/Documentation/sysrq.txt for
additional information on /proc/sys/kernel/sysrq

Bug: 13435961
Change-Id: I60dc92a4b2b4706e8fa34a6cead9abd449f7375f
2015-10-09 17:09:10 -07:00
David Zeuthen 8e15f8d096 am 8c06f8cc: am 10bb4e51: Merge "init.rc: mkdir /data/misc/update_engine 0700 root root"
* commit '8c06f8ccd41c5d1206d721b4f19dd6b5ede9ad9e':
  init.rc: mkdir /data/misc/update_engine 0700 root root
2015-10-07 20:34:18 +00:00
David Zeuthen 8c06f8ccd4 am 10bb4e51: Merge "init.rc: mkdir /data/misc/update_engine 0700 root root"
* commit '10bb4e5161ecca1a9660d1e5967b3fb5e7662839':
  init.rc: mkdir /data/misc/update_engine 0700 root root
2015-10-07 20:29:00 +00:00
David Zeuthen 10bb4e5161 Merge "init.rc: mkdir /data/misc/update_engine 0700 root root" 2015-10-07 20:18:36 +00:00
David Zeuthen 159147853e init.rc: mkdir /data/misc/update_engine 0700 root root
Ensure that /data/misc/update_engine exists since it will be referenced
by selinux policy.

Bug: 23186405
Change-Id: I96e4ff341086da6474ef7f7c934f1f35bffc1439
2015-10-07 14:00:55 -04:00
Mark Salyzyn d80ddaabe1 am 936d65f5: am cb2ab20d: am 87122ce1: Merge "logd: increase dgram_max_qlen to 600"
* commit '936d65f59bbab071898390c8bd6982055be5ab4b':
  logd: increase dgram_max_qlen to 600
2015-09-28 15:58:30 +00:00
Mark Salyzyn 936d65f59b am cb2ab20d: am 87122ce1: Merge "logd: increase dgram_max_qlen to 600"
* commit 'cb2ab20d480cdf488e5b5bf37dc55ca7f0ddee67':
  logd: increase dgram_max_qlen to 600
2015-09-28 15:54:05 +00:00
Mark Salyzyn cb2ab20d48 am 87122ce1: Merge "logd: increase dgram_max_qlen to 600"
* commit '87122ce1d60dd6fbc18e747d976db734d502f2bf':
  logd: increase dgram_max_qlen to 600
2015-09-28 15:50:02 +00:00
Mark Salyzyn 39944c89a9 logd: increase dgram_max_qlen to 600
Seeing liblog messages on system_server runtime restart
(too much system_server spam, 566 messages in 72ms)

Bug: 23788621
Change-Id: I5171f2c19a3538da190fc6c2b40e978d89bf0e20
2015-09-25 14:15:53 +00:00
Tom Cherry 3c6ffbc6fe am 984bd832: resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp
* commit '984bd8323dcb5e494a04b2058ab7de40bf347ee5':
  add system-background cpuset
2015-09-21 21:41:46 +00:00
Tom Cherry 984bd8323d resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp
Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0
2015-09-21 14:25:34 -07:00
Evgenii Stepanov f09111a9dd am fbaaddc5: am 19584247: am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
* commit 'fbaaddc588f9d716cff71225a5c510f3b33b90cf':
  asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-20 01:25:13 +00:00
Evgenii Stepanov fbaaddc588 am 19584247: am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
* commit '195842474a6722fdf2d967446b81d8accbd4648c':
  asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-18 20:41:46 +00:00