Commit graph

19973 commits

Author SHA1 Message Date
Colin Cross
0bc37ffbc6 Merge changes Ie9594b6e,I2e050a37,Ia2bf2ccf,I4e4db704,Ifbfd14e2, ...
* changes:
  Fix mac build
  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-08 22:26:39 +00:00
Colin Cross
33e601ac30 Fix mac build
Disable memunreachable_test for mac.

Change-Id: Ie9594b6e5dfc661c4d709b419dbcb7b610434a84
(cherry picked from commit e33686b7ca)
2016-03-08 14:25:23 -08:00
Christopher Ferris
4006add727 Merge "Don\'t fail if the new pss is less than stable."
am: 26cf352637

* commit '26cf352637fd82623218cde318b4a6799d941fca':
  Don't fail if the new pss is less than stable.
2016-03-08 18:20:03 +00:00
Christopher Ferris
26cf352637 Merge "Don't fail if the new pss is less than stable." 2016-03-08 18:09:18 +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
Stephen Hines
19c30e9516 Update BacktraceOffline for LLVM rebase to r256229.
Bug: http://b/26987366
Change-Id: I3c5f3349a669c04bb40dd7175f840b57dc46f7f6
2016-03-08 01:23:43 -08: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
George Burgess IV
2c5b89a64a Merge "Cleanup uses of sprintf so we can deprecate it." 2016-03-08 04:14:06 +00:00
Christopher Ferris
5ccdfa6349 Don't fail if the new pss is less than stable.
Sometimes, the new pss is significantly less than the stable pss. Do
not fail if this case occurs.

Change-Id: Ic7da87275a821818e375d05cac10e84c62710c5e
2016-03-07 19:18:31 -08: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
0f10562b56 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
(cherry picked from commit 11185af983)
2016-03-07 15:52:39 -08:00
Colin Cross
c1228c7f2b 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
(cherry picked from commit 7a22e81c20)
2016-03-07 15:52:39 -08:00
Colin Cross
e4cbe0ec9a Fix allocator::map template argument ordering
allocator::map reversed Key and T from std::map

Bug: 27208635
Change-Id: I4e4db704539d01b060cb948aa573cb674da48c7d
(cherry picked from commit 4c5bccdd86)
2016-03-07 15:52:39 -08:00
Colin Cross
d6b3a2a0a3 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
(cherry picked from commit 8e8f34c558)
2016-03-07 15:52:39 -08:00
Colin Cross
54a1610404 Compile some tests for the host
Compile some tests for the host to ease debugging with valgrind or gdb.

Bug: 27208635
Change-Id: Ib46fcfa333ceb721f26efca00b2fa60b9fba44e6
(cherry picked from commit b8e20f557f)
2016-03-07 15:52:39 -08: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
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
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
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
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
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
Josh Gao
f0d3b4fc11 adb: make ScopedFd universally accessible and useful.
Change-Id: I707ffbd10958e7449b4c95dff48638480c746939
2016-03-04 15:15:56 -08: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
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
James Hawkins
c67ef7820f Merge "bootstat: Gate boot time metrics logging on an encrypted device being decrypted." 2016-03-04 19:30:56 +00:00
Chih-Hung Hsieh
f60cbb7245 Use unique_ptr to free objects when ASSERT* fail.
Now need c++14 and clang to compile std::make_unique.

BUG: 27479198
Change-Id: Ib0f2279de85c6259330d5436257f6b978420601a
2016-03-04 11:30:50 -08:00
James Hawkins
15c0bf2a37 Merge "bootstat: Don\'t log time_since_factory_reset on device reset."
am: f26207197e

* commit 'f26207197eb8f6867eb192613d3a524db5a7f16a':
  bootstat: Don't log time_since_factory_reset on device reset.
2016-03-04 19:00:24 +00:00
James Hawkins
f26207197e Merge "bootstat: Don't log time_since_factory_reset on device reset." 2016-03-04 18:54:39 +00:00
Alex Deymo
e2ad3cfae4 Merge "Add /postinstall partition when using the A/B updater."
am: 700b15dacf

* commit '700b15dacfa42bcc5c4d768b92530e9f20f0211b':
  Add /postinstall partition when using the A/B updater.
2016-03-04 08:01:40 +00:00
Alex Deymo
700b15dacf Merge "Add /postinstall partition when using the A/B updater." 2016-03-04 07:58:52 +00:00
Josh Gao
55592371dc Merge changes I7fe77245,I75b089b8,Iafa250ce
am: afa76a3028

* commit 'afa76a302803fb9f25478c177486c218d713bc19':
  adb: clean up quotes in test_device.py.
  adb: mkdir the correct directory name when pulling.
  adb: cleanup file skipping logic.
2016-03-03 23:44:12 +00:00
Josh Gao
afa76a3028 Merge changes I7fe77245,I75b089b8,Iafa250ce
* changes:
  adb: clean up quotes in test_device.py.
  adb: mkdir the correct directory name when pulling.
  adb: cleanup file skipping logic.
2016-03-03 23:39:05 +00:00
Josh Gao
255c5c8077 adb: clean up quotes in test_device.py.
Change-Id: I7fe7724578ad89a004665d1bbff0d5c02c34c35e
2016-03-03 14:53:52 -08:00
Josh Gao
89ec3a8d0f adb: mkdir the correct directory name when pulling.
The directory name should be based off of the local path, not the remote
path.

Change-Id: I75b089b8734e9dbf8e466b1e00ea18549fd101bb
2016-03-03 14:53:06 -08:00
James Hawkins
3bf9b147f2 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
2016-03-03 14:50:24 -08:00
James Hawkins
5e655f02c5 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
2016-03-03 14:40:29 -08:00
Josh Gao
a31ea55c55 adb: cleanup file skipping logic.
Bug: http://b/26355212
Change-Id: Iafa250ce6c5ea8da9f5f00125165e5b67ef1013f
2016-03-03 14:40:03 -08:00
Nick Kralevich
59c8d5e2bf Merge "Mount selinuxfs when other filesystems are mounted"
am: ad5dc479cd

* commit 'ad5dc479cd8333da389fab6d8e270bf6e7428151':
  Mount selinuxfs when other filesystems are mounted
2016-03-03 21:22:01 +00:00
Nick Kralevich
ad5dc479cd Merge "Mount selinuxfs when other filesystems are mounted" 2016-03-03 19:55:26 +00:00
Nick Kralevich
3d9e273359 Mount selinuxfs when other filesystems are mounted
Be consistent when mounting filesystems, and mount selinuxfs
at the same time other filesystems are mounted. In particular,
this ensures that a /sys/fs/selinux/null is available at early
boot, avoiding an unnecessary mknod call.

Change-Id: I01e6b3900f48b4cb3f12d8a928e1e95911524252
2016-03-03 11:26:24 -08:00