Bowgo Tsai
2a64967b7a
Merge "Move adbd from root to system" into oc-mr1-dev
...
am: 0bb4cb6fa2
2017-08-18 06:06:49 +00:00
TreeHugger Robot
0bb4cb6fa2
Merge "Move adbd from root to system" into oc-mr1-dev
2017-08-18 03:52:36 +00:00
Jiyong Park
b62e979d72
Merge "Make the rs namespace visible" into oc-mr1-dev
...
am: f34814e06c
2017-08-18 03:15:40 +00:00
TreeHugger Robot
f34814e06c
Merge "Make the rs namespace visible" into oc-mr1-dev
2017-08-18 03:07:50 +00:00
Tom Cherry
2e9773a30a
Merge "init: fix copy/paste mistake" am: f85404521e am: ad42b33eaa am: c3398d9e87
...
am: 3cbfff1615
2017-08-18 02:36:28 +00:00
Tom Cherry
3cbfff1615
Merge "init: fix copy/paste mistake" am: f85404521e am: ad42b33eaa
...
am: c3398d9e87
2017-08-18 02:20:22 +00:00
Tom Cherry
c3398d9e87
Merge "init: fix copy/paste mistake" am: f85404521e
...
am: ad42b33eaa
2017-08-18 02:07:25 +00:00
Tom Cherry
ad42b33eaa
Merge "init: fix copy/paste mistake"
...
am: f85404521e
2017-08-18 01:55:43 +00:00
David Zeuthen
ac50df6884
Merge "fastboot: Add --disable-verity and --disable-verification options." into oc-mr1-dev
...
am: d14e75d43e
2017-08-18 01:50:31 +00:00
Treehugger Robot
f85404521e
Merge "init: fix copy/paste mistake"
2017-08-18 01:49:40 +00:00
TreeHugger Robot
d14e75d43e
Merge "fastboot: Add --disable-verity and --disable-verification options." into oc-mr1-dev
2017-08-18 01:34:50 +00:00
Tom Cherry
94f3bcdbc1
init: fix copy/paste mistake
...
Test: boot bullhead
Change-Id: I0fedb48a9684e21a27a1d260b84cb49a1038ce3f
2017-08-17 16:52:10 -07:00
Wei Wang
9f37a996ce
Merge "Skip unnecessary sleep during shutdown" am: e3e4ec7c97 am: 57f94aa4bc am: 0660919ccf
...
am: 7bba2bf2d9
2017-08-17 02:08:34 +00:00
Wei Wang
7bba2bf2d9
Merge "Skip unnecessary sleep during shutdown" am: e3e4ec7c97 am: 57f94aa4bc
...
am: 0660919ccf
2017-08-17 02:03:05 +00:00
Wei Wang
0660919ccf
Merge "Skip unnecessary sleep during shutdown" am: e3e4ec7c97
...
am: 57f94aa4bc
2017-08-17 01:56:17 +00:00
Wei Wang
57f94aa4bc
Merge "Skip unnecessary sleep during shutdown"
...
am: e3e4ec7c97
2017-08-17 01:54:18 +00:00
Wei Wang
e3e4ec7c97
Merge "Skip unnecessary sleep during shutdown"
2017-08-17 01:46:17 +00:00
David Zeuthen
34c001bff2
fastboot: Add --disable-verity and --disable-verification options.
...
This can be used to disable verity and/or verification when flashing a
build to a device. It works with both 'fastboot flashall' and
'fastboot flash vbmeta /path/to/vbmeta.img'.
Bug: 62903976
Test: Manually tested.
Merged-In: Iad22d42a9dd5befd70ecd0224803721a10a28d90
Change-Id: Iad22d42a9dd5befd70ecd0224803721a10a28d90
(cherry picked from commit b6ea435a20
2017-08-17 09:28:53 +08:00
Wei Wang
8c00e42f20
Skip unnecessary sleep during shutdown
...
Skip sleep if timeout is zero
Skip sleep if first pass umount succeed
Bug: 64768138
Test: reboot
Change-Id: I5ef731611320ade51974b414f7e47520ce36b287
2017-08-16 15:41:12 -07:00
Ting-Yuan Huang
119f0f8d9c
Merge "Fix a potential memory leak" am: f583ff660e am: 6677429bff am: 6deffe3c3b
...
am: 78a298ce24
2017-08-16 18:00:15 +00:00
Ting-Yuan Huang
78a298ce24
Merge "Fix a potential memory leak" am: f583ff660e am: 6677429bff
...
am: 6deffe3c3b
2017-08-16 17:34:11 +00:00
Ting-Yuan Huang
6deffe3c3b
Merge "Fix a potential memory leak" am: f583ff660e
...
am: 6677429bff
2017-08-16 17:18:44 +00:00
Ting-Yuan Huang
6677429bff
Merge "Fix a potential memory leak"
...
am: f583ff660e
2017-08-16 17:06:44 +00:00
Treehugger Robot
f583ff660e
Merge "Fix a potential memory leak"
2017-08-16 16:55:54 +00:00
Jiyong Park
421a5e46b7
Make the rs namespace visible
...
This allows us to dlopen libRS_internal.so directly from the rs
namespace, not from the sphal namespace.
Bug: 64747884
Test: VtsHalRenderscriptV1_0TargetTest successful on the device built
with BOARD_VNDK_VERSION=current and [system] namespace config is applied
to /data/nativetest[64]/* processes.
Change-Id: I0b441791e395798e80a84592ca01e771bb1c201a
2017-08-16 23:32:54 +09:00
Narayan Kamath
8310613c37
Merge "zip_archive: reject files that don't start with an LFH signature." into oc-mr1-dev
...
am: b669c3311b
2017-08-16 14:02:30 +00:00
Narayan Kamath
b669c3311b
Merge "zip_archive: reject files that don't start with an LFH signature." into oc-mr1-dev
2017-08-16 13:58:49 +00:00
Jocelyn Bohr
4a6626980c
Merge "Pass in message_version_ received from the secure side." am: 1a955faab2 am: 4e8bbb968c am: 3a5d47af18
...
am: eb7207dbcd
2017-08-16 00:25:56 +00:00
Jocelyn Bohr
eb7207dbcd
Merge "Pass in message_version_ received from the secure side." am: 1a955faab2 am: 4e8bbb968c
...
am: 3a5d47af18
2017-08-16 00:13:37 +00:00
Christopher Ferris
a7144996b3
Merge "Decrease size of LogBufferElements to 32 bytes." into oc-mr1-dev
...
am: 0ef26c63da
2017-08-16 00:07:41 +00:00
Hung-ying Tyan
52723d68f9
Merge "Remove nvram trusty implementation." into oc-mr1-dev
...
am: 46691ee85c
2017-08-16 00:07:04 +00:00
Jocelyn Bohr
3a5d47af18
Merge "Pass in message_version_ received from the secure side." am: 1a955faab2
...
am: 4e8bbb968c
2017-08-16 00:04:05 +00:00
Christopher Ferris
0ef26c63da
Merge "Decrease size of LogBufferElements to 32 bytes." into oc-mr1-dev
2017-08-15 23:54:30 +00:00
Jocelyn Bohr
4e8bbb968c
Merge "Pass in message_version_ received from the secure side."
...
am: 1a955faab2
2017-08-15 23:53:32 +00:00
Ting-Yuan Huang
f26cf6d520
Fix a potential memory leak
...
Test: Built without seeing the warnings
Change-Id: I934509c78482af9ef7dc447c807f6450484b4b38
2017-08-15 16:48:24 -07:00
TreeHugger Robot
46691ee85c
Merge "Remove nvram trusty implementation." into oc-mr1-dev
2017-08-15 23:46:44 +00:00
Treehugger Robot
1a955faab2
Merge "Pass in message_version_ received from the secure side."
2017-08-15 23:35:48 +00:00
Elliott Hughes
d02d846a86
Don't include the build number in the adbd binary.
...
am: 2e93eda69c
2017-08-15 20:16:41 +00:00
Elliott Hughes
2e93eda69c
Don't include the build number in the adbd binary.
...
We want repeatable builds for minimal OTAs.
Bug: http://b/64634017
Bug: 64709603 (presubmit balking at the line above)
Test: repeated builds after `touch daemon/main.cpp` keep same md5sum
Change-Id: Iedeb44377ea45bbf20e2212760802198a57dc14a
2017-08-15 20:07:04 +00:00
Christopher Ferris
2cf55995a1
Decrease size of LogBufferElements to 32 bytes.
...
- Remove virtual from the destructor.
- Remove mTag and derive it when calling getTag().
- Add a boolean mDropped to tell when a message is dropped.
- When dropping a message, and it contains valid tag data, reallocate
the message to only contain the tag data.
- Add the packed tag to the class.
This saves about ~150K of PSS on a typical log stream since it moves the
size of the LogBufferElement from 48 bytes to 32 bytes which puts it in
a smaller bin.
Bug: 63792187
Test: Builds, unit tests pass.
Change-Id: Ia5afce343ea3d344fcecd78c648338e94f5c9312
(cherry picked from commit 74e74f96a7
2017-08-15 13:03:13 -07:00
Christopher Ferris
9e87cb031d
Merge "Decrease size of LogBufferElements to 32 bytes." am: 44ad937411 am: e23b30a6da am: 90c25cbdd3
...
am: 784d6626fb
2017-08-15 17:15:02 +00:00
Christopher Ferris
784d6626fb
Merge "Decrease size of LogBufferElements to 32 bytes." am: 44ad937411 am: e23b30a6da
...
am: 90c25cbdd3
2017-08-15 17:09:59 +00:00
Christopher Ferris
90c25cbdd3
Merge "Decrease size of LogBufferElements to 32 bytes." am: 44ad937411
...
am: e23b30a6da
2017-08-15 17:05:03 +00:00
Christopher Ferris
e23b30a6da
Merge "Decrease size of LogBufferElements to 32 bytes."
...
am: 44ad937411
2017-08-15 17:00:02 +00:00
Christopher Ferris
44ad937411
Merge "Decrease size of LogBufferElements to 32 bytes."
2017-08-15 16:53:56 +00:00
Narayan Kamath
c1a56dcab7
zip_archive: reject files that don't start with an LFH signature.
...
Bug: 64211847
Test: zip_archive_test
Change-Id: I275e7c4da05ceeb20401b560c72294f29ef63642
2017-08-15 13:44:05 +01:00
Hung-ying Tyan
98a48d8e4b
Remove nvram trusty implementation.
...
Bug: 64705490
Test: build pass
Change-Id: I32a1565ec935fff1c45540442134a37b55702752
2017-08-15 18:52:42 +08:00
Jiyong Park
13a3a0d30f
Merge "Mark libsync as LL-NDK" into oc-mr1-dev
...
am: f7ad622264
2017-08-15 10:32:35 +00:00
TreeHugger Robot
f7ad622264
Merge "Mark libsync as LL-NDK" into oc-mr1-dev
2017-08-15 10:23:26 +00:00
Justin Yun
27e501f100
Merge "Add libft2.so to ll-ndk for rs namespace" into oc-mr1-dev
...
am: acda9cba2e
2017-08-15 10:23:08 +00:00
