Commit Graph

22239 Commits

Author SHA1 Message Date
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
Mihai Serban afebc25bdd init-debug.rc: mount debugfs
Enable debugfs on non "user" builds.

BUG=27520850
Change-Id: I2bcc72b686d0477b553c0605adfd4c023e72cbfb
Signed-off-by: Mihai Serban <mihai.serban@intel.com>
2016-03-07 16:56:06 +02: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
Colin Cross 4c5bccdd86 Fix allocator::map template argument ordering
allocator::map reversed Key and T from std::map

Bug: 27208635
Change-Id: I4e4db704539d01b060cb948aa573cb674da48c7d
2016-03-04 16:40:02 -08:00
Colin Cross 8e8f34c558 Fold leaks that are referenced by other leaks
Find leaks that have no references at all, or are only referenced by
other leaks in the same strongly connected component, and hide all
referenced leaks.

Bug: 27208635
Change-Id: Ifbfd14e24e2ba0f8af7c1b887e57f34362720f2d
2016-03-04 16:39:59 -08:00
Colin Cross b8e20f557f Compile some tests for the host
Compile some tests for the host to ease debugging with valgrind or gdb.

Bug: 27208635
Change-Id: Ib46fcfa333ceb721f26efca00b2fa60b9fba44e6
2016-03-04 16:39:51 -08:00
Chih-Hung Hsieh e5497e14a5 Merge "Make CHECK(x) work with static analyzer." am: d02e6887ca
am: d0b09603dd

* commit 'd0b09603dd720ce9b93e33c073cae6fbf970d7ee':
  Make CHECK(x) work with static analyzer.
2016-03-05 00:26:27 +00:00
Chih-Hung Hsieh d0b09603dd Merge "Make CHECK(x) work with static analyzer."
am: d02e6887ca

* commit 'd02e6887cacdd3fee17f391f2a77a8310bef4204':
  Make CHECK(x) work with static analyzer.
2016-03-05 00:24:24 +00:00
Chih-hung Hsieh d02e6887ca Merge "Make CHECK(x) work with static analyzer." 2016-03-05 00:21:07 +00:00
Paul Lawrence 1098aacde4 Distinguish between unencrypted and unencryptable
Set ro.crypto.state flag to unencrypted and unsupported accordingly

Bug: 18002358
Change-Id: I1f88ce9704c5505d7b63256e2ebe5f8441c79ad0
2016-03-04 15:52:33 -08:00
Josh Gao d26abed750 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
2016-03-04 15:51:03 -08:00
Josh Gao d26212207d adb: wait for adbd to die and respawn in root/unroot.
Bug: http://b/19749057
Change-Id: I57dbc113803b6fd3016c1801410be0f4023245d9
2016-03-04 15:48:39 -08:00
Alex Deymo e120b471ac Add /postinstall partition when using the A/B updater.
The new top level directory /postinstall is used by the A/B updater to
mount the new partition and run a post-install program before rebooting
into that new system.

init.rc was extended to label this new directory since the initrd has
no extended attributes.

Bug: 27177071
TEST=`ls -laZ /` shows the /postinstall directory on edison-eng

(cherry picked from commit bb968fb04d)

Change-Id: Iff993135c7ce3a1a0f6450892ef7382da408fd5e
2016-03-04 15:45:52 -08:00
Dimitry Ivanov 014ea8b00f Handle the case when libart.so is not in use
am: 5f28b8460d

* commit '5f28b8460d9e53c5ccbe154ec244c9ae56b4a97c':
  Handle the case when libart.so is not in use
2016-03-04 23:29:21 +00:00
Josh Gao f0d3b4fc11 adb: make ScopedFd universally accessible and useful.
Change-Id: I707ffbd10958e7449b4c95dff48638480c746939
2016-03-04 15:15:56 -08:00
Dimitry Ivanov 5f28b8460d Handle the case when libart.so is not in use
In the case when libartd.so is used libart.so does not have
to be included in the public namespace.

Bug: http://b/27496326
Change-Id: I464bafec1d9da5c3f3f03fef02af3f34bf377297
2016-03-04 15:02:16 -08:00
Chih-Hung Hsieh 081cbeda03 Merge "Use unique_ptr to free objects when ASSERT* fail." am: 93aedcaf2b
am: 0ece9f4ccd

* commit '0ece9f4ccd3093193ebce9d5ca25c7ad097cafe9':
  Use unique_ptr to free objects when ASSERT* fail.
2016-03-04 20:34:41 +00:00
Chih-Hung Hsieh 0ece9f4ccd Merge "Use unique_ptr to free objects when ASSERT* fail."
am: 93aedcaf2b

* commit '93aedcaf2b3c06aa63ee8daad603d8d7b21f6731':
  Use unique_ptr to free objects when ASSERT* fail.
2016-03-04 20:32:40 +00:00
Chih-hung Hsieh 93aedcaf2b Merge "Use unique_ptr to free objects when ASSERT* fail." 2016-03-04 20:27:28 +00:00
James Hawkins 9b419af6fa Merge "bootstat: Gate boot time metrics logging on an encrypted device being decrypted." am: c67ef7820f
am: 4f26603dd5

* commit '4f26603dd57c26faff6f258ac8348cb8b0d4e4df':
  bootstat: Gate boot time metrics logging on an encrypted device being decrypted.
2016-03-04 19:38:32 +00:00
James Hawkins 4f26603dd5 Merge "bootstat: Gate boot time metrics logging on an encrypted device being decrypted."
am: c67ef7820f

* commit 'c67ef7820f7375bdbdf4398abf82e4019543eef9':
  bootstat: Gate boot time metrics logging on an encrypted device being decrypted.
2016-03-04 19:36:01 +00:00