openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,622 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

16622 Commits

Author SHA1 Message Date
Elliott Hughes 30baa4796d Merge "update bundled rc files to their contents from rootdir/init.rc" into mnc-dev-plus-aosp 2015-08-21 22:18:51 +00:00
Steve Fung 916a5c8624 am 0f6c07b7: Merge "crash_reporter: Add Android.mk" 
* commit '0f6c07b7b89f77927e94d6f87228eb5b15c607eb':
  crash_reporter: Add Android.mk
 2015-08-21 22:14:55 +00: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
Steve Fung 0f6c07b7b8 Merge "crash_reporter: Add Android.mk" 2015-08-21 22:08:32 +00:00
Tom Cherry d2a600eb35 update bundled rc files to their contents from rootdir/init.rc 
Bug 23186545

Change-Id: Ieb03ba89db2dee0365ae346295207ddfd29bd2b7
(cherry picked from commit 297991b324)
 2015-08-21 21:54:42 +00:00
Tom Cherry d64bf33890 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:44:37 +00:00
Tom Cherry 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
Tom Cherry 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
Tom Cherry a1b2036f4d Merge "remove bundled services from rootdir/init.rc" 2015-08-21 20:16:52 +00:00
Tom Cherry 2d8be6c279 Merge "init: import init rc scripts from file systems after mount_all" 2015-08-21 20:16:46 +00:00
Tom Cherry 60eb73ed6a 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:20:22 +00:00
Mark Salyzyn 1695b8464d am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string" 
* commit 'e7b451950acc0b845f1fab20a9e62c80bc81750a':
  logd: switch asprintf to std::string
 2015-08-21 18:19:49 +00:00
Mark Salyzyn d52484c7aa am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string" 
* commit '38e2877df102c4a817c6b24337a6be253945ed33':
  logd: statistics switch to std::string
 2015-08-21 18:19:46 +00:00
Mark Salyzyn 36a590ab36 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:19:43 +00:00
Steve Fung 8b9da2d41a am 75e95ebc: am cba296ca: Merge "metricsd: Give directory group permissions" 
* commit '75e95ebcbfc1f01d0822eb4e30192d3ce8ca2ad3':
  metricsd: Give directory group permissions
 2015-08-21 18:19:41 +00:00
Tom Cherry 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
Tom Cherry 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
Mark Salyzyn 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
Mark Salyzyn 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
Mark Salyzyn 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
Steve Fung 75e95ebcbf am cba296ca: Merge "metricsd: Give directory group permissions" 
* commit 'cba296cacb281b27a714e9b5bae2387fdfc397e5':
  metricsd: Give directory group permissions
 2015-08-21 17:22:28 +00: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
Tom Cherry 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
Tom Cherry 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
Tom Cherry 20391b1de5 bundle init.rc contents with its service 
Bug: 23186545
Change-Id: I52616b8ab1165fdef716f9b8f958665f2308c12e
 2015-08-21 10:14:43 -07:00
Mark Salyzyn 8a4beeb694 Merge "logd: switch asprintf to std::string" 2015-08-21 16:47:20 +00:00
Mark Salyzyn 67f3dd9c47 Merge "logd: statistics switch to std::string" 2015-08-21 16:43:28 +00:00
Mark Salyzyn cf5bd8ba05 Merge "logd: white and black switch to std::string" 2015-08-21 16:43:15 +00:00
Steve Fung cba296cacb Merge "metricsd: Give directory group permissions" 2015-08-21 16:39:26 +00:00
Mark Salyzyn 14dbb332dd 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:36:14 +00:00
Mark Salyzyn 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
Mark Salyzyn 25967bbccb Merge "libsparse: use strcmp and validate last_used pointer" 2015-08-21 14:26:07 +00:00
lei wang wang 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
Steve Fung 8b8878a7d1 crash_reporter: Fix path to dbus-send 
Bug: 22486906
Change-Id: If70b387bf95709719bb781719e7d0c195385be78
 2015-08-21 02:17:01 -07:00
Steve Fung 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
Abhishek Arya 64e2d8c0dc 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:12:31 +00:00
Abhishek Arya 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
Abhishek Arya 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
Abhishek Arya 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
Abhishek Arya 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
Abhishek Arya 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
Abhishek Arya cd407a17fe am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b 
* commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
 2015-08-21 06:18:47 +00:00
Abhishek Arya e0dce90b0d Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b 
Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7
 2015-08-20 21:55:55 -07:00
Sergio Giro d1af60186b am 3fa8b550: am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit '3fa8b550eadeef21e2ca996c44e37f84b1418f95':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-21 01:22:49 +00:00
Sergio Giro 3fa8b550ea am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit '93f106b8d0207ce685ad56704df8a568f3edebb6':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 23:04:53 +00:00
Sergio Giro 93f106b8d0 am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit 'e97682be0634fe773f70097bc518e5d034efe8f7':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:58:19 +00:00
Sergio Giro e97682be06 am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit 'a1a22b5736d5ad71531fd07d5c4103585e8e8977':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:44:57 +00:00
Sergio Giro a1a22b5736 am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit 'e67b584869eea8d4e955e82de1e38ede080a2ed4':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:38:33 +00:00
Sergio Giro e67b584869 am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit '4956c0fe1e582a8497aff34a41aeb8bf4748eef0':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:28:53 +00:00
Sergio Giro 4956c0fe1e am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit '5b85b1d40d619c2064d321364f212ebfeb6ba185':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:23:47 +00:00