Commit Graph

32800 Commits

Author SHA1 Message Date
Daniel Cardenas 21fff17ed6 Partial revert of "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" Revert just the wifi hardware part.
am: 6db432daf7

Change-Id: I7796ffcf07d6478ead19c5bab171a9ff4ce4f758
2017-05-03 19:42:52 +00:00
Daniel Cardenas 6db432daf7 Partial revert of
"libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate"
Revert just the wifi hardware part.

This partially wqreverts commit fde19425f3.
b/37921982

Test: netflix, play movies, youtube
Change-Id: I1a47b66dbc2a74270eb4ef75c3a5b55624c2013d
2017-05-03 12:11:27 -07:00
Tom Cherry 214e45a5a7 Merge "ueventd: do not reference init's sehandle" am: 672dd970f4 am: e4988c9a34
am: 4c664d8c5c

Change-Id: I7da9e9417afcd8a2cfa9d7ac75d58c75cc39f21d
2017-05-03 18:25:46 +00:00
Tom Cherry 4c664d8c5c Merge "ueventd: do not reference init's sehandle" am: 672dd970f4
am: e4988c9a34

Change-Id: I3b33dea59f54f3807f2d1e1e7872f79f1dbada70
2017-05-03 18:23:15 +00:00
Tom Cherry e4988c9a34 Merge "ueventd: do not reference init's sehandle"
am: 672dd970f4

Change-Id: I12378e6f1917cd31b42db6cde78d2f959bb6e4f5
2017-05-03 18:20:46 +00:00
Tom Cherry 672dd970f4 Merge "ueventd: do not reference init's sehandle" 2017-05-03 18:14:38 +00:00
Christopher Ferris e44382f290 Merge "Move libc_logging to libasync_safe." am: deb19a631f am: 1e3dea0034
am: 8d9825533b

Change-Id: Ia85f6ee62834c1c34b00935bd1ed9c50924e10d0
2017-05-03 18:01:38 +00:00
Christopher Ferris 8d9825533b Merge "Move libc_logging to libasync_safe." am: deb19a631f
am: 1e3dea0034

Change-Id: I836179aa5e5b805017a0393d231fe9005259b013
2017-05-03 17:56:11 +00:00
Christopher Ferris 1e3dea0034 Merge "Move libc_logging to libasync_safe."
am: deb19a631f

Change-Id: Ia1ebf75cd3c0a9640fa5f2367fb40d00ffeca2ad
2017-05-03 17:52:01 +00:00
Christopher Ferris deb19a631f Merge "Move libc_logging to libasync_safe." 2017-05-03 17:43:35 +00:00
Felipe Leme b285e2a050 Don't display bugreport progress when it recedes, for real...
am: 53fd1730b6

Change-Id: Ic15b6cd479afd01747fa508063f50d2d0a6625e9
2017-05-03 17:31:54 +00:00
Mark Salyzyn 5cad367060 Merge "libcutils: convert fs_config.cpp" am: c50245e43e am: a255ab0cb0
am: 5f82055a2e

Change-Id: I93bdac8212b6d913c0851d4ef1145a1943a76e3b
2017-05-03 16:57:09 +00:00
Mark Salyzyn 5f82055a2e Merge "libcutils: convert fs_config.cpp" am: c50245e43e
am: a255ab0cb0

Change-Id: Ife5d12b9f4d3924b3903d91cd09e6592f4ee08b8
2017-05-03 16:54:40 +00:00
Mark Salyzyn a255ab0cb0 Merge "libcutils: convert fs_config.cpp"
am: c50245e43e

Change-Id: I0681d0477f9782b0616ee65d8996db716541caab
2017-05-03 16:52:39 +00:00
Treehugger Robot c50245e43e Merge "libcutils: convert fs_config.cpp" 2017-05-03 16:48:44 +00:00
Felipe Leme 378c2a0c4f Merge "Don't display bugreport progress when it recedes, for real..." am: 499af38623 am: 35d7f65654
am: eed955d7c6

Change-Id: I6781b7ae6f84c47c751b5f7284c2a8bcc2f61cc6
2017-05-03 15:33:03 +00:00
Felipe Leme eed955d7c6 Merge "Don't display bugreport progress when it recedes, for real..." am: 499af38623
am: 35d7f65654

Change-Id: Idcd1af6a3f41b61cd4776ae326ecd2bc19a353a4
2017-05-03 15:30:04 +00:00
Felipe Leme 35d7f65654 Merge "Don't display bugreport progress when it recedes, for real..."
am: 499af38623

Change-Id: I823fc5af425ddd5edfa747929a62a4003fabacbc
2017-05-03 15:27:35 +00:00
Felipe Leme 53fd1730b6 Don't display bugreport progress when it recedes, for real...
The previous fix was taking account just the progress reported by dumpstate,
not progress/percentage. As such, it was not detecting the cases where the
percentage decreased but the progress didn't.

Bug: 37878670
Test: m -j32 adb_test && ./out/host/linux-x86/nativetest64/adb_test/adb_test --gtest_filter=BugreportTest.*

Change-Id: I5830028f3191a9b17f63aeed5c049b29fa7d1179
(cherry picked from commit 4cc03611cd)
2017-05-03 08:22:02 -07:00
Treehugger Robot 499af38623 Merge "Don't display bugreport progress when it recedes, for real..." 2017-05-03 15:21:26 +00:00
Mark Salyzyn 163ecc68c7 libcutils: convert fs_config.cpp
C++ify fs_config.c

Test: gTest libcutils-test
Bug: 37703469
Change-Id: Id48ae22f203ed923942257575296c69b32345ae6
2017-05-03 08:04:35 -07:00
Bowgo Tsai ec0d2ce60e Merge "init: fix first stage mount failure due to /dev/device-mapper not found" am: 0447a3e5d1 am: ad7c7fe1aa
am: fd13c70104

Change-Id: Ia9da2e7f83350a955ee7ec9c920b2b7eabc87ead
2017-05-03 01:42:09 +00:00
Christopher Ferris ac225780dd Move libc_logging to libasync_safe.
Move the name of the "private/libc_logging.h" header to <async_safe/log.h>.

For use of libc_malloc_debug_backtrace, remove the libc_logging library.
The library now includes the async safe log functions.

Remove the references to libc_logging.cpp in liblog, it isn't needed because
the code is already protected by a check of the __ANDROID__ define.

Test: Compiled and boot bullhead device.
Test: Run debuggerd unit tests.
Test: Run liblog unit tests on target and host.
Test: Run libmemunreachable unit tests (these tests are flaky though).
Change-Id: Ie79d7274febc31f210b610a2c4da958b5304e402
2017-05-02 18:38:46 -07:00
Bowgo Tsai fd13c70104 Merge "init: fix first stage mount failure due to /dev/device-mapper not found" am: 0447a3e5d1
am: ad7c7fe1aa

Change-Id: I50ffa8e1dd0da80e9adb20c072598069fde856ab
2017-05-03 01:38:42 +00:00
Bowgo Tsai ad7c7fe1aa Merge "init: fix first stage mount failure due to /dev/device-mapper not found"
am: 0447a3e5d1

Change-Id: Ie0ad21fc28ea7a692ef7b3dfbb663e8f6f3dfe93
2017-05-03 01:36:11 +00:00
Treehugger Robot 0447a3e5d1 Merge "init: fix first stage mount failure due to /dev/device-mapper not found" 2017-05-03 01:33:07 +00:00
Elliott Hughes 347b67a8da Merge "Preserve errno better in native_handle functions." am: dd6e73f432 am: 4b6b4e02ed
am: d0c0d16b6a

Change-Id: I825b20ac4c9c3b0c6921a4469cf3091b0c811d9a
2017-05-03 01:12:40 +00:00
Elliott Hughes d0c0d16b6a Merge "Preserve errno better in native_handle functions." am: dd6e73f432
am: 4b6b4e02ed

Change-Id: I878ed6ea39c72ac21522552ffc4af5210e83a7c1
2017-05-03 01:09:41 +00:00
Elliott Hughes 4b6b4e02ed Merge "Preserve errno better in native_handle functions."
am: dd6e73f432

Change-Id: Idbaadca2f8cdf450b47fc95a7a127e009a17740d
2017-05-03 01:07:09 +00:00
Elliott Hughes dd6e73f432 Merge "Preserve errno better in native_handle functions." 2017-05-03 01:02:21 +00:00
Elliott Hughes df3dc783af Merge "Improve "adb sideload" error reporting." am: 66b25eb810 am: f2fe436d32
am: 2b0d807531

Change-Id: I9540db5d8095aa81b8bbc9dca646b61a186a462c
2017-05-03 01:01:10 +00:00
Elliott Hughes 2b0d807531 Merge "Improve "adb sideload" error reporting." am: 66b25eb810
am: f2fe436d32

Change-Id: I38f7972668504f902f3924a0c1872c6f2fad017b
2017-05-03 00:59:08 +00:00
Elliott Hughes f2fe436d32 Merge "Improve "adb sideload" error reporting."
am: 66b25eb810

Change-Id: I46c6ec422611f6f930aa8658f8a91ca41b3b1824
2017-05-03 00:56:08 +00:00
Elliott Hughes 66b25eb810 Merge "Improve "adb sideload" error reporting." 2017-05-03 00:51:09 +00:00
Nick Kralevich fa60816271 Merge "Stop writing NUL bytes in adbkey.pub." into oc-dev
am: 39225a131b

Change-Id: I605a444d9f1b421800f152e281ba93675fcefc2b
2017-05-02 23:01:16 +00:00
Nick Kralevich 39225a131b Merge "Stop writing NUL bytes in adbkey.pub." into oc-dev 2017-05-02 22:56:55 +00:00
Colin Cross 74a923614f Merge "Convert libnetutils to Android.bp" into oc-dev
am: 178b0492ba  -s ours

Change-Id: I8e0b9a3aa56240d44997a422dbb243727427cd8a
2017-05-02 22:21:58 +00:00
TreeHugger Robot 178b0492ba Merge "Convert libnetutils to Android.bp" into oc-dev 2017-05-02 22:09:25 +00:00
Elliott Hughes 09e794c05d Improve "adb sideload" error reporting.
Rather than quietly fall through to the legacy code with no explanation,
say why the first connection failed, and that the second attempt is only
going to be relevant for folks trying to sideload to a pre-KitKit device.

Before:

  $ adb sideload mysid-ota-424425.zip
  opening 'mysid-ota-424425.zip'...
  connecting...
  falling back to older sideload method...
  error: closed

After:

  $ adb sideload mysid-ota-424425.zip
  adb: sideload connection failed: no devices/emulators found
  adb: trying pre-KitKat sideload method...
  adb: pre-KitKat sideload connection failed: no devices/emulators found

Also switch the legacy code to just read+write blocks rather than trying to
load the whole OTA package into RAM (which is in short supply on Win32).
This is probably of no practical use other than that it lets us report a
better error message (better than "terminate called after throwing an
instance of 'std::bad_alloc'").

Bug: https://issuetracker.google.com/37139736
Test: "adb sideload" with no device/a mysid/an angler
Change-Id: Ia568044aac61bd054301ebfd7fcd5ad5d6f3147a
2017-05-02 14:41:04 -07:00
Elliott Hughes a761231b96 Stop writing NUL bytes in adbkey.pub.
In N we moved some code from C to C++ without realizing that EVP_EncodedLength
includes space for a terminating NUL and EVP_EncodeBlock writes one. Because
our key reading code copes with the NUL, we never noticed.

Distinguish between the required space returned by EVP_EncodedLength and the
actual number of bytes (not including NUL) used return by EVP_EncodeBlock.

Bug: http://b/36187819
Test: hexdump of ~/.android/adbkey.pub

(cherry picked from commit 0b771b33fd)

Change-Id: I6e16b8d48d097b4054417c1d1a225bf7ece985b9
2017-05-02 14:11:49 -07:00
Mark Salyzyn 9432fb8d8b libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate
am: fde19425f3

Change-Id: Id2d51a818161b8345332ecbac82784eea4d82dab
2017-05-02 21:07:11 +00:00
Mark Salyzyn fde19425f3 libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate
(cherry picked from commit f0b53d0726)
(added "system/vendor/bin/hostapd" to list)

Cover both direct and symlink indirect paths to the referenced
files in the vendor, odm and oem partitions.

Test: compile and hand-verify properties
Bug: 37703469
Change-Id: I5b3a887e904baee2ac193ac4a73aaaee0bbfdb9f
2017-05-02 11:17:54 -07:00
Felipe Leme 4cc03611cd Don't display bugreport progress when it recedes, for real...
The previous fix was taking account just the progress reported by dumpstate,
not progress/percentage. As such, it was not detecting the cases where the
percentage decreased but the progress didn't.

Bug: 37878670
Test: m -j32 adb_test && ./out/host/linux-x86/nativetest64/adb_test/adb_test --gtest_filter=BugreportTest.*

Change-Id: I5830028f3191a9b17f63aeed5c049b29fa7d1179
2017-05-02 10:08:39 -07:00
Bowgo Tsai ea5fca4cd0 init: fix first stage mount failure due to /dev/device-mapper not found
It has been reported that fs_mgr failed to open /dev/device-mapper
during the first stage mount. It's because other uevent (e.g., i2c
charger device) happens to be sent at the same time we're triggering
the device-mapper uevent to be sent. Current implementation returns
COLDBOOT_STOP unconditionally so it will only process the first received
uevent, leaving device-mapper uevent unhandled when the race happens.

Fix this by only returning COLDBOOT_STOP when the received uevent->path
matches that of device mapper.

Bug: 37745254

Test: first stage mount /vendor with vboot 2.0 (avb) on bullhead
Test: first stage mount /vendor with vboot 1.0 on sailfish
Change-Id: I4a77093ec8f90a5ca981a088f34d082d0270533b
2017-05-03 00:38:43 +08:00
Jiwen Cai 9815189c9d Merge "Add NATIVE_WINDOW_CONSUMER_IS_PROTECTED enum" into oc-dev
am: 6399d45725

Change-Id: Ic1b31382ccf4d658a1d36c23bbf276c8d143c620
2017-05-02 16:06:43 +00:00
Jiwen Cai 6399d45725 Merge "Add NATIVE_WINDOW_CONSUMER_IS_PROTECTED enum" into oc-dev 2017-05-02 15:59:26 +00:00
Steven Moreland 525ddd2ceb Merge "libsysutils: Android.mk -> Android.bp" into oc-dev
am: d512ac99d9

Change-Id: Ib65757a4316106bdf09c3f4235dacb46c5712868
2017-05-02 15:41:10 +00:00
TreeHugger Robot d512ac99d9 Merge "libsysutils: Android.mk -> Android.bp" into oc-dev 2017-05-02 15:36:34 +00:00
David Zeuthen c14134bf1b Merge "adb: Support 'adb enable/disable-verity' when using AVB." am: 8fc6cc8910 am: 2b3a568171
am: 1855c98ac2

Change-Id: I2a3946408b9543dfd40343698161a64eebf54277
2017-05-02 15:34:59 +00:00
David Zeuthen 1855c98ac2 Merge "adb: Support 'adb enable/disable-verity' when using AVB." am: 8fc6cc8910
am: 2b3a568171

Change-Id: I59cbbdaf00664f17cf04ee56c10f836e8daff0ab
2017-05-02 15:32:28 +00:00