5d3b4fbba6
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 am: 32aeca8e78 am: fe0737868b
...
am: a96629a9bb
2019-07-09 14:37:15 -07:00
a96629a9bb
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 am: 32aeca8e78
...
am: fe0737868b
2019-07-09 14:11:38 -07:00
fe0737868b
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2
...
am: 32aeca8e78
2019-07-09 13:57:53 -07:00
32aeca8e78
Merge "minadbd: delete unnecessary fdevent.h include."
...
am: e1701454b2
2019-07-09 13:34:38 -07:00
e1701454b2
Merge "minadbd: delete unnecessary fdevent.h include."
2019-07-09 20:02:29 +00:00
3c18c36125
Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 am: 254e5c940b am: 2040283730
...
am: 0bbe38ed1e
2019-07-08 18:20:17 -07:00
0bbe38ed1e
Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 am: 254e5c940b
...
am: 2040283730
2019-07-08 17:47:55 -07:00
2040283730
Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095
...
am: 254e5c940b
2019-07-08 17:36:32 -07:00
254e5c940b
Merge "Add a GetMappedPackageLength to Updater"
...
am: 5135d1f095
2019-07-08 17:11:35 -07:00
5135d1f095
Merge "Add a GetMappedPackageLength to Updater"
2019-07-08 23:12:38 +00:00
290322b060
minadbd: delete unnecessary fdevent.h include.
...
Test: treehugger
Change-Id: I09e9850dabbd71bffbe568f240f9fde8b3743e5e
2019-07-08 15:54:33 -07:00
1cf8eb7559
Add a GetMappedPackageLength to Updater
...
Corresponds to GetMappedPackageAddress.
There is at least one custom device recovery with an extension to copy
the package somewhere else as a backup. Ability to do this was removed
in change ag/955273.
Test: lunch cf_x86_tv-eng; make
Test: atest recovery_unit_test recovery_component_test
Change-Id: I0e61d8a8839c47721874526504ea03b9ca7bafa9
2019-07-08 19:30:11 +02:00
fafc3779e0
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s ours am: a20839f5d9
...
am: 6859bab6b8
2019-07-02 15:20:28 -07:00
6859bab6b8
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s ours
...
am: a20839f5d9
2019-07-02 14:51:45 -07:00
2cf14239d1
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s ours am: 779d7d3a3d
...
am: a93c7ebf80
2019-07-02 12:46:15 -07:00
a20839f5d9
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
...
am: 317fc9a2f1
2019-07-02 11:59:45 -07:00
a93c7ebf80
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s ours
...
am: 779d7d3a3d
2019-07-02 11:33:55 -07:00
779d7d3a3d
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 457f7ea2fa
2019-07-02 10:01:34 -07:00
317fc9a2f1
Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
2019-07-02 07:41:03 +00:00
42e8d5a878
Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422fa am: 304c389360
...
am: efdb35ac41
2019-07-01 22:36:42 -07:00
efdb35ac41
Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422fa
...
am: 304c389360
2019-07-01 22:26:40 -07:00
304c389360
Merge "Build libimgdiff as a host only library" am: 9341e970ba
...
am: b84b6422fa
2019-07-01 22:16:39 -07:00
b84b6422fa
Merge "Build libimgdiff as a host only library"
...
am: 9341e970ba
2019-07-01 22:06:37 -07:00
9341e970ba
Merge "Build libimgdiff as a host only library"
2019-07-02 04:27:44 +00:00
457f7ea2fa
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: Ie6d14269d9c86a85ff9e3ef4fc242edd48a58b1b
2019-07-01 20:58:36 +00:00
42b4e8abc1
Merge "Add unit tests for simulator" am: 4955648c4c am: 143b1d9aed am: ce2b33231e
...
am: 676791cea3
2019-06-28 11:41:32 -07:00
1bc7d52dbb
Merge "Rename product_services to system_ext" am: b9f356f581 am: b8e68bf831 am: 165fd3916e
...
am: bbb76d513b
2019-06-28 11:41:12 -07:00
cd1e0543ff
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db am: 116152d738 am: 378dda080b
...
am: 491a6abd01
2019-06-28 11:40:52 -07:00
676791cea3
Merge "Add unit tests for simulator" am: 4955648c4c am: 143b1d9aed
...
am: ce2b33231e
2019-06-28 11:36:27 -07:00
bbb76d513b
Merge "Rename product_services to system_ext" am: b9f356f581 am: b8e68bf831
...
am: 165fd3916e
2019-06-28 11:36:09 -07:00
491a6abd01
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db am: 116152d738
...
am: 378dda080b
2019-06-28 11:35:50 -07:00
ce2b33231e
Merge "Add unit tests for simulator" am: 4955648c4c
...
am: 143b1d9aed
2019-06-28 11:29:26 -07:00
165fd3916e
Merge "Rename product_services to system_ext" am: b9f356f581
...
am: b8e68bf831
2019-06-28 11:29:06 -07:00
378dda080b
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db
...
am: 116152d738
2019-06-28 11:28:47 -07:00
143b1d9aed
Merge "Add unit tests for simulator"
...
am: 4955648c4c
2019-06-28 11:20:51 -07:00
b8e68bf831
Merge "Rename product_services to system_ext"
...
am: b9f356f581
2019-06-28 11:20:14 -07:00
116152d738
Merge "Implement ShowMenu for StubRecoveryUI"
...
am: 6f114c72db
2019-06-28 11:19:43 -07:00
42d7779caf
Build libimgdiff as a host only library
...
Stop building libimgdiff on device because we are only running
patching there.
Test: unit tests pass
Change-Id: I4225c6b52a536617301a64c405e325799a303b40
2019-06-28 11:04:07 -07:00
4955648c4c
Merge "Add unit tests for simulator"
2019-06-28 17:47:23 +00:00
b9f356f581
Merge "Rename product_services to system_ext"
2019-06-28 17:45:16 +00:00
6f114c72db
Merge "Implement ShowMenu for StubRecoveryUI"
2019-06-28 17:45:01 +00:00
7ba8f18590
Rename product_services to system_ext
...
Bug: 134359158
Test: build and boot
Change-Id: I2ea21a0e528bdbab7d2479b48c73e7f2274ecca5
2019-06-28 16:17:26 +09:00
3eda932237
Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4 am: 9b57172706 am: 18de138abd
...
am: cc849967ee
2019-06-27 16:18:16 -07:00
c3a161e2b8
Add unit tests for simulator
...
Make sure the simulator succeeds executing common non-A/B update
functions.
Bug: 131911365
Test: run unit tests
Change-Id: I520ce6a8827539b88a9e36f9e67eec30d8b586d4
2019-06-27 16:17:05 -07:00
cc849967ee
Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4 am: 9b57172706
...
am: 18de138abd
2019-06-27 15:57:52 -07:00
09a8f76ac2
Implement ShowMenu for StubRecoveryUI
...
The ShowMenu in StubRecoveryUI used to return initial selection
immediately. This leads to an immediate reboot if we enter recovery
with a stub UI and wait for user's input. This cl changes the behavior
of stub UI's ShowMenu so that it waits keys in loop, and only returns in
the case of interruption or time out.
Bug: 130535924
Test: start recovery with a stub UI, wait for the timeout
Change-Id: I96ad8aad8930756b09101bb98ba5fbe7b53bcb37
2019-06-27 15:54:59 -07:00
18de138abd
Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4
...
am: 9b57172706
2019-06-27 15:38:36 -07:00
9b57172706
Merge "recovery_ui: Remove redundant menu creation."
...
am: 0ad3ec03e4
2019-06-27 15:27:33 -07:00
0ad3ec03e4
Merge "recovery_ui: Remove redundant menu creation."
2019-06-27 21:46:14 +00:00
fa8e02af7c
recovery_ui: Remove redundant menu creation.
...
Test: Boot into recovery and "Run graphics test".
Change-Id: Icbf1c230b4af57cf32b3c7a4b30ddbabc21d5618
2019-06-27 09:07:51 -07:00
Josh Gao
Robin Lee
Treehugger Robot
Xin Li
Tianjie Xu
Justin Yun
Tao Bao