ef6556b8f9
resolved conflicts for merge of 22bc242a to master
...
Change-Id: I80546955611db9d003466c78588e8a7316ca9a6d
2015-08-21 15:22:57 -07:00
22bc242a5b
resolved conflicts for merge of b21de5f6 to mnc-dr-dev-plus-aosp
...
Change-Id: I13fd71d5af0b0a66d0c3e2f026581c60e9b95e8b
2015-08-21 15:09:30 -07:00
3bd9644804
am 25c22bb9: am 08a6775f: am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all"
...
* commit '25c22bb9e71998d0358628052fc32a09ec53bbbf':
init: import init rc scripts from file systems after mount_all
2015-08-21 21:55:36 +00:00
25c22bb9e7
am 08a6775f: am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all"
...
* commit '08a6775f8cdadf48e7b5f4f4d710180fda43b2b6':
init: import init rc scripts from file systems after mount_all
2015-08-21 21:47:03 +00:00
b21de5f627
am a1b2036f: Merge "remove bundled services from rootdir/init.rc"
...
* commit 'a1b2036f4daf9e0de0fe616e5f371d75f6b2357d':
remove bundled services from rootdir/init.rc
2015-08-21 20:20:44 +00:00
08a6775f8c
am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all"
...
* commit '2d8be6c2790333479ac9ff84078d7de9903d64fb':
init: import init rc scripts from file systems after mount_all
2015-08-21 20:20:43 +00:00
a1b2036f4d
Merge "remove bundled services from rootdir/init.rc"
2015-08-21 20:16:52 +00:00
2d8be6c279
Merge "init: import init rc scripts from file systems after mount_all"
2015-08-21 20:16:46 +00:00
297991b324
update bundled rc files to their contents from rootdir/init.rc
...
Bug 23186545
Change-Id: Ieb03ba89db2dee0365ae346295207ddfd29bd2b7
2015-08-21 12:39:01 -07:00
7eae0e19b9
am c7676b50: am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\'
...
* commit 'c7676b5037f56b3e1f2f7450f560e4834394995e':
init: Queue Triggers instead of Actions
bundle init.rc contents with its service
2015-08-21 18:31:44 +00:00
6377a6d503
am 3bee4fee: am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string"
...
* commit '3bee4feefeeb122a9ca1c3d040efd0f65f9748f8':
logd: switch asprintf to std::string
2015-08-21 18:31:43 +00:00
5f610b3395
am deeb03a8: am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string"
...
* commit 'deeb03a8c4edcf4f3ebe5422d2d041c0ccc92d90':
logd: statistics switch to std::string
2015-08-21 18:31:41 +00:00
3f16ca3929
am 75cc67ac: am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string"
...
* commit '75cc67ac496443e1e12298e6bd802ecc40dcd731':
logd: white and black switch to std::string
2015-08-21 18:31:40 +00:00
7a171f715a
am e86e612b: am 75e95ebc: am cba296ca: Merge "metricsd: Give directory group permissions"
...
* commit 'e86e612b98c02339e81210ec804d3bb023b55975':
metricsd: Give directory group permissions
2015-08-21 18:31:38 +00:00
c7676b5037
am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\'
...
* commit '54b22ca2488e4901265c99a42b5c5e0725a99199':
init: Queue Triggers instead of Actions
bundle init.rc contents with its service
2015-08-21 18:24:18 +00:00
3bee4feefe
am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string"
...
* commit 'e7b451950acc0b845f1fab20a9e62c80bc81750a':
logd: switch asprintf to std::string
2015-08-21 18:23:41 +00:00
deeb03a8c4
am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string"
...
* commit '38e2877df102c4a817c6b24337a6be253945ed33':
logd: statistics switch to std::string
2015-08-21 18:23:40 +00:00
75cc67ac49
am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string"
...
* commit 'aa051ac68d769194751624612bf68cb753d94b6d':
logd: white and black switch to std::string
2015-08-21 18:23:38 +00:00
e86e612b98
am 75e95ebc: am cba296ca: Merge "metricsd: Give directory group permissions"
...
* commit '75e95ebcbfc1f01d0822eb4e30192d3ce8ca2ad3':
metricsd: Give directory group permissions
2015-08-21 18:23:37 +00:00
54b22ca248
am ff5be396: Merge changes from topic \'init-rc-breakup\'
...
* commit 'ff5be396d77cdf7f18e7d8f7a14f62ec760f5a1e':
init: Queue Triggers instead of Actions
bundle init.rc contents with its service
2015-08-21 17:52:44 +00:00
ff5be396d7
Merge changes from topic 'init-rc-breakup'
...
* changes:
init: Queue Triggers instead of Actions
bundle init.rc contents with its service
2015-08-21 17:42:29 +00:00
e7b451950a
am 8a4beeb6: Merge "logd: switch asprintf to std::string"
...
* commit '8a4beeb6941eada504b7be5c4c6f43374fb343fc':
logd: switch asprintf to std::string
2015-08-21 17:22:33 +00:00
38e2877df1
am 67f3dd9c: Merge "logd: statistics switch to std::string"
...
* commit '67f3dd9c474e47dcea2bcd7a72e4b75ac686e80a':
logd: statistics switch to std::string
2015-08-21 17:22:31 +00:00
aa051ac68d
am cf5bd8ba: Merge "logd: white and black switch to std::string"
...
* commit 'cf5bd8ba05a0ec3d0a15309276499a155b8aee5f':
logd: white and black switch to std::string
2015-08-21 17:22:29 +00:00
75e95ebcbf
am cba296ca: Merge "metricsd: Give directory group permissions"
...
* commit 'cba296cacb281b27a714e9b5bae2387fdfc397e5':
metricsd: Give directory group permissions
2015-08-21 17:22:28 +00:00
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
b8dd0272e5
init: import init rc scripts from file systems after mount_all
...
Import /{system,vendor,odm}/etc/init/... after file systems are mounted
Bug: 23186545
Change-Id: Idb0cae9773f904c0330054c8b3e31eb87b2fb7cb
2015-08-21 10:14:43 -07:00
cb716f976b
init: Queue Triggers instead of Actions
...
When init queues a trigger, it actually enqueues all of the Actions
that match with that given trigger. This works currently because
all init scripts are loaded and therefore all Actions are available
before init starts queueing any triggers.
To support loading init scripts after init has started queueing
triggers, this change enqueues Trigger objects instead of their
matching Actions. Each Trigger object then matches its associated
Actions during its execution.
Additionally, this makes a few cosmetic clean ups related to triggers.
Bug: 23186545
Change-Id: I5d177458e6df1c4b32b1072cf77e87ef952c87e4
2015-08-21 10:14:43 -07:00
20391b1de5
bundle init.rc contents with its service
...
Bug: 23186545
Change-Id: I52616b8ab1165fdef716f9b8f958665f2308c12e
2015-08-21 10:14:43 -07:00
8a4beeb694
Merge "logd: switch asprintf to std::string"
2015-08-21 16:47:20 +00:00
67f3dd9c47
Merge "logd: statistics switch to std::string"
2015-08-21 16:43:28 +00:00
cf5bd8ba05
Merge "logd: white and black switch to std::string"
2015-08-21 16:43:15 +00:00
cba296cacb
Merge "metricsd: Give directory group permissions"
2015-08-21 16:39:26 +00:00
96a536b679
Merge "libutils: fix overflow in SharedBuffer"
2015-08-21 15:11:20 +00:00
9c9f62e7fc
am 7b0d8ca2: am 64f4adba: am 25967bbc: Merge "libsparse: use strcmp and validate last_used pointer"
...
* commit '7b0d8ca2586495681b5b3fb7ca08cce57613a8ac':
libsparse: use strcmp and validate last_used pointer
2015-08-21 14:46:44 +00:00
7b0d8ca258
am 64f4adba: am 25967bbc: Merge "libsparse: use strcmp and validate last_used pointer"
...
* commit '64f4adbadf09e11b86a1d7ae8f1288461b070331':
libsparse: use strcmp and validate last_used pointer
2015-08-21 14:37:13 +00:00
64f4adbadf
am 25967bbc: Merge "libsparse: use strcmp and validate last_used pointer"
...
* commit '25967bbccbe108a91e65247427261017b2474962':
libsparse: use strcmp and validate last_used pointer
2015-08-21 14:30:51 +00:00
25967bbccb
Merge "libsparse: use strcmp and validate last_used pointer"
2015-08-21 14:26:07 +00:00
c227a1d855
libsparse: use strcmp and validate last_used pointer
...
This patch is used to fix two Bugs in backed_block.c
First, fix wrong comparing string way: we should use strcmp rather than
just compare their address. Second, fix using illegal memory risk in
bbl->last_used pointer. When entering queue_bb function,
bbl->last_used = new_bb, but in the following code if
queue_bb(xx, bb, new_bb) return ok, the space of new_bb is released. So
next time, if you use bbl->last_used pointer, may cause segment fault !
Change-Id: I6abb505f9b903b697448639fc64fb7518df5cca1
2015-08-21 14:23:31 +00:00
7987b83553
libutils: fix overflow in SharedBuffer
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
Change-Id: Idcc7e581a69436c8a623659fbd9add9e5f0d4c74
2015-08-21 14:17:32 +01:00
3f62060b8d
metricsd: Give directory group permissions
...
Since crash_reporter gets run as root, in order to use metrics_lib
it has to use group permissions to interact with metrics files.
Bug: 23406290
Change-Id: Ie9556233105312f973c0a3e018fc0305a466148d
2015-08-21 02:02:19 -07:00
869d8a94f2
am d1a6188e: am a77a0487: am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'd1a6188e8c024e0631873fccc2a5ea5e02fb8ec6':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:44:18 +00:00
d1a6188e8c
am a77a0487: am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'a77a0487525df3add570605e58a7eb3a03eca6a8':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:40:02 +00:00
a77a048752
am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit '219a006f89a5448a9a6eeb1f37ad0088e85bd3f8':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:14:31 +00:00
219a006f89
am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'fc5fdc85683f87c42d5ce7bcee4e2b70ef0acdd0':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:05:07 +00:00
fc5fdc8568
am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'e45d96d6bf592f0ae20bb021ea529acc94e0cb55':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:54:21 +00:00
e45d96d6bf
am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit '19398a712c53d27aaa2122cfae5d54168b8df0c9':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:36:01 +00:00
19398a712c
am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'd34846b70b7f6eb167722d45e0c717fa64116e90':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:29:00 +00:00
d34846b70b
am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'cd407a17fe326f3e18866ddddb1c747b06a45fc0':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:23:50 +00:00
cd407a17fe
am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:18:47 +00:00
Tom Cherry