Paul Lawrence
9dbe97b4d5
Support metadata encryption
...
Bug: 29189559
Test: Angler, Marlin build and boot
Change-Id: Ia7b070781f5f16ff8bfd934569a2209c80c28385
2017-04-21 14:26:00 -07:00
Mark Salyzyn
1395aac313
Merge "liblog: test: liblog.__security miscalculation" am: 3ed85748e1 am: 725526774b am: f4589bb613
...
am: 8a3969ff7f
2017-04-21 15:43:22 +00:00
Mark Salyzyn
8a3969ff7f
Merge "liblog: test: liblog.__security miscalculation" am: 3ed85748e1 am: 725526774b
...
am: f4589bb613
2017-04-21 15:30:27 +00:00
Mark Salyzyn
f4589bb613
Merge "liblog: test: liblog.__security miscalculation" am: 3ed85748e1
...
am: 725526774b
2017-04-21 15:27:26 +00:00
Mark Salyzyn
725526774b
Merge "liblog: test: liblog.__security miscalculation"
...
am: 3ed85748e1
2017-04-21 15:23:26 +00:00
Treehugger Robot
3ed85748e1
Merge "liblog: test: liblog.__security miscalculation"
2017-04-21 15:17:03 +00:00
Colin Cross
4209b6141b
Merge changes Ia11dffde,I76f24890 am: bd53ea4063 am: 280e3beec3 am: 5d29c3f3fd
...
am: 63d7c1e950
2017-04-20 21:31:16 +00:00
Colin Cross
63d7c1e950
Merge changes Ia11dffde,I76f24890 am: bd53ea4063 am: 280e3beec3
...
am: 5d29c3f3fd
2017-04-20 21:28:16 +00:00
Colin Cross
5d29c3f3fd
Merge changes Ia11dffde,I76f24890 am: bd53ea4063
...
am: 280e3beec3
2017-04-20 21:25:19 +00:00
Colin Cross
280e3beec3
Merge changes Ia11dffde,I76f24890
...
am: bd53ea4063
2017-04-20 21:22:46 +00:00
Treehugger Robot
bd53ea4063
Merge changes Ia11dffde,I76f24890
...
* changes:
Convert libnetutils to Android.bp
Don't export libutils_headers from libbase
2017-04-20 21:19:17 +00:00
Mark Salyzyn
206f873245
Merge changes Iec369a50,I78959464,I3f9f8d56 into oc-dev am: ad8d533a04 -s ours
...
am: 6be45f2722
2017-04-20 21:11:42 +00:00
Mark Salyzyn
6be45f2722
Merge changes Iec369a50,I78959464,I3f9f8d56 into oc-dev
...
am: ad8d533a04
2017-04-20 21:08:43 +00:00
Tom Cherry
b6e038efc6
Merge "init: fix errno handling on KillProcessGroup" am: f890ca9a1f am: db9f2cb46d am: c7e559ca40
...
am: 01d9b0e11c
2017-04-20 21:02:42 +00:00
Tom Cherry
01d9b0e11c
Merge "init: fix errno handling on KillProcessGroup" am: f890ca9a1f am: db9f2cb46d
...
am: c7e559ca40
2017-04-20 21:00:43 +00:00
Tom Cherry
c7e559ca40
Merge "init: fix errno handling on KillProcessGroup" am: f890ca9a1f
...
am: db9f2cb46d
2017-04-20 20:58:12 +00:00
Tom Cherry
db9f2cb46d
Merge "init: fix errno handling on KillProcessGroup"
...
am: f890ca9a1f
2017-04-20 20:55:12 +00:00
Tom Cherry
f890ca9a1f
Merge "init: fix errno handling on KillProcessGroup"
2017-04-20 20:48:49 +00:00
Mark Salyzyn
ad8d533a04
Merge changes Iec369a50,I78959464,I3f9f8d56 into oc-dev
...
* changes:
logd: instrument tests better for failure
logd: iterator corruption paranoia
liblog: log_time add explicit to some constructors.
2017-04-20 20:44:28 +00:00
Mark Salyzyn
b867beac56
liblog: test: liblog.__security miscalculation
...
The gTest should not be able to set ro.device_owner, either as a unit
test or a CTS test. The CTS test should not be able to set
persist.logd.security, the gTest may as it is run on userdebug with
root, so check if we are root to discern expectations.
Test: gTest liblog-unit-tests --gtest_filter=liblog.__security
Test: cts-tradefed run cts-dev -a armeabi-v7a -m CtsLiblogTestCases -t liblog#__security
Bug: 36480230
Change-Id: I1da88aae34da4e2fca8dd88d740eeb879d9c65bb
2017-04-20 13:26:12 -07:00
Yabin Cui
1810d58e35
Merge "adb: fix two device offline problems." am: 2e821078e4 am: ae6a3605d2 am: 66cfd45a34
...
am: c4a1393a15
2017-04-20 19:57:10 +00:00
Yabin Cui
c4a1393a15
Merge "adb: fix two device offline problems." am: 2e821078e4 am: ae6a3605d2
...
am: 66cfd45a34
2017-04-20 19:54:39 +00:00
Yabin Cui
66cfd45a34
Merge "adb: fix two device offline problems." am: 2e821078e4
...
am: ae6a3605d2
2017-04-20 19:51:42 +00:00
Yabin Cui
ae6a3605d2
Merge "adb: fix two device offline problems."
...
am: 2e821078e4
2017-04-20 19:49:08 +00:00
Treehugger Robot
2e821078e4
Merge "adb: fix two device offline problems."
2017-04-20 19:45:18 +00:00
Mark Salyzyn
4ab7104b32
Merge changes I6555c135,If5723ff4 am: d9982803ed am: b3259f39c2 am: 529be90503
...
am: 29c987e1ea
2017-04-20 18:58:17 +00:00
Dan Willemsen
a693518498
Merge "Convert libusbhost to Android.bp" am: a58c4b5bcd am: dff208c80c am: 720faf195c
...
am: 93f7b6a669
2017-04-20 18:57:56 +00:00
Mark Salyzyn
c2197e10ae
Merge "logd: statistics add logspan" am: e32517d773 am: 2ad8ed5138 am: 58871c8338
...
am: 5643587311
2017-04-20 18:57:38 +00:00
Christopher Ferris
53a4f693e2
Merge "Add function definitions for MapInfo." am: 4c1560ce5c am: 0597e4a8af am: c3671b91da
...
am: 6447c4de9f
2017-04-20 18:57:16 +00:00
Mark Salyzyn
29c987e1ea
Merge changes I6555c135,If5723ff4 am: d9982803ed am: b3259f39c2
...
am: 529be90503
2017-04-20 17:57:04 +00:00
Mark Salyzyn
529be90503
Merge changes I6555c135,If5723ff4 am: d9982803ed
...
am: b3259f39c2
2017-04-20 17:54:29 +00:00
Mark Salyzyn
b3259f39c2
Merge changes I6555c135,If5723ff4
...
am: d9982803ed
2017-04-20 17:52:00 +00:00
Colin Cross
cafe889aa8
Convert libnetutils to Android.bp
...
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ia11dffde6fc4d89be6ee651be06b48131c877dc0
2017-04-20 10:36:43 -07:00
Colin Cross
4eda982a77
Don't export libutils_headers from libbase
...
libutils headers are only used by the implementation of libbase,
and should not be exported to everything that uses libbase headers.
Test: m -j
Change-Id: I76f248908f649e3a3c91cd3e84d629a0049939ef
2017-04-20 10:36:32 -07:00
Treehugger Robot
d9982803ed
Merge changes I6555c135,If5723ff4
...
* changes:
logcat: test: also check "failed to clear" in blocking_clear
logd: reader/writer element locks
2017-04-20 17:33:50 +00:00
Dan Willemsen
93f7b6a669
Merge "Convert libusbhost to Android.bp" am: a58c4b5bcd am: dff208c80c
...
am: 720faf195c
2017-04-20 17:24:57 +00:00
Dan Willemsen
720faf195c
Merge "Convert libusbhost to Android.bp" am: a58c4b5bcd
...
am: dff208c80c
2017-04-20 17:22:27 +00:00
Dan Willemsen
dff208c80c
Merge "Convert libusbhost to Android.bp"
...
am: a58c4b5bcd
2017-04-20 17:19:58 +00:00
Yabin Cui
b5e11415d9
adb: fix two device offline problems.
...
When device goes offline, user usually has to manually replug the
usb device. This patch tries to solve two offline situations, all
because when adb on host is killed, the adbd on device is not notified.
1. When adb server is killed while pushing a large file to device,
the device is still reading the unfinished large message. So the
device thinks of the CNXN message as part of the previous unfinished
message, so it doesn't reply and the device is in offline state.
The solution is to add a write_msg_lock in atransport struct. And it
kicks the transport only after sending a whole message. By kicking
all transports before exit, we ensure that we don't write part of
a message to any device. So next time we start adb server, the device
should be waiting for a new message.
2. When adb server is killed while pulling a large file from device,
the device is still trying to send the unfinished large message. So
adb on host usually reads data with EOVERFLOW error. This is because
adb on host is reading less than one packet sent from device.
The solution is to use buffered read on host. The max packet size
of bulk transactions in USB 3.0 is 1024 bytes. By preparing an at least
1024 bytes buffer when reading, EOVERFLOW no longer occurs. And teach
adb host to ignore wrong messages.
To be safe, this patch doesn't change any logic on device.
Bug: http://b/32952319
Test: run python -m unittest -q test_device.DeviceOfflineTest
Test: on linux/mac/windows with bullhead, ryu.
Change-Id: Ib149d30028a62a6f03857b8a95ab5a1d6e9b9c4e
2017-04-20 10:14:59 -07:00
Treehugger Robot
a58c4b5bcd
Merge "Convert libusbhost to Android.bp"
2017-04-20 17:07:43 +00:00
Steven Moreland
0dfa18a23b
Merge changes from topic 'system-vendor-internal-pick' am: 3dfaa44491 am: 004f8f9633 am: 0f8be50eca
...
am: 4acb166bae
2017-04-20 15:56:19 +00:00
Steven Moreland
722c9e9f2d
libsync: vendor_available am: 9990de1f64 am: 74f60ea50a am: 76c72a8ece
...
am: 68955bb242
2017-04-20 15:56:09 +00:00
Steven Moreland
4975d159ae
Remove VNDK warning. am: 2bd4342234 am: af13aaf618 am: cfcf4277df
...
am: dafe325816
2017-04-20 15:55:59 +00:00
Steven Moreland
c36492771d
libbase: make vendor_available am: d10a023208 am: 45102312a3 am: 3c5d712f8c
...
am: f1146f81a4
2017-04-20 15:55:49 +00:00
Steven Moreland
73145be485
libcutils: vendor_available am: 385fe692cc am: d4010ad4b8 am: 4162edafd4
...
am: f61d6e7b5c
2017-04-20 15:55:40 +00:00
Steven Moreland
d5f898311d
libbacktrace: make vendor_available am: bb11af88e2 am: 9529a0fe6f am: 9897378d79
...
am: 1011b7f9b3
2017-04-20 15:55:30 +00:00
Steven Moreland
c8c4e4a812
libbase: add libbase_headers am: 3c71bbdde3 am: 10a28989b8 am: e18ea306b1
...
am: 890a8837fd
2017-04-20 15:55:16 +00:00
Dan Willemsen
a5c6017d8f
Convert libusbhost to Android.bp
...
See build/soong/README.md for more information.
Test: mmma -j system/core/libusbhost
Change-Id: I57109380678bd452af545d4c5b1b9d2356b356b8
2017-04-20 08:37:12 -07:00
Mark Salyzyn
5643587311
Merge "logd: statistics add logspan" am: e32517d773 am: 2ad8ed5138
...
am: 58871c8338
2017-04-20 15:31:22 +00:00
Mark Salyzyn
58871c8338
Merge "logd: statistics add logspan" am: e32517d773
...
am: 2ad8ed5138
2017-04-20 15:28:18 +00:00
