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

22104 Commits

Author SHA1 Message Date
Sami Tolvanen e459bfaef9 mkbootimg: add version and patch level 
am: dcdf300a1f

* commit 'dcdf300a1f5b0ad3fb517e53cfe09cc8eab05311':
  mkbootimg: add version and patch level
 2016-03-08 16:54:31 +00:00
Sami Tolvanen ce2ea3837c resolve merge conflicts of 9c41490ca7 to nyc-dev-plus-aosp 
Change-Id: I5638606f8c59d33898efa184e349a2f818381c4d
 2016-03-08 08:43:04 -08:00
Sami Tolvanen dcdf300a1f mkbootimg: add version and patch level 
Adds operating system version and security patch level to the boot
image header. This change takes over two existing unused fields to
preserve compatibility with existing devices.

Bug: 27498078
Bug: 22914603
Change-Id: I57682611e0c27fec5ed284da7d9a788383ff98b1
(cherry pick from commit 3edc43234a)
 2016-03-08 08:19:41 -08:00
Bernhard Rosenkränzer 9c41490ca7 Allow building with Python 3.x 
Allow the scripts to run with both python 2.x and 3.x

Bug: 27498078
Bug: 22914603
Change-Id: I911118bcf370d09bdb2fb46afa21af64257f1ffb
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
(cherry pick from commit c434cf82d5)
 2016-03-08 08:18:34 -08:00
Sami Tolvanen 8381c8dd35 Merge "mkbootimg: add version and patch level" am: 5417aa0cf5 
am: 181f429f0f

* commit '181f429f0f89b5d9936c5b2205f59fee0e4fe034':
  mkbootimg: add version and patch level
 2016-03-08 16:10:01 +00:00
Sami Tolvanen 181f429f0f Merge "mkbootimg: add version and patch level" 
am: 5417aa0cf5

* commit '5417aa0cf50bc1d5f6ea5d27de8ad7ebfa878607':
  mkbootimg: add version and patch level
 2016-03-08 16:08:04 +00:00
Sami Tolvanen 5417aa0cf5 Merge "mkbootimg: add version and patch level" 2016-03-08 16:02:24 +00:00
George Burgess IV 02f689e11a Merge "Cleanup uses of sprintf so we can deprecate it." am: 2c5b89a64a 
am: 3368bdebba

* commit '3368bdebba02316710bafc5bce120eec388365fb':
  Cleanup uses of sprintf so we can deprecate it.
 2016-03-08 07:41:39 +00:00
George Burgess IV 3368bdebba Merge "Cleanup uses of sprintf so we can deprecate it." 
am: 2c5b89a64a

* commit '2c5b89a64a6ba2e62299635b8d81a17b59703b4c':
  Cleanup uses of sprintf so we can deprecate it.
 2016-03-08 04:16:52 +00:00
Elliott Hughes af777ae7c3 Merge "Remove toolbox prlimit." am: a6680f78d4 
am: e6310fcb8e

* commit 'e6310fcb8e5f67ddbb94250e63505e523f1e09b0':
  Remove toolbox prlimit.
 2016-03-08 04:15:18 +00:00
George Burgess IV 2c5b89a64a Merge "Cleanup uses of sprintf so we can deprecate it." 2016-03-08 04:14:06 +00:00
George Burgess IV e7aa2b2c83 Cleanup uses of sprintf so we can deprecate it. 
Also cleans up two instances of open() with useless mode params, and
changes a few uses of snprintf to use sizeof(buffer) instead of
hardcoded buffer sizes.

Change-Id: If11591003d910c995e72ad8f75afd072c255a3c5
 2016-03-07 18:40:40 -08:00
Colin Cross 4daead2fd7 Merge "Fix mac build" into nyc-dev 
am: 8a1d0a446f

* commit '8a1d0a446fc3d59b006cbec7fc398593e87b8330':
  Fix mac build
 2016-03-08 01:27:42 +00:00
Colin Cross 8a1d0a446f Merge "Fix mac build" into nyc-dev 2016-03-08 01:20:55 +00:00
Colin Cross e33686b7ca Fix mac build 
Disable memunreachable_test for mac.

Change-Id: Ie9594b6e5dfc661c4d709b419dbcb7b610434a84
 2016-03-07 17:19:28 -08:00
Colin Cross b2065191bd Merge changes I2e050a37,Ia2bf2ccf,I4e4db704,Ifbfd14e2,Ib46fcfa3 into nyc-dev 
am: c69bd61591

* commit 'c69bd61591780042951e222455f0a2fab9de2cf0':
  Add ABI to leak report
  Combine leaks with same stacktrace
  Fix allocator::map template argument ordering
  Fold leaks that are referenced by other leaks
  Compile some tests for the host
 2016-03-07 23:55:16 +00:00
Colin Cross c69bd61591 Merge changes I2e050a37,Ia2bf2ccf,I4e4db704,Ifbfd14e2,Ib46fcfa3 into nyc-dev 
* changes:
  Add ABI to leak report
  Combine leaks with same stacktrace
  Fix allocator::map template argument ordering
  Fold leaks that are referenced by other leaks
  Compile some tests for the host
 2016-03-07 23:42:47 +00:00
James Hawkins 65aa5da5b9 Merge "bootstat: Gate boot time metrics logging on an encrypted device being decrypted." into nyc-dev 
am: a69e45f93a

* commit 'a69e45f93ac3ceaa79ae61c1b70d9eb745061925':
  bootstat: Gate boot time metrics logging on an encrypted device being decrypted.
 2016-03-07 23:33:14 +00:00
James Hawkins 9a78f57059 Merge "bootstat: Don\'t log time_since_factory_reset on device reset." into nyc-dev 
am: bed422f575

* commit 'bed422f575c9d788c669c9ed3e1d683f242bd16a':
  bootstat: Don't log time_since_factory_reset on device reset.
 2016-03-07 23:32:40 +00:00
James Hawkins a69e45f93a Merge "bootstat: Gate boot time metrics logging on an encrypted device being decrypted." into nyc-dev 2016-03-07 23:24:17 +00:00
James Hawkins bed422f575 Merge "bootstat: Don't log time_since_factory_reset on device reset." into nyc-dev 2016-03-07 23:24:08 +00:00
Elliott Hughes e6310fcb8e Merge "Remove toolbox prlimit." 
am: a6680f78d4

* commit 'a6680f78d4665b2a936f76311e6f60eb930992c8':
  Remove toolbox prlimit.
 2016-03-07 23:03:14 +00:00
Elliott Hughes a6680f78d4 Merge "Remove toolbox prlimit." 2016-03-07 22:49:21 +00:00
Elliott Hughes 15ca17cabc Remove toolbox prlimit. 
Use /system/bin/ulimit -p instead.

Change-Id: I4f2e2f2f2ac98de9ce57a7def3636669ea0034fe
 2016-03-07 14:02:32 -08:00
Yabin Cui 564c710f9a libziparchive: port unit tests to darwin and windows. 
am: b2a770042e

* commit 'b2a770042ebfd44989c2853689e5f45eee4a3ad9':
  libziparchive: port unit tests to darwin and windows.
 2016-03-07 19:56:32 +00:00
Yabin Cui b2a770042e libziparchive: port unit tests to darwin and windows. 
Also use ReadFully to replace read, because read can
return reading bytes less than requested. And use
WriteFully to replace write.

Bug: 26962895
Change-Id: Iff0b2bc6d925619a537f7fef682c2a7ad89a2dc2
(cherry picked from commit 8e6f722764)
 2016-03-07 11:21:24 -08:00
Alex Deymo b53af52d0e Merge "Add /postinstall partition when using the A/B updater." into nyc-dev 
am: d2e6c59b5b

* commit 'd2e6c59b5bc23886c9f48fa660831f063afc39ff':
  Add /postinstall partition when using the A/B updater.
 2016-03-07 19:17:16 +00:00
Alex Deymo d2e6c59b5b Merge "Add /postinstall partition when using the A/B updater." into nyc-dev 2016-03-07 19:03:39 +00:00
Paul Lawrence bdd5908766 Merge "Distinguish between unencrypted and unencryptable" into nyc-dev 
am: 72d2e06f4e

* commit '72d2e06f4e10d0d11526eb9bb09a3ef23302729c':
  Distinguish between unencrypted and unencryptable
 2016-03-07 16:56:51 +00:00
Sami Tolvanen 3edc43234a mkbootimg: add version and patch level 
Adds operating system version and security patch level to the boot
image header. This change takes over two existing unused fields to
preserve compatibility with existing devices.

Bug: 27498078
Bug: 22914603
Change-Id: I57682611e0c27fec5ed284da7d9a788383ff98b1
 2016-03-07 08:56:01 -08:00
Paul Lawrence 72d2e06f4e Merge "Distinguish between unencrypted and unencryptable" into nyc-dev 2016-03-07 16:48:47 +00:00
Colin Cross 11185af983 Add ABI to leak report 
Add the ABI to the leak report so that it can be piped through
development/scripts/stack.

Bug: 27208635
Change-Id: I2e050a377305d48d2f904f34ea921f64e13dd00e
 2016-03-04 22:40:34 -08:00
Colin Cross 7a22e81c20 Combine leaks with same stacktrace 
Combine similar leaks (those with identical stack traces) into a single
leak report, and sort the resulting leaks by total leak size across all
similar leaks and their references.

Bug: 27208635
Change-Id: Ia2bf2ccf3fcbc110d1c7ba60e3b77348d1c63d8d
 2016-03-04 22:40:34 -08:00
Josh Gao 32b9aa0e67 adbd: fix spurious close of uninitialized fd. 
am: 8238dd8499

* commit '8238dd84992988ecbaa8b8e2b5691d2cf2391e35':
  adbd: fix spurious close of uninitialized fd.
 2016-03-05 03:23:27 +00:00
Josh Gao b87ecdcc6c adb: wait for restore to complete before returning. 
am: 5767d0dd5a

* commit '5767d0dd5ae44978b7a80ba08de32fe51822cbb4':
  adb: wait for restore to complete before returning.
 2016-03-05 03:23:18 +00:00
Josh Gao 05aebbe5a3 adb: wait for adbd to die and respawn in root/unroot. 
am: 06c73ae942

* commit '06c73ae94214cc72b82d4c686bd490c21f61257a':
  adb: wait for adbd to die and respawn in root/unroot.
 2016-03-05 03:23:03 +00:00
Josh Gao d6d7dbcbfc adb: make ScopedFd universally accessible and useful. 
am: a9eb38d6a5

* commit 'a9eb38d6a539e2e994ddd14c1e5d1d8ff157d0c9':
  adb: make ScopedFd universally accessible and useful.
 2016-03-05 03:22:47 +00:00
Josh Gao 8238dd8499 adbd: fix spurious close of uninitialized fd. 
forkpty only returns an fd on the master side; trying to keep track of
it on both sides is incorrect.

Bug: http://b/27504427
Change-Id: Ia4a454d8490c77738f9c3350a4236b3d99c8758b
(cherry picked from commit fcb063ce37)
 2016-03-04 19:15:11 -08:00
Josh Gao 5767d0dd5a adb: wait for restore to complete before returning. 
If we return before waiting for the other side to finish, it'll get sent
SIGHUP.

Bug: http://b/27414382
Change-Id: I93514d2242ed0d7aa93a6ec6836270dc0783506d
(cherry picked from commit d26abed750)
 2016-03-04 19:15:11 -08:00
Josh Gao 06c73ae942 adb: wait for adbd to die and respawn in root/unroot. 
Bug: http://b/19749057
Change-Id: I57dbc113803b6fd3016c1801410be0f4023245d9
(cherry picked from commit d26212207d)
 2016-03-04 19:15:11 -08:00
Josh Gao a9eb38d6a5 adb: make ScopedFd universally accessible and useful. 
Change-Id: I707ffbd10958e7449b4c95dff48638480c746939
(cherry picked from commit f0d3b4fc11)
 2016-03-04 19:15:11 -08:00
Josh Gao 3bb90a6acd Merge changes I93514d22,I57dbc113,I707ffbd1 am: 1cd680ce75 
am: 6aafa03c60

* commit '6aafa03c606d06a5cb6549c1cc382a2038552256':
  adb: wait for restore to complete before returning.
  adb: wait for adbd to die and respawn in root/unroot.
  adb: make ScopedFd universally accessible and useful.
 2016-03-05 03:10:45 +00:00
Josh Gao f5b960538f Merge "adbd: fix spurious close of uninitialized fd." am: 3c608c7425 
am: 97b9935fba

* commit '97b9935fba43cfa892ef4ae2792a68c276b6f128':
  adbd: fix spurious close of uninitialized fd.
 2016-03-05 03:10:35 +00:00
Josh Gao 6aafa03c60 Merge changes I93514d22,I57dbc113,I707ffbd1 
am: 1cd680ce75

* commit '1cd680ce759effd33602de82197790fb027c1721':
  adb: wait for restore to complete before returning.
  adb: wait for adbd to die and respawn in root/unroot.
  adb: make ScopedFd universally accessible and useful.
 2016-03-05 03:08:43 +00:00
Josh Gao 97b9935fba Merge "adbd: fix spurious close of uninitialized fd." 
am: 3c608c7425

* commit '3c608c7425f9201c7e673d2f47bb4e1ffe93d216':
  adbd: fix spurious close of uninitialized fd.
 2016-03-05 03:08:34 +00:00
Josh Gao 1cd680ce75 Merge changes I93514d22,I57dbc113,I707ffbd1 
* changes:
  adb: wait for restore to complete before returning.
  adb: wait for adbd to die and respawn in root/unroot.
  adb: make ScopedFd universally accessible and useful.
 2016-03-05 03:04:47 +00:00
Josh Gao 3c608c7425 Merge "adbd: fix spurious close of uninitialized fd." 2016-03-05 03:04:37 +00:00
Josh Gao fcb063ce37 adbd: fix spurious close of uninitialized fd. 
forkpty only returns an fd on the master side; trying to keep track of
it on both sides is incorrect.

Bug: http://b/27504427
Change-Id: Ia4a454d8490c77738f9c3350a4236b3d99c8758b
 2016-03-04 18:08:18 -08:00
James Hawkins 7763bcb1b8 bootstat: Gate boot time metrics logging on an encrypted device being decrypted. 
This prevents double-counting boot metrics for encrypted devices.

Bug: 27454346
Change-Id: If63dd421e4f91a01b43d730d59896544a26d138a
(cherry picked from commit 5e655f02c5)
 2016-03-04 17:55:43 -08:00
James Hawkins e501044c46 bootstat: Don't log time_since_factory_reset on device reset. 
The zero value is meaningless and skews the histogram buckets.

Bug: 27477664
Change-Id: Idd641aa3005819905a2ecf664d2a5781dbbff59b
(cherry picked from commit 3bf9b147f2)
 2016-03-04 17:53:57 -08:00