Commit graph

22685 commits

Author SHA1 Message Date
Daniel Rosenberg
790a7793bf Merge "Add nofail fstab option" am: e992831
am: c375b37  -s ours

* commit 'c375b37c3a130c78dc9b7a467398d561faf10c50':
  Add nofail fstab option

Change-Id: I22fbaf70d411a71abddda93bf83b078a45615eaf
2016-04-14 00:48:01 +00:00
Daniel Rosenberg
c375b37c3a Merge "Add nofail fstab option"
am: e992831

* commit 'e99283103bbd06a2b8a40971ed161d9d0518f79e':
  Add nofail fstab option

Change-Id: Iada8393491847037b33e7de4ac5ccf3b7e9eba6f
2016-04-14 00:21:23 +00:00
Daniel Rosenberg
e99283103b Merge "Add nofail fstab option" 2016-04-14 00:12:44 +00:00
Josh Gao
ee85c8dbaa adb: after adb root, wait for the device in any state.
am: 9ea7795

* commit '9ea7795d38e92d8d01135fdfe7e9a0b74a65e5c8':
  adb: after `adb root`, wait for the device in any state.

Change-Id: I0adaa15e7c055e1d79e0dd65e3e3888d8f575444
2016-04-13 22:21:10 +00:00
Josh Gao
317471e03e adb: add support for \'wait-for-any\'.
am: 5863fb6

* commit '5863fb61e142ec8494443ba341e240f9fe86934b':
  adb: add support for 'wait-for-any'.

Change-Id: I31d2078c24e53adea9b2667b498c4c11db6a655a
2016-04-13 22:21:09 +00:00
Josh Gao
b7f359c4dd adb: make \'wait-for-{recovery,sideload,bootloader} work.
am: 3d8df3c  -s ours

* commit '3d8df3cb2a80676b35a0641c03e1164eb876883f':
  adb: make 'wait-for-{recovery,sideload,bootloader} work.

Change-Id: I3590cb9e8b3045fb298fd7a8f434d9175dde4989
2016-04-13 22:21:09 +00:00
Mark Salyzyn
e81eab9f0c Merge changes I7ebb6146,I0b42736c,I5331acde am: df7c1ed
am: 453139a

* commit '453139a2a00d1e81919539ea32cd7a897182b973':
  logcat: expand -n, -r and -b
  logcat: allow comma-separate list of buffers
  logcat: Adjust help to make it more meaningful

Change-Id: I0b4c2b76f17ed4d6497df6357b7cd4728a5d3b40
2016-04-13 21:48:58 +00:00
Mark Salyzyn
453139a2a0 Merge changes I7ebb6146,I0b42736c,I5331acde
am: df7c1ed

* commit 'df7c1ed3a06c60d77865ff8d71b2f30ca94693a7':
  logcat: expand -n, -r and -b
  logcat: allow comma-separate list of buffers
  logcat: Adjust help to make it more meaningful

Change-Id: I2341e07713e14e1e449bf41a194e306526246959
2016-04-13 21:45:32 +00:00
Mark Salyzyn
df7c1ed3a0 Merge changes I7ebb6146,I0b42736c,I5331acde
* changes:
  logcat: expand -n, -r and -b
  logcat: allow comma-separate list of buffers
  logcat: Adjust help to make it more meaningful
2016-04-13 21:32:48 +00:00
Treehugger Robot
1c8bf422d9 Merge changes Ibc8038b1,I1876ecd7,I57d70f8b am: 3e0eaa4
am: c35de74

* commit 'c35de74b2b9d017a74ca3da99f8c23aad033f0f5':
  adb: after `adb root`, wait for the device in any state.
  adb: add support for 'wait-for-any'.
  adb: make 'wait-for-{recovery,sideload,bootloader} work.

Change-Id: I153b8e88cea2b2e6d5916145bf1e1145c4721b14
2016-04-13 20:38:30 +00:00
Josh Gao
c35de74b2b Merge changes Ibc8038b1,I1876ecd7,I57d70f8b
am: 3e0eaa4

* commit '3e0eaa4103f4497463dd8b5daa1ee7ffe3921211':
  adb: after `adb root`, wait for the device in any state.
  adb: add support for 'wait-for-any'.
  adb: make 'wait-for-{recovery,sideload,bootloader} work.

Change-Id: Ib54818926966cf01839b98a5ef772c3a3900fd38
2016-04-13 20:34:08 +00:00
Treehugger Robot
3e0eaa4103 Merge changes Ibc8038b1,I1876ecd7,I57d70f8b
* changes:
  adb: after `adb root`, wait for the device in any state.
  adb: add support for 'wait-for-any'.
  adb: make 'wait-for-{recovery,sideload,bootloader} work.
2016-04-13 20:25:53 +00:00
Josh Gao
9ea7795d38 adb: after adb root, wait for the device in any state.
Otherwise, `adb root` while the device is in recovery will hang.

Bug: http://b/28168212
Change-Id: Ibc8038b1745139fb505e466c74c605b9df474c8c
(cherry picked from commit 48a348183f)
2016-04-13 13:13:20 -07:00
Josh Gao
5863fb61e1 adb: add support for 'wait-for-any'.
Allow waiting for a device in any state.

Bug: http://b/28168212
Change-Id: I1876ecd70089ca88f2da5de4182e13724ec50501
(cherry picked from commit 86441c31fe)
2016-04-13 13:13:17 -07:00
Josh Gao
3d8df3cb2a adb: make 'wait-for-{recovery,sideload,bootloader} work.
The help for wait-for-* documents this as working, but we only had a
special case for 'wait-for-device'. Make the others work as well.

Bug: http://b/28170823
Change-Id: I57d70f8b9a383947c4f761919bfbd8515a013520
(cherry picked from commit 08881e72f4)
2016-04-13 13:13:14 -07:00
Josh Gao
48a348183f adb: after adb root, wait for the device in any state.
Otherwise, `adb root` while the device is in recovery will hang.

Bug: http://b/28168212
Change-Id: Ibc8038b1745139fb505e466c74c605b9df474c8c
2016-04-13 12:28:04 -07:00
Josh Gao
86441c31fe adb: add support for 'wait-for-any'.
Allow waiting for a device in any state.

Bug: http://b/28168212
Change-Id: I1876ecd70089ca88f2da5de4182e13724ec50501
2016-04-13 12:28:04 -07:00
Josh Gao
08881e72f4 adb: make 'wait-for-{recovery,sideload,bootloader} work.
The help for wait-for-* documents this as working, but we only had a
special case for 'wait-for-device'. Make the others work as well.

Bug: http://b/28170823
Change-Id: I57d70f8b9a383947c4f761919bfbd8515a013520
2016-04-13 12:28:04 -07:00
Mark Salyzyn
33c262513f logcat: expand -n, -r and -b
- Add property expansion to the -n/--rotate-count,
  -r/--rotate-kbytes and -b/--buffer parameters.
  e.g. -r '${logcat.rotate-count:-6}' will expand the property
  logcat.rotate-count, and if not present will default to 6
- Add gtest to confirm mid-stream expansion
- No longer support ",:;<whitespace>" for buffer tokenization,
  settling on only supporting ",".

Bug: 28120456
Change-Id: I7ebb6146f72047631536c457952fa50d0abb98ab
2016-04-13 11:43:03 -07:00
Mark Salyzyn
4517773296 logcat: allow comma-separate list of buffers
- Add parsing to support comma+ separated list of buffers.
- Move get_size test into a standalone get_groups function
- add some additional tests for this feature, leveraging
  get_groups to confirm buffer selection.

Bug: 28120456
Change-Id: I0b42736c08cf4b2a435cb74cda540dc163a26bd1
2016-04-13 11:42:57 -07:00
Mark Salyzyn
378f4745a2 logcat: Adjust help to make it more meaningful
It is not clear about the long option aliases, list
them comma separate first for clarity. Squash lines
of help content if possible. Lock to 3 indents, one
for options, another for text on same line as options
and another for next line or continuation.

Bug: 28120456
Change-Id: I5331acde3ac0fd3b87f6699ba108f6cef46a1563
2016-04-13 11:42:52 -07:00
Daniel Rosenberg
2a9dc6581f Merge "Fix overflow in path building" into nyc-dev
am: c414027

* commit 'c414027e927fa025877afd53b27886b6c3b19cfd':
  Fix overflow in path building

Change-Id: I6e2692539738d81055cc49a183a34261074e5e68
2016-04-13 18:39:06 +00:00
Felipe Leme
1e0161e934 Merge "Implements \'adb bugreport <ZIP_FILE>\'." into nyc-dev
am: e04c9f3

* commit 'e04c9f34364d76ad0f3580f566ea710285426c83':
  Implements 'adb bugreport <ZIP_FILE>'.

Change-Id: I7c5112d8e804394c705bee3e4cae227f5da68702
2016-04-13 18:39:06 +00:00
Daniel Rosenberg
c414027e92 Merge "Fix overflow in path building" into nyc-dev 2016-04-13 18:36:39 +00:00
TreeHugger Robot
e04c9f3436 Merge "Implements 'adb bugreport <ZIP_FILE>'." into nyc-dev 2016-04-13 18:28:19 +00:00
Treehugger Robot
c46329fc8d Merge "Remove undocumented functionality from init." am: 4888d79
am: c0a21af

* commit 'c0a21af7ceb03ffd3fca3229475e85ff6868fb28':
  Remove undocumented functionality from init.

Change-Id: Iec1988c758a6036f428dac4f74940f9a02e07ba2
2016-04-13 16:39:08 +00:00
Felipe Leme
44a42677cf Implements 'adb bugreport <ZIP_FILE>'.
Dumpstate now supports zipped bugreport, whose output is more complete
than the flat-file bugreports provided prior to N. As such, adb now has
a 'adb bugreport <ZIP_FILE>' name whose implementation:

- Calls the new bugreportz binary.
- Parses its output, which in case of success is the path of the .zip
  file.
- Pulls the device file and renames it according to the command-line
  argument.

BUG: 27653204

Change-Id: I7169fe157c77bbef1684d0cb4e43095d95ddf2b8
2016-04-13 09:21:23 -07:00
Elliott Hughes
c0a21af7ce Merge "Remove undocumented functionality from init."
am: 4888d79

* commit '4888d79a945ff62b933f500317ed049031f77551':
  Remove undocumented functionality from init.

Change-Id: If664570c994a4cfcfe851c56247cabcf3f07cb51
2016-04-13 15:53:35 +00:00
Treehugger Robot
4888d79a94 Merge "Remove undocumented functionality from init." 2016-04-13 15:43:03 +00:00
Elliott Hughes
bdeac39a42 Remove undocumented functionality from init.
(cherry-pick of a3cc6026301db08285028c760af2665a66b3cc44.)

Bug: http://b/28151340
Change-Id: I5360502c79d9113a13055bf017b39c099033e947
2016-04-13 07:56:51 -07:00
Elliott Hughes
8bcb7caf0e Merge "Remove undocumented functionality from init." into nyc-dev
am: 27fe8c9

* commit '27fe8c904b0e63b047ac90380b6b2433fcec930d':
  Remove undocumented functionality from init.

Change-Id: I3893df1ca5d16e72368f8990baea2395781af24d
2016-04-13 14:51:01 +00:00
Elliott Hughes
27fe8c904b Merge "Remove undocumented functionality from init." into nyc-dev 2016-04-13 14:45:56 +00:00
Nick Kralevich
bcf98cfcd4 init.rc: Restore the /mnt/sdcard symlink
am: d2f0a2c

* commit 'd2f0a2c0653e332b906875077b9048e64b929d94':
  init.rc: Restore the /mnt/sdcard symlink

Change-Id: Icd4eea67bdf9ea416f1e15ec9f1666e74e85b3eb
2016-04-13 14:33:52 +00:00
Nick Kralevich
d2f0a2c065 init.rc: Restore the /mnt/sdcard symlink
"You are in a maze of twisty little symlinks, all alike."

Restore the /mnt/sdcard symlink, for compatibility with older Android
apps. This symlink was suppose to have been removed in the Gingerbread
time frame, but lives on.

Note: The /mnt/sdcard symlink was originally created in device specific
*.rc files in the device/vendor/hardware/* directory. This change moves
the creation of the symlink into the common init.rc file.

Bug: 25801877
Bug: 28108983
Change-Id: I2f9bf71bddffadb587d7376dfdfc8a546c84ec28
2016-04-12 20:36:01 -07:00
Daniel Rosenberg
db4638ee30 Fix overflow in path building
An incorrect size was causing an unsigned value
to wrap, causing it to write past the end of
the buffer.

Bug: 28085658
Change-Id: Ie9625c729cca024d514ba2880ff97209d435a165
2016-04-12 16:38:41 -07:00
Elliott Hughes
9c4a0e0216 Merge changes from topic \'boringssl_conversion\' am: 52eb93c
am: 0781351

* commit '07813516502d12cfeabef94838e916c0cf4f3b46':
  Switch fs_mgr and adb to libcrypto_utils.
  Add libcrypto_utils.

Change-Id: Ib50abd66d546a2b2c7a1249043e1b39c2147c674
2016-04-12 23:22:11 +00:00
Treehugger Robot
ac8bcae4f7 Merge "logcat: apct test failures" am: 90c2e75
am: ab2075a

* commit 'ab2075a9d3717c60df63aed00d1b605aad884a64':
  logcat: apct test failures

Change-Id: I3caf1cd746ec7a43918a7028d836ba05ec7275ee
2016-04-12 23:22:10 +00:00
Mattias Nissler
0781351650 Merge changes from topic \'boringssl_conversion\'
am: 52eb93c

* commit '52eb93ca57fa2f93be7e762392abb93c0b4c9210':
  Switch fs_mgr and adb to libcrypto_utils.
  Add libcrypto_utils.

Change-Id: I5c3af35b4b20cc50ca6a97889d811194267711b7
2016-04-12 23:19:21 +00:00
Mark Salyzyn
ab2075a9d3 Merge "logcat: apct test failures"
am: 90c2e75

* commit '90c2e75db9093ae7c6fa6ef117ab795755b8b2ea':
  logcat: apct test failures

Change-Id: Ib64d056b04db734cf404bfb9ce4211a777ed3941
2016-04-12 23:19:21 +00:00
Elliott Hughes
52eb93ca57 Merge changes from topic 'boringssl_conversion'
* changes:
  Switch fs_mgr and adb to libcrypto_utils.
  Add libcrypto_utils.
2016-04-12 23:12:35 +00:00
Treehugger Robot
90c2e75db9 Merge "logcat: apct test failures" 2016-04-12 23:11:56 +00:00
Mattias Nissler
097b6bbc76 Switch fs_mgr and adb to libcrypto_utils.
Update code and dependencies to use BoringSSL + libcrypto_utils
instead of mincrypt.

Change-Id: Ic75164bd50c84b81b6310e27a67d4b3c174984f9
2016-04-12 23:04:11 +00:00
Daniel Rosenberg
dde4e5a071 resolve merge conflicts of 2857bd1 to nyc-dev
am: e3a3288

* commit 'e3a3288dddcde8c180dfe2935335ca3c475e37a2':
  Add nofail fstab option

Change-Id: I42d1d4862f9f630999f2479b9a9b9e14431fe8bf
2016-04-12 22:46:28 +00:00
Elliott Hughes
a3cc602630 Remove undocumented functionality from init.
Bug: http://b/28151340
Change-Id: I5360502c79d9113a13055bf017b39c099033e947
2016-04-12 15:38:51 -07:00
Mark Salyzyn
3842b1a5f6 logcat: apct test failures
Bug: 27241615
Change-Id: I100a5071c059fe9fa85bbdc33db552b16d7bdf60
2016-04-12 22:36:04 +00:00
Treehugger Robot
85dd9157e1 Merge "binderwrapper: Resolve ambiguous base::Closure reference" am: 979ce0e
am: b0144b5

* commit 'b0144b5b999148de06b091383b40e5f6d12cd977':
  binderwrapper: Resolve ambiguous base::Closure reference

Change-Id: Icea03c86507cc5a4f333ee3644465fbc92a8521c
2016-04-12 22:15:20 +00:00
Christopher Wiley
b0144b5b99 Merge "binderwrapper: Resolve ambiguous base::Closure reference"
am: 979ce0e

* commit '979ce0e33827a9c5bb2b76b2e2557544f8eb0cce':
  binderwrapper: Resolve ambiguous base::Closure reference

Change-Id: Iad3fbac9a0636e2ded698557c871ba00cf428276
2016-04-12 22:12:28 +00:00
Mattias Nissler
b62146dcab Add libcrypto_utils.
This provides a tiny library implementing encode/decode functionality
for Android's custom RSA public key binary format. Keys are encoded
from and decoded to BoringSSL RSA key objects.

Change-Id: I55e5522d557e0e9f35927a87b6581f020ee34e7a
2016-04-12 15:08:01 -07:00
Treehugger Robot
979ce0e338 Merge "binderwrapper: Resolve ambiguous base::Closure reference" 2016-04-12 21:48:45 +00:00
Daniel Rosenberg
e3a3288ddd resolve merge conflicts of 2857bd1 to nyc-dev
Change-Id: I3dc666cd44deb3e8438c2a482328f79e7a67e81e
2016-04-12 14:28:09 -07:00