Commit graph

1174 commits

Author SHA1 Message Date
Vincent Palatin
d22aaaac09 am 2a048110: am 100de590: am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev
* commit '2a0481109baaa8385bd9e43a95eac24cd6f89e43':
  init.usb.rc: fix USB typec property names
2015-09-06 23:07:26 +00:00
Vincent Palatin
2a0481109b am 100de590: am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev
* commit '100de590e7f82e1039eebc10e60ea554deeb1c3f':
  init.usb.rc: fix USB typec property names
2015-09-04 20:06:28 +00:00
Tom Cherry
4c5d655e3d am 4bc10de9: am cd1a65b6: am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"
* commit '4bc10de99f3f84b89b40c46203cbc051224f931d':
  move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:13:00 +00:00
Tom Cherry
fd53a3bf82 am c74403b4: am b00a8a06: am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"
* commit 'c74403b4c9c8acae326b39f06905a3a291a5471f':
  combine adbd.rc with init.usb.rc
2015-09-04 18:12:58 +00:00
Tom Cherry
4bc10de99f am cd1a65b6: am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"
* commit 'cd1a65b69ad2da81e654adab8edeead457a1b1f5':
  move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:02:34 +00:00
Tom Cherry
c74403b4c9 am b00a8a06: am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"
* commit 'b00a8a066f5b6ae5b8d0c03ee7f680389b38a260':
  combine adbd.rc with init.usb.rc
2015-09-04 18:02:32 +00:00
Tom Cherry
cd1a65b69a am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"
* commit '30c13c4954a959c2e6c5ba126f26d88b2e56be61':
  move uncrypt from init.rc to uncrypt.rc
2015-09-04 17:56:27 +00:00
Tom Cherry
b00a8a066f am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"
* commit 'e8b0fcecf4a17cf37b5fefbcceef0920788f776e':
  combine adbd.rc with init.usb.rc
2015-09-04 17:56:25 +00:00
Tom Cherry
30c13c4954 Merge "move uncrypt from init.rc to uncrypt.rc" 2015-09-04 16:51:30 +00:00
Tom Cherry
008eb9b80a move uncrypt from init.rc to uncrypt.rc
Move uncrypt from /init.rc to /system/etc/init/uncrypt.rc using the
LOCAL_INIT_RC mechanism

Bug 23186545

Change-Id: Ibd838dd1d250c0e6536e44b69f11fb5ed42ba10b
2015-09-03 16:33:08 -07:00
Tom Cherry
2270dbbc84 combine adbd.rc with init.usb.rc
init.usb.rc and adbd.rc contain similar contents and belong in the same
file.

This file also belongs on the ramdisk as adbd is on the ramdisk, not the
system partition, therefore resolving to keep init.usb.rc in its current
location and combining the contents of adbd.rc is the best approach

Change-Id: I430f8fea58694679e7b8b7be69ce87daadd616f4
2015-09-03 16:19:04 -07:00
Tom Cherry
b111a07962 am fdc6fbd0: am b2acb6b2: am b4998341: Merge "move init.trace.rc to frameworks/native"
* commit 'fdc6fbd0c7f98fa44b86e834a88441cce3bdedaa':
  move init.trace.rc to frameworks/native
2015-09-03 22:36:10 +00:00
Tom Cherry
fdc6fbd0c7 am b2acb6b2: am b4998341: Merge "move init.trace.rc to frameworks/native"
* commit 'b2acb6b2ce07bf9e1c944eadcdc2dafe3e41efaf':
  move init.trace.rc to frameworks/native
2015-09-03 22:28:35 +00:00
Tom Cherry
b2acb6b2ce am b4998341: Merge "move init.trace.rc to frameworks/native"
* commit 'b499834121854fd98664d8d96734c733f96dbc1f':
  move init.trace.rc to frameworks/native
2015-09-03 22:02:40 +00:00
Tom Cherry
b0d5184774 move init.trace.rc to frameworks/native
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.

Bug 23186545

Change-Id: I55c37d3ff98c9ac10e6c1a713fadc7eb37346195
2015-09-03 14:19:11 -07:00
Vincent Palatin
3b7995b72e init.usb.rc: fix USB typec property names
Fix typos in the usb typec properties (sys.usb.typec.*),
so the data_role and the power_role can be written properly in the sysfs.

Bug: 23790832
Change-Id: I90f591ab37825a07e0610ef1fec0e831eb19515d
2015-09-03 13:53:04 -07:00
Tim Murray
6d6acf4afe am c9b308d1: am bb641d5f: am bc8c731a: Add zygote to the foreground cpuset.
* commit 'c9b308d155c181ae78489454f64877759de98170':
  Add zygote to the foreground cpuset.
2015-09-03 17:36:28 +00:00
Tim Murray
c9b308d155 am bb641d5f: am bc8c731a: Add zygote to the foreground cpuset.
* commit 'bb641d5f7714bdb8cd3ecc4f47cdd7c68e75d17a':
  Add zygote to the foreground cpuset.
2015-09-03 06:22:42 +00:00
Badhri Jagan Sridharan
d8cf000d6c am b081b8cd: am ddc296e8: am e1801863: init: usb: Add init scripts for configfs commands
* commit 'b081b8cdd17ef678fd84dccb9b5645bd72f26c5b':
  init: usb: Add init scripts for configfs commands
2015-09-03 05:03:20 +00:00
Badhri Jagan Sridharan
5917b8a3bc am 1c791dfd: am 723b410f: am 48d59acc: init.usb.rc: Add new system property for configfs
* commit '1c791dfd3d8e5df380068dda0982ddb9149dcbd9':
  init.usb.rc: Add new system property for configfs
2015-09-03 05:03:19 +00:00
Tim Murray
a89568c29e am adef754b: am 25a1b489: am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-dev
* commit 'adef754b4548b391c6c2cac3065c91ccaa783a1b':
  Add foreground/boost cpuset.
2015-09-03 05:03:17 +00:00
Badhri Jagan Sridharan
b081b8cdd1 am ddc296e8: am e1801863: init: usb: Add init scripts for configfs commands
* commit 'ddc296e841fa98bc89c0459d1dd3e438c790f15d':
  init: usb: Add init scripts for configfs commands
2015-09-03 04:23:16 +00:00
Badhri Jagan Sridharan
1c791dfd3d am 723b410f: am 48d59acc: init.usb.rc: Add new system property for configfs
* commit '723b410ff50920cea270b282c19edcfaf6f444e2':
  init.usb.rc: Add new system property for configfs
2015-09-03 04:23:15 +00:00
Tim Murray
adef754b45 am 25a1b489: am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-dev
* commit '25a1b4894d9fc249535f0e0b3851643eb172202f':
  Add foreground/boost cpuset.
2015-09-03 04:22:24 +00:00
Tim Murray
bc8c731aab Add zygote to the foreground cpuset.
This ensures that newly forked zygote processes will end up
in the corret cpuset.

bug 23751126

Change-Id: I987a2828cf2504963f1317d17f0b51d26cf22a70
2015-09-02 11:39:05 -07:00
Badhri Jagan Sridharan
e18018639b init: usb: Add init scripts for configfs commands
This CL adds a new init script init.usb.configfs.rc
to add generic configfs commands. Setting
sys.usb.configfs in init.usb.{hardware}.rc
enables executing commands in this script

Bug=23633457

Change-Id: Iaae844a7957d6c9bf510648aaff86d56aa0c6243
2015-09-01 15:39:22 -07:00
Badhri Jagan Sridharan
48d59acc57 init.usb.rc: Add new system property for configfs
This CL helps to execute a different set of
commands for the usb configs specified in
init.usb.rc. Aimed at using configfs based
commands over android composition driver.

Bug=23633457

Change-Id: Ifa5f804e1cff93d15ad57d0ed553300bc5868936
2015-09-01 15:39:22 -07:00
Tim Murray
3985dda1c3 Add foreground/boost cpuset.
This is used for app launches (and maybe other high priority tasks
in the future). It's to be set to whatever cores should be used
for short term high-priority tasks.

bug 21915482

Change-Id: Id0ab0499146c09e860b97f4cb8095834cb12dd50
2015-08-25 00:31:54 -07:00
Tom Cherry
9f72700289 am 5ff07b26: am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit '5ff07b26851f5f416844e767645876f9f6e11e23':
  remove TARGET_PROVIDES_INIT_RC
2015-08-25 00:46:43 +00:00
Tom Cherry
5ff07b2685 am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit '9b2bc347659de454796acfc9402cbbc170efd133':
  remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:28 +00:00
Tom Cherry
fbe3fa84ff am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
* commit '9b2bc347659de454796acfc9402cbbc170efd133':
  remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:20 +00:00
Tom Cherry
0ea4ffdc06 remove TARGET_PROVIDES_INIT_RC
Change-Id: I15105a8dc11e218d95d4f5a4cee5b2a166d3d639
2015-08-24 13:56:43 -07:00
Tom Cherry
ef6556b8f9 resolved conflicts for merge of 22bc242a to master
Change-Id: I80546955611db9d003466c78588e8a7316ca9a6d
2015-08-21 15:22:57 -07:00
Tom Cherry
57a082f4de resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp
Change-Id: Ia0c7f2e33e22b2419811f7e68da276e02e156d08
2015-08-21 15:12:28 -07:00
Tom Cherry
22bc242a5b resolved conflicts for merge of b21de5f6 to mnc-dr-dev-plus-aosp
Change-Id: I13fd71d5af0b0a66d0c3e2f026581c60e9b95e8b
2015-08-21 15:09:30 -07:00
Tom Cherry
837135a64f remove bundled services from rootdir/init.rc
Services definitions for core services are now bundled with the source
for the service itself in the form of <service name>.rc.  These
individual .rc files are now located in /system/init/... and are
parsed when the system partition is mounted.

Bug: 23186545
Change-Id: Ia1b73af8d005633aa4252d603892064d7804163d
2015-08-21 10:14:44 -07:00
Tim Kilbourn
f1ed73fdf7 am bb41f7d6: am 94653364: Merge "Use init to write usb typec props" into mnc-dr-dev
* commit 'bb41f7d6ed03073ae9df41e3cc0edb80d89574b9':
  Use init to write usb typec props
2015-08-19 02:20:38 +00:00
Tim Kilbourn
bb41f7d6ed am 94653364: Merge "Use init to write usb typec props" into mnc-dr-dev
* commit '946533648c49f2700b6e0f73383699597649ee60':
  Use init to write usb typec props
2015-08-19 01:41:40 +00:00
Tim Kilbourn
8c12fdf4ab Use init to write usb typec props
The sysfs nodes are owned by root, so use init to write role changes.

Bug: 21615151
Change-Id: I39ad03a23af0be9ac859d4fb79a46edc27e30f4e
2015-08-17 14:56:57 -07:00
Evgenii Stepanov
3aa4f5314e am 548f53d0: am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
* commit '548f53d0666dc4fc850989c8af260888584e40d9':
  Read global ASAN_OPTIONS from a file.
2015-08-17 16:24:26 +00:00
Evgenii Stepanov
6c74e54544 am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
* commit '1ec3ba4471d5883742b2500ba53ed2272539e756':
  Read global ASAN_OPTIONS from a file.
2015-08-17 01:15:19 +00:00
Evgenii Stepanov
548f53d066 am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
* commit '1ec3ba4471d5883742b2500ba53ed2272539e756':
  Read global ASAN_OPTIONS from a file.
2015-08-17 01:15:06 +00:00
Evgenii Stepanov
428f626d1b Merge "Read global ASAN_OPTIONS from a file." 2015-08-16 18:42:38 +00:00
Riley Andrews
2decff086c am 94ee212a: am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
* commit '94ee212af135a1e602c9dac73f22dc6807409370':
  Added file permissions for binder tracing
2015-08-12 23:56:32 +00:00
Riley Andrews
19fe5c9442 am f63f3685: am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
* commit 'f63f36859eecb3b5a2a43b6ae75fdbbb0f2bc039':
  Added shell permisisons for memreclaim tracing
2015-08-12 23:56:08 +00:00
Riley Andrews
94ee212af1 am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
* commit 'bc2cdfa8a00980f4c38ebcd67bac888b355e3787':
  Added file permissions for binder tracing
2015-08-12 23:43:38 +00:00
Riley Andrews
87ea6cfb62 am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
* commit 'bc2cdfa8a00980f4c38ebcd67bac888b355e3787':
  Added file permissions for binder tracing
2015-08-12 23:43:02 +00:00
Riley Andrews
f63f36859e am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
* commit '4a4dc5f313953764079a4020a3791e36ec43ba0c':
  Added shell permisisons for memreclaim tracing
2015-08-12 23:28:40 +00:00
Riley Andrews
c1490ad9a0 am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
* commit '4a4dc5f313953764079a4020a3791e36ec43ba0c':
  Added shell permisisons for memreclaim tracing
2015-08-12 23:26:34 +00:00
Scott Bauer
cd1d99e268 Added file permissions for binder tracing 2015-08-12 16:20:51 -07:00