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

23679 Commits

Author SHA1 Message Date
Chuanxiao Dong 8b1707ec3a Merge "fs_mgr: fix encryptable=footer support" am: b67fed557f am: 7f06a23414 
am: aa0318c9e9

* commit 'aa0318c9e9b97b2644c7428313fbeec4f86d12fd':
  fs_mgr: fix encryptable=footer support

Change-Id: Ic8d662bd960a4e40f0a3073ff2442b5d1eb20d99
 2016-06-07 17:03:02 +00:00
Chuanxiao Dong aa0318c9e9 Merge "fs_mgr: fix encryptable=footer support" am: b67fed557f 
am: 7f06a23414

* commit '7f06a234140a1dc5c0160fca03b7fcf0fd35939a':
  fs_mgr: fix encryptable=footer support

Change-Id: Iea56bd3856a241100bd23b3a06c3284c47bff5c0
 2016-06-07 17:00:16 +00:00
Chuanxiao Dong 7f06a23414 Merge "fs_mgr: fix encryptable=footer support" 
am: b67fed557f

* commit 'b67fed557f68714ba602ecbf3b4fa8bd06faf831':
  fs_mgr: fix encryptable=footer support

Change-Id: I4112bdfff301ffbcf172031a312cab9278b6ace4
 2016-06-07 16:54:42 +00:00
Treehugger Robot b67fed557f Merge "fs_mgr: fix encryptable=footer support" 2016-06-07 16:49:39 +00:00
Elliott Hughes c30a948e82 Merge "Use alignas for alignment." am: bb1e7977fb am: 689b998ab2 
am: 016ad16100

* commit '016ad16100694b829dec1c44aa06d65bf1c86eb7':
  Use alignas for alignment.

Change-Id: I34c786cac4cab920f4cf1269d3e0d721e0829fda
 2016-06-07 15:58:11 +00:00
Elliott Hughes 016ad16100 Merge "Use alignas for alignment." am: bb1e7977fb 
am: 689b998ab2

* commit '689b998ab26f2a04e079312aee2f8e32fbe7f26c':
  Use alignas for alignment.

Change-Id: Ic81a88146df0f407849800c63d2edb7404efe0ac
 2016-06-07 15:55:12 +00:00
Elliott Hughes 689b998ab2 Merge "Use alignas for alignment." 
am: bb1e7977fb

* commit 'bb1e7977fbd4b0f156d40f78695e2ff53db200a1':
  Use alignas for alignment.

Change-Id: I49592b6c75825b9e094fa6755bb0ce281a30135c
 2016-06-07 15:47:02 +00:00
Elliott Hughes bb1e7977fb Merge "Use alignas for alignment." 2016-06-07 15:41:28 +00:00
Sami Tolvanen 9a20c8af6a resolve merge conflicts of eacbb82 to nyc-dev-plus-aosp 
am: 4171b2b724

* commit '4171b2b72423d0f6555ee4638dbfb7d95b023996':

Change-Id: I0b775bcdb449868a50766f4e36db2b36c0af2760
 2016-06-07 15:41:17 +00:00
Sami Tolvanen b04dbbcd1e resolve merge conflicts of d6f5af3 to nyc-mr1-dev-plus-aosp 
Change-Id: Ie579411df1d4f04a7f5f29457fbcf7b47c9d09ec
 2016-06-06 23:07:54 -07:00
Sami Tolvanen 4171b2b724 resolve merge conflicts of eacbb82 to nyc-dev-plus-aosp 
Change-Id: Ia3077f826c1d422932b62684ae0d53935abfe807
 2016-06-06 22:56:23 -07:00
David Pursell b8f947f727 Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 
am: 20352727af

* commit '20352727af3237c600e876162b806ecc2e54bb01':

Change-Id: I1e3467155fcf1158e2fb8fcdf7e97e03440518eb
 2016-06-07 04:45:45 +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
Elliott Hughes 20352727af Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 2016-06-07 04:40:43 +00:00
Elliott Hughes 3b2920a807 Merge "resolve merge conflicts of f6d0da2 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-06-07 04:40:41 +00:00
Collin Mulliner fb9c42648f resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp 
am: 8d532e4737

* commit '8d532e47376859e2ea8f953ebe75d24560e80464':
  use process groups for processes started by init

Change-Id: I720291ac0966333e56f2607fe219a56bca541ee8
 2016-06-07 04:24:27 +00:00
Elliott Hughes 8d532e4737 resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp 
Change-Id: I41cdca717664a16f00fd1b28076dd752fa96653d
 2016-06-06 21:19:55 -07:00
Collin Mulliner cea1d0465b Merge "use process groups for processes started by init" 
am: ebe636e5ce

* commit 'ebe636e5ce57df4fd8a93304453a3de30b758104':
  use process groups for processes started by init

Change-Id: Id0368160918e80ce02c152ee96d71b2e77c542e7
 2016-06-07 03:06:52 +00:00
Elliott Hughes ebe636e5ce Merge "use process groups for processes started by init" 2016-06-07 03:03:07 +00:00
Elliott Hughes 5f4a946c09 Use alignas for alignment. 
Change-Id: I427c407a188682a360c74b2bd5a44dd62551ea66
 2016-06-06 19:59:45 -07:00
Sami Tolvanen d6f5af35d5 Merge "fs_mgr: validate corrected signatures" into nyc-dev 
am: eacbb824c9

* commit 'eacbb824c9ee2ccec9e1de641d03e7370888eabc':
  fs_mgr: validate corrected signatures

Change-Id: I3986a59d498a22769611216f5ed475f31332b2c9
 2016-06-07 00:05:41 +00:00
Sami Tolvanen eacbb824c9 Merge "fs_mgr: validate corrected signatures" into nyc-dev 2016-06-07 00:01:56 +00:00
David Pursell 739f431eea resolve merge conflicts of f6d0da2 to nyc-mr1-dev-plus-aosp 
Change-Id: Iefa7d072d50251f4d3376c1f31a6bb1bef05d9af
 2016-06-06 17:01:17 -07:00
David Pursell 20fd80d0e6 resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp 
Change-Id: I7bf63eae8c13ffd512483e940bb5c35e8ce4e36e
 2016-06-06 16:51:08 -07:00
Tao Bao f9b7f7fdba Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev 2016-06-06 23:43:29 +00:00
Collin Mulliner f7e79b99c1 use process groups for processes started by init 
Put every service into a process group, kill the process group
and all child processes created within the group when killing the
service. Removed libutil dependency in libprocessgroup.

Bug: 25355957
Change-Id: Ieed60ec41579f638ab9b1e66a7e6330ed578ab05
Signed-off-by: Collin Mulliner <collinrm@squareup.com>
 2016-06-06 16:31:01 -07:00
David Pursell f6d0da2b69 adbd: properly close subprocess pipes on Ctrl+C. 
am: a6d5661140

* commit 'a6d56611404f2e1c0c9f4ab7c8471af0e80b2026':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: I96c1fb2036a58702b23f606bb1e6a27f924324eb
 2016-06-06 23:18:58 +00:00
David Pursell ae9fe06936 Merge "adbd: properly close subprocess pipes on Ctrl+C." am: 605628d325 am: 5701c58296 
am: 27a68ef007

* commit '27a68ef007734929a6cfb46c233c5b1757f7786c':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: Ibc14c8fea014b0d2589db51bb02e86bd069da457
 2016-06-06 21:27:07 +00:00
David Pursell 27a68ef007 Merge "adbd: properly close subprocess pipes on Ctrl+C." am: 605628d325 
am: 5701c58296

* commit '5701c58296b7ae84e8b9e67b6103ffdf63550fc7':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: I361b9ed8ce1d12487d88850635bf1b60c1b675c4
 2016-06-06 21:25:03 +00:00
David Pursell 5701c58296 Merge "adbd: properly close subprocess pipes on Ctrl+C." 
am: 605628d325

* commit '605628d325b003251155b5c5b425028106bf8f29':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: I6eb8faa339a0a6506e21d5c74e5e9b8582e04735
 2016-06-06 21:17:16 +00:00
David Pursell 605628d325 Merge "adbd: properly close subprocess pipes on Ctrl+C." 2016-06-06 21:06:11 +00:00
Sami Tolvanen 830126637a fs_mgr: validate corrected signatures 
If signature verification fails and we have an error corrected
signature available, attempt to verify that instead.

Needs changes from
  Ie913c21ba1d07d6df4c6feeb7226b2ec963f4d19

Bug: 28943429
Change-Id: I7d48701916fe430b17aa05acb120f22a1802733d
 2016-06-06 13:54:00 -07:00
David Pursell a6d5661140 adbd: properly close subprocess pipes on Ctrl+C. 
When non-interactive sessions exit via Ctrl+C, adbd sends SIGHUP
to the child process to let it know to exit. However, adbd was not
closing the pipes to the child process, so if the subprocess ignored
SIGHUP and continued writing it could fill up the pipe and block
forever while adbd waits for it to exit.

This CL adds the necessary calls to close the subprocess pipe after
sending SIGHUP.

Bug: 28981563
Change-Id: I318e322e563241052648361172f4859c297837fb
(cherry picked from commit f2aa186c7b)
 2016-06-06 12:56:52 -07:00
David Pursell f2aa186c7b adbd: properly close subprocess pipes on Ctrl+C. 
When non-interactive sessions exit via Ctrl+C, adbd sends SIGHUP
to the child process to let it know to exit. However, adbd was not
closing the pipes to the child process, so if the subprocess ignored
SIGHUP and continued writing it could fill up the pipe and block
forever while adbd waits for it to exit.

This CL adds the necessary calls to close the subprocess pipe after
sending SIGHUP.

Bug: 28981563
Change-Id: I318e322e563241052648361172f4859c297837fb
 2016-06-06 09:59:34 -07:00
Elliott Hughes 3505b73ff5 Merge "Remove toolbox ioctl." am: 0fdd663262 am: ee915afa21 
am: 425c0f9eb7

* commit '425c0f9eb7c6095d261644997658776dc9921166':
  Remove toolbox ioctl.

Change-Id: Ie3018a158829001f16dbcfa525e6f15c8b31f241
 2016-06-04 16:35:05 +00:00
Elliott Hughes 425c0f9eb7 Merge "Remove toolbox ioctl." am: 0fdd663262 
am: ee915afa21

* commit 'ee915afa2117725bae8a083b9116dd07b4a51e7c':
  Remove toolbox ioctl.

Change-Id: I61c85490b29b2d4de2ffb9cdd7f9fa40e445c28d
 2016-06-04 16:31:36 +00:00
Elliott Hughes ee915afa21 Merge "Remove toolbox ioctl." 
am: 0fdd663262

* commit '0fdd663262ccaff2f6ac6459a5bd9abf76c2cb5f':
  Remove toolbox ioctl.

Change-Id: I0ed7e7383828619f3804263c18e657efdabf1cb2
 2016-06-04 16:25:04 +00:00
Treehugger Robot 0fdd663262 Merge "Remove toolbox ioctl." 2016-06-04 16:14:39 +00:00
Elliott Hughes 1f406e270f Remove toolbox ioctl. 
Let's remove this convenient tool for attacking buggy kernels and see if
anyone with a legitimate use notices. I suspect most potential legitimate
users write a short C program instead anyway.

Bug: http://b/29128170
Change-Id: I14e8b8594902951fe0b94c9ce13baa2c4d7b9e6e
 2016-06-04 08:12:34 -07:00
Mark Salyzyn 3fbb2acde7 Merge "logpersist: switch to pgrep from ps" am: 68285c0033 am: b749a0c02f 
am: 8739660239

* commit '873966023961be5193583a144ba401b6650cddff':
  logpersist: switch to pgrep from ps

Change-Id: Ie4ab24b41006d2be700e73893d8b7ed9be4d5642
 2016-06-03 23:35:26 +00:00
Mark Salyzyn 8739660239 Merge "logpersist: switch to pgrep from ps" am: 68285c0033 
am: b749a0c02f

* commit 'b749a0c02fa925c77eae7eff5198a5e34be0cfb6':
  logpersist: switch to pgrep from ps

Change-Id: Ia4e06f203824539c3d6f6e7d7f88f1e955a626bf
 2016-06-03 21:51:32 +00:00
Mark Salyzyn b749a0c02f Merge "logpersist: switch to pgrep from ps" 
am: 68285c0033

* commit '68285c00334af57d9077648fb408a34643514df5':
  logpersist: switch to pgrep from ps

Change-Id: I5a4142c91f152740003c733a1baca8f3318de259
 2016-06-03 21:41:03 +00:00
Treehugger Robot 68285c0033 Merge "logpersist: switch to pgrep from ps" 2016-06-03 21:34:01 +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
Josh Gao 9cc46b972b Merge "cutils: don\'t fortify property_get on clang." am: 310da0b990 am: 2a1f209245 
am: 771c1ed582

* commit '771c1ed5826809ab45932e4b768cc9641f9618f9':
  cutils: don't fortify property_get on clang.

Change-Id: I25e041c4cdf757c43bf6c9c2922721b78a1eb44e
 2016-06-03 19:53:37 +00:00
Josh Gao 771c1ed582 Merge "cutils: don\'t fortify property_get on clang." am: 310da0b990 
am: 2a1f209245

* commit '2a1f20924516b41e22adb766b6751869fb5c3af4':
  cutils: don't fortify property_get on clang.

Change-Id: Idd7402dca16633fa19e2110b6d74b005b3e519f9
 2016-06-03 19:46:05 +00:00
Josh Gao 2a1f209245 Merge "cutils: don\'t fortify property_get on clang." 
am: 310da0b990

* commit '310da0b9904d33d58315a974351375bbc663bf89':
  cutils: don't fortify property_get on clang.

Change-Id: I04a0ea55a5c5b04d3c2180915bd52a7d3b5a95f3
 2016-06-03 19:38:27 +00:00
Treehugger Robot 310da0b990 Merge "cutils: don't fortify property_get on clang." 2016-06-03 19:29:12 +00:00
Android Build Merger (Role) 7288b3bf50 Merge "Revert "adb: close ep0 on disconnection." am: 8c4076295e am: 8edfe2040b" into nyc-mr1-dev-plus-aosp 2016-06-03 04:50:39 +00:00
Siqi Lin 1a60c1a8cf Revert "adb: close ep0 on disconnection." am: 8c4076295e 
am: e780adf0fe

* commit 'e780adf0fea32e0b99fbf0078f5fcf23b20e73b3':
  Revert "adb: close ep0 on disconnection."

Change-Id: Ia3fb3d8b2470a8459360f780207a6cbfe39f572d
 2016-06-03 04:50:27 +00:00