Commit graph

33233 commits

Author SHA1 Message Date
Mark Salyzyn
87265fd5bb Merge "Revert "logd: remove start filtration from flushTo"" am: 8cfd2971ec am: f111b04f15
am: ef53957a7e

Change-Id: I50d342511a3e2b3762c90c1f8e7e912ac21012fd
2017-05-17 21:48:55 +00:00
Mark Salyzyn
ef53957a7e Merge "Revert "logd: remove start filtration from flushTo"" am: 8cfd2971ec
am: f111b04f15

Change-Id: Iec53f8ef86ca9edb021f279ef0eeaff0d0a2a26c
2017-05-17 21:44:38 +00:00
Mark Salyzyn
f111b04f15 Merge "Revert "logd: remove start filtration from flushTo""
am: 8cfd2971ec

Change-Id: Ic52a26216b04ee36b15f4665d9c7741079e192ea
2017-05-17 21:41:08 +00:00
Treehugger Robot
8cfd2971ec Merge "Revert "logd: remove start filtration from flushTo"" 2017-05-17 21:30:20 +00:00
David Zeuthen
7fb7389b66 Merge "adb: Allow disabling verity on eng builds when using AVB." am: 7ce0f00c08 am: 1ceea342d5
am: 984757365f

Change-Id: I6479a768c3d6308452f9fa837a3b9917b91fd09e
2017-05-17 21:23:36 +00:00
David Zeuthen
984757365f Merge "adb: Allow disabling verity on eng builds when using AVB." am: 7ce0f00c08
am: 1ceea342d5

Change-Id: I000b7f411fef7e3b7c170493b94078ff7c5c3f34
2017-05-17 21:20:25 +00:00
David Zeuthen
1ceea342d5 Merge "adb: Allow disabling verity on eng builds when using AVB."
am: 7ce0f00c08

Change-Id: I84768c516232d6f5921f5a5d43f9aa169128ca58
2017-05-17 21:17:06 +00:00
Treehugger Robot
7ce0f00c08 Merge "adb: Allow disabling verity on eng builds when using AVB." 2017-05-17 21:11:46 +00:00
Elliott Hughes
5d4d139c1e Merge "libcutils should #include <sys/sysmacros.h>" am: c3b931aad3 am: 2668f35d31
am: ce49fc9d0a

Change-Id: Iad330e5266e27f412687209f3bd6375f777dc905
2017-05-17 20:54:05 +00:00
Elliott Hughes
ce49fc9d0a Merge "libcutils should #include <sys/sysmacros.h>" am: c3b931aad3
am: 2668f35d31

Change-Id: If123865b83fd198055d4344bb9cc58376ccc5cd6
2017-05-17 20:51:04 +00:00
Elliott Hughes
2668f35d31 Merge "libcutils should #include <sys/sysmacros.h>"
am: c3b931aad3

Change-Id: Ifbd963ac88e5d4b2d60d48616064a99753f62e3e
2017-05-17 20:47:03 +00:00
Treehugger Robot
c3b931aad3 Merge "libcutils should #include <sys/sysmacros.h>" 2017-05-17 20:39:39 +00:00
Mark Salyzyn
eb45db2cf4 Revert "logd: remove start filtration from flushTo"
Regressed by introducing too much overlap in the results.

This reverts commit 982ad208b5.

Bug: 38341453
Change-Id: I9d630a6b9f3e464f523424b640090f7e268da9bd
2017-05-17 19:55:12 +00:00
Elliott Hughes
89af994dc1 Merge "Fix "fastboot flashing"." am: 67529d29ca am: ccf078da71
am: 6903e671eb

Change-Id: I371d15174d1ffe1d022742ee933f0c33eaa09672
2017-05-17 18:56:44 +00:00
Elliott Hughes
6903e671eb Merge "Fix "fastboot flashing"." am: 67529d29ca
am: ccf078da71

Change-Id: Idd6aa61bf830ff5e5086388a6ea32b76ed78aea1
2017-05-17 18:54:13 +00:00
Elliott Hughes
ccf078da71 Merge "Fix "fastboot flashing"."
am: 67529d29ca

Change-Id: I53f96e1540333082ff71f89baa1b98b745ca1cbc
2017-05-17 18:50:57 +00:00
Elliott Hughes
d77b537732 libcutils should #include <sys/sysmacros.h>
Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: I8ca21a74e2856fde09c284aee1343c627d8381e6
2017-05-17 11:36:51 -07:00
David Zeuthen
abddbc2cdf adb: Allow disabling verity on eng builds when using AVB.
Unlike VB1.0, if a device is using AVB then dm-verity is used on any
build (userdebug, eng, etc.). Therefore, we should allow disabling
verity on any build (except USER), not just userdebug. This bug was
pointed out in https://android-review.googlesource.com/#/c/371372/

Bug: 34124301
Test: Manually tested on -eng build on device using AVB.
Change-Id: I314550c13d7458d5d1ef68eb06f98849e11fbe15
2017-05-17 14:28:47 -04:00
Treehugger Robot
67529d29ca Merge "Fix "fastboot flashing"." 2017-05-17 18:25:23 +00:00
Chris Wren
ef50840197 Merge "port metrics_logger to v2 format" am: 75a8233c7e am: d28d543c48
am: 43bae3f568

Change-Id: I94b60101e721cab71213b2adbc09c1bdd70ffec2
2017-05-17 17:58:41 +00:00
Chris Wren
43bae3f568 Merge "port metrics_logger to v2 format" am: 75a8233c7e
am: d28d543c48

Change-Id: Iddd6fd884fb1a0ea2bf00d17fcb77126267b229e
2017-05-17 17:29:19 +00:00
Chris Wren
d28d543c48 Merge "port metrics_logger to v2 format"
am: 75a8233c7e

Change-Id: Ia17401c174b3ecbd7f45c141d192987e75d85bdd
2017-05-17 17:25:20 +00:00
Treehugger Robot
75a8233c7e Merge "port metrics_logger to v2 format" 2017-05-17 17:21:55 +00:00
Chris Wren
936fbbdef8 port metrics_logger to v2 format
Bug: 34450377
Test: manual, needs to be a cross-language test
Change-Id: Ib89a48f2c52428deff863b0c28f3c10e7333c8a2
(cherry picked from commit 081492552c)
2017-05-17 10:18:26 -07:00
Jiyong Park
ee7da4f37d Allow vndk-sp to be extended by vendors
am: eb9694a2d1

Change-Id: I35e4a6f0f7a712e01923a9e1d3456c81d5c0367a
2017-05-17 16:52:13 +00:00
Jiyong Park
eb9694a2d1 Allow vndk-sp to be extended by vendors
Exteded vndk-sp should go to /vendor/lib/vndk-sp.

Bug: 37940694
Test: sailfish builds and boots
Test: manually copying a lib from /system/lib/vndk-sp to
/vendor/lib/vndk-sp. Check that the copied one in /vendor partition is
loaded instead of the original one.

Change-Id: Ia5dd6f35bd31d4a20a794bec148e1fc3c6d7b72b
2017-05-18 01:42:27 +09:00
Daichi Hirono
4847c7f708 Merge "Change the CHECK failure into function failure." into oc-dev
am: bf6e949727

Change-Id: Ic374fc076cc9584c375618a57371669c23aff539
2017-05-17 10:39:16 +00:00
Daichi Hirono
d6b71b9153 Merge "Use SO_SNDBUFFORCE instead of SO_SNDBUF" into oc-dev
am: 165dad791d

Change-Id: I2da13af0ff1e4a50259847fd57695c3d616e59cc
2017-05-17 10:38:32 +00:00
Jiyong Park
c9c527f81f resolve merge conflicts of fbe942724 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I137c17d55940b783eab6d0125bc4d26b96bcc2f2
Change-Id: I90c3ff7c82a9b53ce00057fd87cf227d5faf0975
2017-05-17 14:29:44 +09:00
TreeHugger Robot
bf6e949727 Merge "Change the CHECK failure into function failure." into oc-dev 2017-05-17 03:22:27 +00:00
TreeHugger Robot
165dad791d Merge "Use SO_SNDBUFFORCE instead of SO_SNDBUF" into oc-dev 2017-05-17 02:26:01 +00:00
TreeHugger Robot
fbe9427241 Merge changes from topic 'synchronize_vndk-sp' into oc-dev
* changes:
  add libvndksupport.so to ll-ndk
  libbacktrace is VNDK-SP
  add libvndksupport
2017-05-17 01:53:56 +00:00
Daichi Hirono
3df060d6d0 Change the CHECK failure into function failure.
Previously we have CHECK in WriteInternal function to observe short
writing. However it turns out short write can happen according to the
bug report.

To prevent app from crashing due to CHECK failure, the CL removes the
CHECK and let WriteInternal return a failure value.

Bug: 37561460
Test: libappfuse_tests, manually re-wrote the return value of write()
      and checked logcat.
Change-Id: I6a1e233c3ddb8eb68f59e7c606ad0459b5ca2c6e
2017-05-17 10:30:02 +09:00
Vijay Venkatraman
1475ef280c Add vendor_available:true to libcrypto_utils
am: 15042c1e5e

Change-Id: Ib8a4b3e88142eae2946648ae965bb03d40d2e55e
2017-05-17 00:39:58 +00:00
Dmitry Shmidt
38335f9998 Merge "libnetutils: Restore dhcptool" am: b03d5a4ba6 am: 1f47a6ba48
am: cebd49c93f

Change-Id: I06dd468023d64b15e5f21d1fa61115b836582612
2017-05-16 23:52:52 +00:00
Dmitry Shmidt
cebd49c93f Merge "libnetutils: Restore dhcptool" am: b03d5a4ba6
am: 1f47a6ba48

Change-Id: Ib8a86d12fd170e4fe34a3132ad1c41934c29119d
2017-05-16 23:29:24 +00:00
Dmitry Shmidt
1f47a6ba48 Merge "libnetutils: Restore dhcptool"
am: b03d5a4ba6

Change-Id: I3c348f92ffdbaaac1bbb66a6f9d89fca7a65ef32
2017-05-16 23:17:53 +00:00
Treehugger Robot
b03d5a4ba6 Merge "libnetutils: Restore dhcptool" 2017-05-16 23:13:57 +00:00
Dmitry Shmidt
bc592761c9 libnetutils: Restore dhcptool
Despite it is not used for network management, it is
very convenient tool for wifi bringup and debugging.

Test: Manual

Change-Id: I045301acc2dd15d0e68d6b99c8e214865f19ebad
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-05-16 14:24:18 -07:00
Vijay Venkatraman
15042c1e5e Add vendor_available:true to libcrypto_utils
Bug: 38244611
Test: build sailfish
Change-Id: Ieaaf9e03a63124cd1bb79d4c8f6e5d5d4cc7d94b
2017-05-16 11:51:09 -07:00
Elliott Hughes
32d5160e23 Merge "Remove libbase's trivial libutils-headers dependency." am: 337b4dd661 am: 70b0e94f80
am: 97caf43fbc

Change-Id: I130d4c518160d7d30353b8ca8c62339440b9ac6d
2017-05-16 18:06:07 +00:00
Elliott Hughes
97caf43fbc Merge "Remove libbase's trivial libutils-headers dependency." am: 337b4dd661
am: 70b0e94f80

Change-Id: I1d498fa1fac847e676841a80a23b7b0b0fac7f0e
2017-05-16 18:02:36 +00:00
Elliott Hughes
70b0e94f80 Merge "Remove libbase's trivial libutils-headers dependency."
am: 337b4dd661

Change-Id: I929930dbe7e013d8be608b06c76b5af33b527351
2017-05-16 17:59:06 +00:00
Treehugger Robot
337b4dd661 Merge "Remove libbase's trivial libutils-headers dependency." 2017-05-16 17:51:14 +00:00
Mark Salyzyn
4cc6519741 Merge "logd: remove start filtration from flushTo" am: c8c49988b1 am: 27d54dd4ac
am: 8ab4f5eafc

Change-Id: I700220b3db7c84de51053b818e4e597552b68c80
2017-05-16 15:27:24 +00:00
Mark Salyzyn
8ab4f5eafc Merge "logd: remove start filtration from flushTo" am: c8c49988b1
am: 27d54dd4ac

Change-Id: Ied7a62d1ec231da5b6969c7642d4843912bf6203
2017-05-16 15:24:23 +00:00
Mark Salyzyn
27d54dd4ac Merge "logd: remove start filtration from flushTo"
am: c8c49988b1

Change-Id: I7be86455b6bb3930e8e37810208f237df202af31
2017-05-16 15:21:23 +00:00
Treehugger Robot
c8c49988b1 Merge "logd: remove start filtration from flushTo" 2017-05-16 15:11:34 +00:00
Bowgo Tsai
ab90853da2 first stage mount: removing the requirement of by-name prefix for AVB
am: d7846a2c53  -s ours

Change-Id: I32bee7e0bce24f9ae52c92179e30ffd1bfbb2856
2017-05-16 02:08:43 +00:00
Bowgo Tsai
763fa64d99 init: moving get_block_device_symlinks() to public API
am: 1fa0251930  -s ours

Change-Id: If69297cbcf81719740aa1858fd55e7ab969c6dba
2017-05-16 02:08:34 +00:00