Tom Cherry
e267d4f00a
Merge "init: delete code that sets ro.recovery_id" am: 8a5943b37d am: 9684bccca1
...
am: 2d860a1990
2019-01-29 17:34:09 -08:00
Tom Cherry
2d860a1990
Merge "init: delete code that sets ro.recovery_id" am: 8a5943b37d
...
am: 9684bccca1
2019-01-29 17:28:56 -08:00
Tom Cherry
9684bccca1
Merge "init: delete code that sets ro.recovery_id"
...
am: 8a5943b37d
2019-01-29 17:24:42 -08:00
Sandeep Patil
16e70339e0
Merge "meminfo: Remove libpagemap dependency" am: 4d37665330 am: 94ce79c46a
...
am: e44fa13c36
2019-01-29 17:12:26 -08:00
Treehugger Robot
8a5943b37d
Merge "init: delete code that sets ro.recovery_id"
2019-01-30 01:11:40 +00:00
Sandeep Patil
e44fa13c36
Merge "meminfo: Remove libpagemap dependency" am: 4d37665330
...
am: 94ce79c46a
2019-01-29 17:07:55 -08:00
Sandeep Patil
94ce79c46a
Merge "meminfo: Remove libpagemap dependency"
...
am: 4d37665330
2019-01-29 17:00:36 -08:00
Treehugger Robot
4d37665330
Merge "meminfo: Remove libpagemap dependency"
2019-01-30 00:54:42 +00:00
Josh Gao
71b815f797
Merge "adb: turn off fastdeploy." am: 82f0e7dad8 am: 90aadf880d
...
am: a3de92be6c
2019-01-29 16:42:58 -08:00
Josh Gao
a3de92be6c
Merge "adb: turn off fastdeploy." am: 82f0e7dad8
...
am: 90aadf880d
2019-01-29 16:26:37 -08:00
Christopher Ferris
41cbc227a1
Merge "Fix bug in unwind_info display of exidx frame." am: f835ba6b66 am: a2a376964d
...
am: d89bc01f4e
2019-01-29 16:13:22 -08:00
Josh Gao
90aadf880d
Merge "adb: turn off fastdeploy."
...
am: 82f0e7dad8
2019-01-29 16:10:32 -08:00
Christopher Ferris
d89bc01f4e
Merge "Fix bug in unwind_info display of exidx frame." am: f835ba6b66
...
am: a2a376964d
2019-01-29 15:53:18 -08:00
Josh Gao
82f0e7dad8
Merge "adb: turn off fastdeploy."
2019-01-29 23:50:07 +00:00
Christopher Ferris
a2a376964d
Merge "Fix bug in unwind_info display of exidx frame."
...
am: f835ba6b66
2019-01-29 15:34:32 -08:00
Yifan Hong
bdbd5111a7
Merge "healthd: update owners" am: accdf0e9c7 am: e400542192
...
am: 75b71ef6df
2019-01-29 15:23:36 -08:00
Christopher Ferris
f835ba6b66
Merge "Fix bug in unwind_info display of exidx frame."
2019-01-29 23:13:07 +00:00
Yifan Hong
75b71ef6df
Merge "healthd: update owners" am: accdf0e9c7
...
am: e400542192
2019-01-29 14:48:18 -08:00
Yifan Hong
e400542192
Merge "healthd: update owners"
...
am: accdf0e9c7
2019-01-29 14:40:53 -08:00
Treehugger Robot
accdf0e9c7
Merge "healthd: update owners"
2019-01-29 22:24:34 +00:00
Tom Cherry
d6c2feb9fa
init: delete code that sets ro.recovery_id
...
It looks like this code is dead currently. From history, this was
meant to be used as a way to check that the recovery image is what was
expected during runtime, but that effort never completed, and we have
full verification of the recovery image when booting into recovery
anyway.
The code is functionally dead as is too, since /recovery doesn't
actually exist in any fstab, since recovery is either mounted as a
ramdisk during recovery or not mounted during normal boot.
Test: boot
Change-Id: I48cd324ef0d5a163db2df2648f6042174b83f10e
2019-01-29 21:17:53 +00:00
Tom Cherry
facdaaa181
Merge "Add "instant app" boilerplate." am: 161c439ffb am: ab7c178fc3
...
am: 8166925f99
2019-01-29 13:12:21 -08:00
Tom Cherry
8166925f99
Merge "Add "instant app" boilerplate." am: 161c439ffb
...
am: ab7c178fc3
2019-01-29 13:04:49 -08:00
Tom Cherry
ab7c178fc3
Merge "Add "instant app" boilerplate."
...
am: 161c439ffb
2019-01-29 12:58:29 -08:00
Treehugger Robot
161c439ffb
Merge "Add "instant app" boilerplate."
2019-01-29 20:50:07 +00:00
Yifan Hong
75851f53dc
Merge "healthd: charger loads resources from /product" am: 9474063654 am: c85de61ada
...
am: 2e62511bcb
2019-01-29 12:30:31 -08:00
Yifan Hong
2e62511bcb
Merge "healthd: charger loads resources from /product" am: 9474063654
...
am: c85de61ada
2019-01-29 12:25:06 -08:00
Yifan Hong
c85de61ada
Merge "healthd: charger loads resources from /product"
...
am: 9474063654
2019-01-29 12:16:55 -08:00
Florian Mayer
d28fdd21de
Merge "Allow to move frames out of Unwinder." am: 9f5e9978c2 am: 319f022506
...
am: 813f909a2e
2019-01-29 11:59:16 -08:00
Yifan Hong
9474063654
Merge "healthd: charger loads resources from /product"
2019-01-29 19:57:11 +00:00
Florian Mayer
813f909a2e
Merge "Allow to move frames out of Unwinder." am: 9f5e9978c2
...
am: 319f022506
2019-01-29 11:47:00 -08:00
Florian Mayer
319f022506
Merge "Allow to move frames out of Unwinder."
...
am: 9f5e9978c2
2019-01-29 11:35:12 -08:00
Treehugger Robot
9f5e9978c2
Merge "Allow to move frames out of Unwinder."
2019-01-29 19:23:23 +00:00
Josh Gao
287e442dc4
adb: turn off fastdeploy.
...
The PDK doesn't have frameworks/base, so having a dependency from adb to
a library in there breaks the build. #ifdef out fastdeploy until we
figure out what we're going to do here, to unbreak the PDK build.
Bug: http://b/118782743
Test: treehugger
Change-Id: I638cf09e5013935e112c7a57dae0e7e94e1a4680
2019-01-29 11:21:15 -08:00
Tom Cherry
d722fbf4b0
Add "instant app" boilerplate.
...
Bug: 123366871
Test: treehugger
Change-Id: I2963aea53ae96651854bbbcb8e411add5183e523
2019-01-29 08:53:01 -08:00
Erick Reyes
f698c7bab3
Merge "meminfo: Add memtrack dmabufinfo library" am: 2cbdc561ad am: 3330640204
...
am: f2dcb675d3
2019-01-29 00:56:41 -08:00
Bowgo Tsai
417b2ed6d1
Merge "Adding libfs_avb host tests into presubmit" am: c90b0eafda am: 49ab41e7ab
...
am: fe578d0f17
2019-01-29 00:55:45 -08:00
Tom Cherry
7ce971d636
Merge "Remove extranous reading of fstab in BuilderTest::block_device_info" am: 47a4082f88 am: 9691e45085
...
am: 064a64167d
2019-01-29 00:53:50 -08:00
Tom Cherry
ab66380469
Merge "Remove the rest of users of the old style fstab" am: 286684f835 am: 9eaed18adb
...
am: cd12736426
2019-01-29 00:50:04 -08:00
Martin Stjernholm
019d501145
Merge "Add libnativebridge.so link to vndk_lite linker config." am: 0b6d56e68b am: 8f13a7f400
...
am: 8da4c5243c
2019-01-29 00:39:18 -08:00
Tom Cherry
f7d7e16d3c
Merge "fs_mgr: remove old fs_mgr functions that are not currently used" am: 2648b801ed am: acf95ae6d4
...
am: 3ef8a6575f
2019-01-28 23:57:34 -08:00
Erick Reyes
f2dcb675d3
Merge "meminfo: Add memtrack dmabufinfo library" am: 2cbdc561ad
...
am: 3330640204
2019-01-28 23:24:50 -08:00
Bowgo Tsai
fe578d0f17
Merge "Adding libfs_avb host tests into presubmit" am: c90b0eafda
...
am: 49ab41e7ab
2019-01-28 23:22:30 -08:00
Tom Cherry
064a64167d
Merge "Remove extranous reading of fstab in BuilderTest::block_device_info" am: 47a4082f88
...
am: 9691e45085
2019-01-28 23:17:55 -08:00
Tom Cherry
cd12736426
Merge "Remove the rest of users of the old style fstab" am: 286684f835
...
am: 9eaed18adb
2019-01-28 23:11:38 -08:00
Martin Stjernholm
8da4c5243c
Merge "Add libnativebridge.so link to vndk_lite linker config." am: 0b6d56e68b
...
am: 8f13a7f400
2019-01-28 23:05:33 -08:00
Tom Cherry
3ef8a6575f
Merge "fs_mgr: remove old fs_mgr functions that are not currently used" am: 2648b801ed
...
am: acf95ae6d4
2019-01-28 22:34:09 -08:00
Steven Moreland
9587ea753e
Merge "Move clang-formats to build." am: 66853db0a2 am: 9edd9ebe1d
...
am: 0d9c2b3991
2019-01-28 22:19:45 -08:00
Greg Kaiser
7beedaf0a5
Merge "adb: Fix incorrect logging statement" am: 32aaba6dcf am: d13559092c
...
am: c5ba3e1014
2019-01-28 22:18:26 -08:00
Tom Cherry
d8058ca840
Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 am: 561498e357 am: 80fba27032
...
am: 308f20ba24
2019-01-28 22:17:32 -08:00
