Commit Graph

22239 Commits

Author SHA1 Message Date
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 a48923246e Merge "bootstat: Don\'t log time_since_factory_reset on device reset." am: f26207197e
am: 15c0bf2a37

* commit '15c0bf2a374ee719a2d0f87bacdf0ab4bfdae92e':
  bootstat: Don't log time_since_factory_reset on device reset.
2016-03-04 19:02:50 +00: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 40345ef6b8 Merge "Add /postinstall partition when using the A/B updater." am: 700b15dacf
am: e2ad3cfae4

* commit 'e2ad3cfae4f9f9ddec2746c0c57cdb3dc1991a43':
  Add /postinstall partition when using the A/B updater.
2016-03-04 08:03:35 +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 48add4c97f adb: clean up quotes in test_device.py.
am: a996c2963a

* commit 'a996c2963a9c1fa9d2339e560c7d6dad2be4a2f8':
  adb: clean up quotes in test_device.py.
2016-03-04 00:15:06 +00:00
Josh Gao bf9a85be52 adb: mkdir the correct directory name when pulling.
am: 379612b128

* commit '379612b1283c7289fbf21e1105b8bec9b0fed7ae':
  adb: mkdir the correct directory name when pulling.
2016-03-04 00:14:56 +00:00
Josh Gao 72bcf68e02 adb: cleanup file skipping logic.
am: 48bc0d7853

* commit '48bc0d7853c34a174fa6c9ddd85c30a1b54b137d':
  adb: cleanup file skipping logic.
2016-03-04 00:14:47 +00:00
Josh Gao e412f953aa adb: symlinks to dirs count as dirs for pull destination.
am: 74e0fe73c0  -s ours

* commit '74e0fe73c02531e2aa3c4b9f72527bb7a1731158':
  adb: symlinks to dirs count as dirs for pull destination.
2016-03-04 00:14:38 +00:00
David Pursell 74c024fac7 adb: relax serial matching rules.
am: 802c54ebb7

* commit '802c54ebb79453256a8c7fd3c3cab88acc8a84e8':
  adb: relax serial matching rules.
2016-03-04 00:13:16 +00:00
Josh Gao 6fb9d3f1f1 adb: report progress for small files.
am: f22bc60fc9

* commit 'f22bc60fc9b16148cd82e2c23b22ca3f62b00d96':
  adb: report progress for small files.
2016-03-04 00:13:05 +00:00
Ying Wang dbeca185f1 Also archive adb.exe/fastboot.exe when building win_sdk.
am: f48503b4a0

* commit 'f48503b4a0b5075fa6919260d873887d14916f2d':
  Also archive adb.exe/fastboot.exe when building win_sdk.
2016-03-04 00:12:55 +00:00
Josh Gao 6993c7ec5a adb: fix directory creation logic.
am: a63b17f76c  -s ours

* commit 'a63b17f76c54d937c779848ae3f4212539f8873f':
  adb: fix directory creation logic.
2016-03-04 00:12:44 +00:00
Josh Gao 6f6df8a2b3 adb: fix mistaken use of PLOG.
am: d382d2bb51

* commit 'd382d2bb5176a21bf1265ff2f80fbeaf9bfdce63':
  adb: fix mistaken use of PLOG.
2016-03-03 23:57:36 +00:00
David Pursell bba351396f adb: use TCP keepalive.
am: a76e5f035e

* commit 'a76e5f035eeffeb53c6bf0e667fe13625d5ffbac':
  adb: use TCP keepalive.
2016-03-03 23:57:10 +00:00
Josh Gao a996c2963a adb: clean up quotes in test_device.py.
Change-Id: I7fe7724578ad89a004665d1bbff0d5c02c34c35e
(cherry picked from commit 255c5c8077)
2016-03-03 15:46:51 -08:00
Josh Gao 379612b128 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
(cherry picked from commit 89ec3a8d0f)
2016-03-03 15:46:51 -08:00
Josh Gao 48bc0d7853 adb: cleanup file skipping logic.
Bug: http://b/26355212
Change-Id: Iafa250ce6c5ea8da9f5f00125165e5b67ef1013f
(cherry picked from commit a31ea55c55)
2016-03-03 15:46:51 -08:00
Josh Gao 74e0fe73c0 adb: symlinks to dirs count as dirs for pull destination.
This matches scp's behavior when pulling a directory that collides
with a symlink to a directory.

Bug: http://b/27362811
Change-Id: I0936d1ad48f13e24cd382e8e8400cc752bac3b66
(cherry picked from commit 1e611a33d5)
2016-03-03 15:46:50 -08:00
David Pursell 802c54ebb7 adb: relax serial matching rules.
Currently targeting a device by serial requires matching the serial
number exactly. This CL relaxes the matching rules for local transports
to ignore protocol prefixes and make the port optional:
  [tcp:|udp:]<hostname>[:port]

The purpose of this is to allow a user to set ANDROID_SERIAL to
something like "tcp:100.100.100.100" and have it work for both fastboot
and adb (assuming the device comes up at 100.100.100.100 in both
modes).

This CL also adds some unit tests for the modified functions to make
sure they work as expected.

Bug: 27340240
Change-Id: I006e0c70c84331ab44d05d0a0f462d06592eb879
(cherry picked from commit 3f902aad5b)
2016-03-03 15:46:50 -08:00
Josh Gao f22bc60fc9 adb: report progress for small files.
Bug: http://b/27407725
Change-Id: I7515144402a487fb3d4d403e2f5f82423c1b5ed6
(cherry picked from commit 9fd2f77dcc)
2016-03-03 15:46:50 -08:00
Ying Wang f48503b4a0 Also archive adb.exe/fastboot.exe when building win_sdk.
On linux we archive both Linux and Windows binaries.

Bug: 27315911
Change-Id: I17d25cd1ea611a9c917f1e78b47f21a8959eea20
(cherry picked from commit 71edfc8b9a)
2016-03-03 15:46:50 -08:00
Josh Gao a63b17f76c adb: fix directory creation logic.
Previously, for `adb pull $remote $local`, we would do the equivalent of
mkdir -p on `dirname $local`. This patch changes the behavior to only
creating directories that are being pulled, like scp.

Bug: http://b/27362811
Change-Id: I79f975ee9f2d9bc9e8be6a7c4f2de6d7ae2d2d23
(cherry picked from commit 71728ca300)
2016-03-03 15:46:50 -08:00
Josh Gao d382d2bb51 adb: fix mistaken use of PLOG.
Change-Id: I60bfa3d8cf1572a877d6f0c9369d8f72f10e5aef
(cherry picked from commit 443a52c298)
2016-03-03 15:46:50 -08:00
Josh Gao 1f6ff07516 Merge changes I7fe77245,I75b089b8,Iafa250ce am: afa76a3028
am: 55592371dc

* commit '55592371dca3ccb25d516635b41bab73ed8b6059':
  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:45:58 +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
David Pursell a76e5f035e adb: use TCP keepalive.
Currently adb only realizes a TCP transport has gone away when it tries
to send a packet, which caused problems in particular for `adb reboot`
since no packets are sent, leading to the client hanging until Ctrl+C.

This CL turns on TCP keepalive packets to send 1 packet every second,
allowing up to 10 failures before disconnecting. Using built-in TCP
functionality turns out to be much cleaner in this case than trying to
implement our own keepalive packets at the application layer, and
should be more lightweight since it's all done in the TCP stack.

Bug: http://b/23093474

Change-Id: Ifb41cbb85b9752a9f394e1eed3c6ac4da47a4e4d
(cherry picked from commit bfd9503d1d)
2016-03-03 15:42:11 -08: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
Elliott Hughes 66e8024f9c Merge "Revert "Introduce unique_fd"" into nyc-dev
am: 263d140895

* commit '263d140895f0e61cda27301a21e4ce18651d4eb4':
  Revert "Introduce unique_fd"
2016-03-03 22:10:06 +00:00
Nick Kralevich 3ae908e906 Merge "Mount selinuxfs when other filesystems are mounted" am: ad5dc479cd
am: 59c8d5e2bf

* commit '59c8d5e2bf31aa5340a563e74af74ad1e11b3e13':
  Mount selinuxfs when other filesystems are mounted
2016-03-03 22:00:23 +00:00
Elliott Hughes 263d140895 Merge "Revert "Introduce unique_fd"" into nyc-dev 2016-03-03 21:47:14 +00: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
Elliott Hughes 468da57bb2 Revert "Introduce unique_fd"
This reverts commit 97b3e66d3e.

This cherrypick was actually obsolete. The file had already moved elsewhere.

Change-Id: Ia209f230b2f5d621ec890d901dea8e5fa135fc87
2016-03-03 19:03:34 +00:00
Dimitry Ivanov 323df6ae33 resolve merge conflicts of goog/stage-aosp-master to nyc-dev-plus-aosp
Change-Id: I4c8d1188f25d33deec3f9463b34c7d4489206602
2016-03-03 09:33:08 -08:00
Andreas Gampe 2cff76ac0c Revert "Do not do local unwinds through .oat or .dex maps."
am: a7a7369343

* commit 'a7a7369343a8762adfc5402425e3e922fbecaeab':
  Revert "Do not do local unwinds through .oat or .dex maps."
2016-03-03 17:25:50 +00:00
Dimitry Ivanov 6399d525a1 Merge "Fix locking of libnativeloader"
am: 17741bc85c

* commit '17741bc85c0570a4f01bf8c945db1cd1b117a19a':
  Fix locking of libnativeloader
2016-03-03 17:12:16 +00:00
Dimitry Ivanov f5a05ba30a Merge "Added function to explicitly initialize a namespace"
am: 82ae2c0958

* commit '82ae2c0958c5076b33172622114ad0c4f06fd256':
  Added function to explicitly initialize a namespace
2016-03-03 17:12:07 +00:00
Dimitry Ivanov 17741bc85c Merge "Fix locking of libnativeloader" 2016-03-03 17:05:45 +00:00
Dimitry Ivanov 82ae2c0958 Merge "Added function to explicitly initialize a namespace" 2016-03-03 17:05:16 +00:00
David Pursell 29f8993098 Merge "adb: relax serial matching rules." am: b4709c2cfd
am: a942881fdb

* commit 'a942881fdb8925373a8b8756301fa3a4d92cf174':
  adb: relax serial matching rules.
2016-03-03 16:57:44 +00:00