e4e0fa1d1e
Merge "Change the symlink to system_ext" am: c992962503
...
am: 29adb8f0f2
2019-07-09 22:13:17 -07:00
29adb8f0f2
Merge "Change the symlink to system_ext"
...
am: c992962503
2019-07-09 22:05:14 -07:00
c992962503
Merge "Change the symlink to system_ext"
2019-07-10 04:39:52 +00:00
4b6a9c52ea
Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d
...
am: 4324e07a29
2019-07-09 16:38:29 -07:00
ea3c4a4948
Change the symlink to system_ext
...
As system_ext partition will be linked to system/system_ext, update
the path to system/system_ext.
Bug: 134359158
Test: build
Change-Id: I5a49adfe7e045e24bf6dfbf6990a965b8a5e1ce1
2019-07-09 23:33:26 +00:00
4324e07a29
Merge "recovery_ui: Remove RecoveryUI::last_key."
...
am: 04b4ff695d
2019-07-09 16:27:30 -07:00
04b4ff695d
Merge "recovery_ui: Remove RecoveryUI::last_key."
2019-07-09 22:04:33 +00: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
1df3ce7ea8
recovery_ui: Remove RecoveryUI::last_key.
...
It's a private member, and the last user has been removed in [1] in
2015.
[1] commit ec28340cf3https://android-review.googlesource.com/c/platform/bootable/recovery/+/146330
Test: mmma -j bootable/recovery
Change-Id: I65a2370cb20a7b296888425a44a42c8b90abc766
2019-07-09 11:21:18 -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
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
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
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
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
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
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
a2a500381a
Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7
...
am: 3aaf87cf4e
2019-06-24 14:32:30 -07:00
3aaf87cf4e
Merge "Implement updater runtime for dynamic partitions"
...
am: db0a68e6b7
2019-06-24 14:28:55 -07:00
db0a68e6b7
Merge "Implement updater runtime for dynamic partitions"
2019-06-24 20:24:49 +00:00
d118833f3e
Implement updater runtime for dynamic partitions
...
The simulator skips executing the operations for dynamic partitions, and
will use the logical images under target_files/IMAGES directly. (Similar
to the targets without DAP enabled)
Bug: 131911365
Test: run update on cuttlefish, run simulator
Change-Id: Id318d97ece4560df9f20dc5cabeb8b2e261bdf9c
2019-06-24 12:46:28 -07:00
00d4092790
Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b
...
am: b50f855396
2019-06-24 09:24:31 -07:00
b50f855396
Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default."
...
am: b87520077b
2019-06-24 08:57:34 -07:00
b87520077b
Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default."
2019-06-24 15:41:27 +00:00
061267eee9
updater_sample: Build SystemUpdaterSample as non-privileged app by default.
...
Prior to the change, SystemUpdaterSample was built as privileged app.
It must be installed along with the matching privapp-permissions
whitelist change (as noted in updater_sample/README.md), otherwise would
block device booting if installed unintentionally (e.g. with `mm` or
`mmma`).
This CL avoids putting the device in a bad state due to a sample app.
Fixes: 135703777
Test: `lunch aosp_taimen-userdebug && m -j installclean &&
mmma -j bootable/recovery && m -j`
Flash on device and boot successfully.
Test: Run the tests per instructions in updater_sample/README.md.
Change-Id: Ib8b587c77570f05f7db748fad84744fa45016aab
2019-06-21 12:10:36 -07:00
a51a41101a
Merge "Support starting fuse from a block map" am: 090b62832f
...
am: b96f2bf618
2019-06-21 10:51:22 -07:00
b96f2bf618
Merge "Support starting fuse from a block map"
...
am: 090b62832f
2019-06-21 10:41:10 -07:00
Justin Yun
Treehugger Robot
Tao Bao
Josh Gao
Robin Lee
Xin Li
Tianjie Xu