Commit graph

21521 commits

Author SHA1 Message Date
Samuel Tan
cf1649da00 Merge "libutils: add String8 and String16 std_string utility methods" am: fb0670d650
am: 941d48f0ee

* commit '941d48f0eeb98fac7c869beee22833ff659318bc':
  libutils: add String8 and String16 std_string utility methods
2016-02-19 04:49:17 +00:00
Samuel Tan
4b2e76966e Merge "libutils: remove whitespace from String8 files" am: e771e846a8
am: 450b9b7068

* commit '450b9b7068cac286ca442c404a90a8a8b57a79e8':
  libutils: remove whitespace from String8 files
2016-02-19 04:49:08 +00:00
Samuel Tan
941d48f0ee Merge "libutils: add String8 and String16 std_string utility methods"
am: fb0670d650

* commit 'fb0670d65056ea26a9c57f62c5265b3958c88eff':
  libutils: add String8 and String16 std_string utility methods
2016-02-19 03:23:34 +00:00
Samuel Tan
fb0670d650 Merge "libutils: add String8 and String16 std_string utility methods" 2016-02-19 03:18:31 +00:00
Samuel Tan
450b9b7068 Merge "libutils: remove whitespace from String8 files"
am: e771e846a8

* commit 'e771e846a815b70ad4dde169c636625ed0368bfa':
  libutils: remove whitespace from String8 files
2016-02-19 02:34:41 +00:00
Samuel Tan
e771e846a8 Merge "libutils: remove whitespace from String8 files" 2016-02-19 01:07:47 +00:00
Samuel Tan
9ac4e005b4 libutils: add String8 and String16 std_string utility methods
Add utility methods that convert String16 and String8 into
std::string.

Also, remove a repeated include of <utils/Unicode.h> in
String16.h, since it is not used in that header file,
and is already included in String16.cpp.

BUG: 27200800
Change-Id: I5238aeb70689499763060a99dff9950fbb7adb3e
TEST: libutils builds successfully.
2016-02-18 17:04:23 -08:00
Samuel Tan
95fd527065 libutils: remove whitespace from String8 files
Remove trailing whitespace from String8 header and
cpp files.

BUG: None
Change-Id: Ie77da3f0fbce9cdce20225ce1310cf62295179a4
2016-02-18 17:04:20 -08:00
Josh Gao
cc5b2c737b Merge "adb: fix clang-format for access modifier dedent." am: d5126ddf71
am: 728da79e9c

* commit '728da79e9c973f02c97847ed49b81d0d3018484f':
  adb: fix clang-format for access modifier dedent.
2016-02-18 23:44:15 +00:00
Josh Gao
728da79e9c Merge "adb: fix clang-format for access modifier dedent."
am: d5126ddf71

* commit 'd5126ddf7119461d1dbd549f832bfb944f109225':
  adb: fix clang-format for access modifier dedent.
2016-02-18 23:08:20 +00:00
Josh Gao
d5126ddf71 Merge "adb: fix clang-format for access modifier dedent." 2016-02-18 23:00:51 +00:00
Josh Gao
5da522ec45 adb: fix clang-format for access modifier dedent.
It was previously -1 (the default from Google style, since it uses 2
space indentation), instead of -2.

Change-Id: I1865505ce17a2cc13b85de58bda55c3b1dfcf08c
2016-02-18 14:52:07 -08:00
Dimitry Ivanov
cb77e15815 Limit libart.so visibility to apps targeting <= M
am: dab56737ca

* commit 'dab56737ca898d913c79c4ded76d78d8b3f5ffa3':
  Limit libart.so visibility to apps targeting <= M
2016-02-18 04:16:55 +00:00
Dimitry Ivanov
dab56737ca Limit libart.so visibility to apps targeting <= M
Add libart.so to the list of public libraries only for
apps targeting android M and below.

Bug: http://b/27210062
Bug: http://b/26436837
Change-Id: I1ed3b0335a343044a76273741ea8770dcce12ebe
2016-02-17 17:22:20 -08:00
Elliott Hughes
c80b038229 Merge "Remove logcat\'s false dependency on a libutils header file." am: d3289ac581
am: 71bb9c6a99

* commit '71bb9c6a99b46d01647b87f2d80209f3cc4ad9a3':
  Remove logcat's false dependency on a libutils header file.
2016-02-17 22:27:05 +00:00
Elliott Hughes
71bb9c6a99 Merge "Remove logcat\'s false dependency on a libutils header file."
am: d3289ac581

* commit 'd3289ac581816861721b81f7100794fad075c497':
  Remove logcat's false dependency on a libutils header file.
2016-02-17 22:18:41 +00:00
David Pursell
b818c74bc6 Merge changes Ib17f0a55,Ia5bbae6b,I339d42fc into nyc-dev
am: 7bbb4a0c49

* commit '7bbb4a0c49d22f19a19fae594706e73c06ad3b42':
  fastboot: fix TCP protocol version check.
  fastboot: add UDP protocol.
  fastboot: add Socket timeout detection.
2016-02-17 22:12:05 +00:00
Elliott Hughes
d3289ac581 Merge "Remove logcat's false dependency on a libutils header file." 2016-02-17 22:10:35 +00:00
David Pursell
7bbb4a0c49 Merge changes Ib17f0a55,Ia5bbae6b,I339d42fc into nyc-dev
* changes:
  fastboot: fix TCP protocol version check.
  fastboot: add UDP protocol.
  fastboot: add Socket timeout detection.
2016-02-17 22:02:19 +00:00
Todd Poynor
fecc5d6b51 Merge "healthd: Add "No UI" operation for charger mode" am: fdd26c961d
am: 6355bc8d5b

* commit '6355bc8d5b140d43557223c8969a05e0566d0117':
  healthd: Add "No UI" operation for charger mode
2016-02-17 21:48:53 +00:00
Todd Poynor
6355bc8d5b Merge "healthd: Add "No UI" operation for charger mode"
am: fdd26c961d

* commit 'fdd26c961d654df7ab068591a9fce7945719c90d':
  healthd: Add "No UI" operation for charger mode
2016-02-17 21:39:40 +00:00
Todd Poynor
fdd26c961d Merge "healthd: Add "No UI" operation for charger mode" 2016-02-17 21:36:36 +00:00
Todd Poynor
7c5a3e12a4 healthd: Add "No UI" operation for charger mode
Boards can opt to have charger mode be passive, with no screen UI or key
processing, the same as for recovery mode, via BOARD_CHARGER_NO_UI.  The
minui and associated libs and charging image files are not built into the
executable in this case.

Always select charger No UI operation for Brillo devices.

Bug: 27170356
Change-Id: Ibe71498743353b01ce5b6521e42ed94d75547547
2016-02-17 21:35:03 +00:00
Mark Salyzyn
2196d7bac4 Merge "fake_log_device: long lived allocations" am: 3fd5649424
am: c10b039d28

* commit 'c10b039d2812b7de939218b77a7552b6e643dcc7':
  fake_log_device: long lived allocations
2016-02-17 21:31:47 +00:00
David Pursell
022d8f5885 fastboot: fix TCP protocol version check.
Currently the TCP handshake fails if the device TCP protocol version
doesn't match the host exactly, but the protocol is supposed to allow
for forwards compatibility by accepting any protocol version >= itself.
That way the other side can potentially lower its protocol to match and
keep going.

This CL fixes the protocol version check and adds corresponding unit
tests.

Bug: http://b/27220700

(cherry picked from commit aad72a533f)

Change-Id: Ib17f0a55eb910105a27609bc94bf76a30442e92e
2016-02-17 13:22:40 -08:00
David Pursell
5a0ec81e97 fastboot: add UDP protocol.
Implements a UDP protocol for fastboot, documented in
fastboot_protocol.txt.

This version of the protocol does not include multi-packet windowing,
which will likely be needed to achieve reasonable speeds over WiFi.
Since we don't have any WiFi use cases yet, we'd like to get this in
now and update the protocol later if it becomes necessary.

Usage:
  fastboot -s udp:<hostname>[:port] <command>

Bug: http://b/26154914

(cherry picked from commit 4601c978ca)

Change-Id: Ia5bbae6bcd6405671f594d7120b3994746d234d3
2016-02-17 13:22:30 -08:00
Mark Salyzyn
c10b039d28 Merge "fake_log_device: long lived allocations"
am: 3fd5649424

* commit '3fd56494242a42d5a684f64e1292d8a354dc60c6':
  fake_log_device: long lived allocations
2016-02-17 21:22:19 +00:00
David Pursell
8bcce68f10 fastboot: add Socket timeout detection.
UDP fastboot will require re-transmission in the case of datagrams
getting lost. This CL adds Socket functionality to easily distinguish
between a normal timeout and a socket failure.

I also found some Windows docs that indicate sockets may become
invalid after a call to recv() times out. This has never occurred in
my testing, but to be safe this switches the timeout implementation
to use select() instead of SO_RCVTIMEO.

Bug: http://b/26154914

(cherry picked from commit c742a7f174)

Change-Id: I339d42fc40d853ee48d1b457d06b67faf5799d91
2016-02-17 13:22:17 -08:00
Mark Salyzyn
3fd5649424 Merge "fake_log_device: long lived allocations" 2016-02-17 21:19:48 +00:00
Elliott Hughes
04f8fe722c Merge "Remove two bogus libutils dependencies." am: fd9619004b
am: b3639658ed

* commit 'b3639658ed307aca879007a88a74631f5feb6962':
  Remove two bogus libutils dependencies.
2016-02-17 21:07:30 +00:00
Elliott Hughes
a3894b574f Merge "Remove libbase\'s libutils dependency." am: b3a77b1198
am: 0a475f8dd2

* commit '0a475f8dd25c47093080ccd8f4556bece6713ea8':
  Remove libbase's libutils dependency.
2016-02-17 21:07:22 +00:00
Bill Yi
0753f1fc30 Merge commit \'4352ee87fd74b931d4b58192fb8974e91aa899d0\' into HEAD
am: 4409f1446c

* commit '4409f1446caa4eb06122d60c96573503b73ea84b':
2016-02-17 21:07:13 +00:00
Elliott Hughes
b3639658ed Merge "Remove two bogus libutils dependencies."
am: fd9619004b

* commit 'fd9619004b8ce5be093657142aef989bee14fb82':
  Remove two bogus libutils dependencies.
2016-02-17 20:24:12 +00:00
Elliott Hughes
0a475f8dd2 Merge "Remove libbase\'s libutils dependency."
am: b3a77b1198

* commit 'b3a77b119858b9f5a1267b7c41b6646032f12db9':
  Remove libbase's libutils dependency.
2016-02-17 20:24:04 +00:00
Mark Salyzyn
0085a135b9 fake_log_device: long lived allocations
Use static space for long lived allocations as they
will appear to act like a memory leak. Resort to a
larger on-stack iovec to reduce the chances of an
allocation. Fix bug in writer where not enough size
was available for "security" buffer name. Minor
transitions to more consistent coding style.

Bug: 27107691
Change-Id: I68c918e7b916b1ae3b04829d48b3eddaa0a7e739
2016-02-17 12:22:18 -08:00
Elliott Hughes
fd9619004b Merge "Remove two bogus libutils dependencies." 2016-02-17 20:01:04 +00:00
Elliott Hughes
b3a77b1198 Merge "Remove libbase's libutils dependency." 2016-02-17 20:00:38 +00:00
Elliott Hughes
b9e53b4d2d Remove logcat's false dependency on a libutils header file.
Change-Id: Idf499d77e88d2ee7d5b1050eaf45ba29481793a4
2016-02-17 11:58:01 -08:00
Elliott Hughes
ce927189a4 Remove two bogus libutils dependencies.
Change-Id: Idcc25ee1d039935f3218fb419bc73ffaa58242bb
2016-02-17 11:54:47 -08:00
Elliott Hughes
38e2b63db8 Remove libbase's libutils dependency.
Yuck.

Change-Id: If84758f25bc15d5b1a732eaccc226385f51cac13
2016-02-17 11:53:54 -08:00
Bill Yi
4409f1446c Merge commit '4352ee87fd74b931d4b58192fb8974e91aa899d0' into HEAD 2016-02-17 11:37:00 -08:00
Yabin Cui
7e84cbd999 Merge "healthd: init members of BatteryMonitor."
am: 2773d4f96a

* commit '2773d4f96a8e9f06710e36f7c33459eeaa5cb23a':
  healthd: init members of BatteryMonitor.
2016-02-17 18:37:53 +00:00
Yabin Cui
2773d4f96a Merge "healthd: init members of BatteryMonitor." 2016-02-17 18:30:05 +00:00
David Pursell
7b3b490fe2 Merge "fastboot: fix TCP protocol version check."
am: bcaeb78f63

* commit 'bcaeb78f63efb1daa83b5ed43aca9775ac1014b3':
  fastboot: fix TCP protocol version check.
2016-02-17 18:25:22 +00:00
David Pursell
bcaeb78f63 Merge "fastboot: fix TCP protocol version check." 2016-02-17 18:16:12 +00:00
David Pursell
aad72a533f fastboot: fix TCP protocol version check.
Currently the TCP handshake fails if the device TCP protocol version
doesn't match the host exactly, but the protocol is supposed to allow
for forwards compatibility by accepting any protocol version >= itself.
That way the other side can potentially lower its protocol to match and
keep going.

This CL fixes the protocol version check and adds corresponding unit
tests.

Bug: http://b/27220700
Change-Id: Ib17f0a55eb910105a27609bc94bf76a30442e92e
2016-02-17 10:00:09 -08:00
James Hawkins
78cf9374fc Merge "bootstat: Record metrics for factory_reset and time_since_factory_reset."
am: 8a97f88a6d

* commit '8a97f88a6dc3a48140ae8da56f97e77064be7227':
  bootstat: Record metrics for factory_reset and time_since_factory_reset.
2016-02-17 17:59:32 +00:00
James Hawkins
8a97f88a6d Merge "bootstat: Record metrics for factory_reset and time_since_factory_reset." 2016-02-17 17:46:39 +00:00
Mohamad Ayyash
cbe5e79236 Add CASIO to approved vendor IDs am: 6c48349dee am: 1dec743e01 -s ours
am: 14ae3f2b50

* commit '14ae3f2b505845cb3b478fdc965143f4177986c6':
  Add CASIO to approved vendor IDs
2016-02-17 17:41:41 +00:00
Mohamad Ayyash
14ae3f2b50 Add CASIO to approved vendor IDs am: 6c48349dee
am: 1dec743e01  -s ours

* commit '1dec743e01498fc8e6cd01cf71d12aa2b1431018':
  Add CASIO to approved vendor IDs
2016-02-17 17:34:55 +00:00