Tao Bao and Gerrit Code Review
04b4ff695d
Merge "recovery_ui: Remove RecoveryUI::last_key."
2019-07-09 22:04:33 +00:00
Josh Gao and android-build-merger
5d3b4fbba6
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 am: 32aeca8e78 am: fe0737868b
...
am: a96629a9bb
Change-Id: I8834c4cb307b3925eb1829d2261d6f11e581f763
2019-07-09 14:37:15 -07:00
Tianjie Xu
e521861508
Create a fallback to install from fuse if mmap fails
...
We may fail to memory map the package on 32 bit builds for packages with
2GiB+ size. This cl tries to install the package with fuse when memory map
fails in such cases.
Bug: 127071893
Test: build 32 bit version sailfish, push package and block.map, reboot into recovery with
the corresponding update_package argument.
Change-Id: I5dae4f3e27ccaf8d64ff3657d36f0e75db2330b0
2019-07-09 14:15:18 -07:00
Josh Gao and android-build-merger
a96629a9bb
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 am: 32aeca8e78
...
am: fe0737868b
Change-Id: I44b9dc695019c1ac6dcd0a08b6102e7251c61142
2019-07-09 14:11:38 -07:00
Josh Gao and android-build-merger
fe0737868b
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2
...
am: 32aeca8e78
Change-Id: I72b99fb7974be9e735cdd8637a4bfaea7afa5618
2019-07-09 13:57:53 -07:00
Josh Gao and android-build-merger
32aeca8e78
Merge "minadbd: delete unnecessary fdevent.h include."
...
am: e1701454b2
Change-Id: Iaca242da9406d1d30e8e9ec4b7958bc11485e9d8
2019-07-09 13:34:38 -07:00
Josh Gao and Gerrit Code Review
e1701454b2
Merge "minadbd: delete unnecessary fdevent.h include."
2019-07-09 20:02:29 +00:00
Tao Bao
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 ec28340cf3 ,
https://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
Tao Bao
2223e6a9f8
minadbd sends heartbeat to rescue service for getprop command.
...
We start minadbd and rescue services in two processes. In particular,
minadbd handles the requests from host, then communicates with rescue
service to do install/wipe works. When resuce service doesn't see any
request in a pre-defined timeout (currently 300s), rescue service will
exit to avoid endless waiting.
This CL changes minadbd to additionally send a no-op command to rescue
service as a heartbeat signal, so that host side can finish
time-consuming operations (e.g. downloading over network) while keeping
rescue service alive.
Bug: 136457446
Test: Enter resuce mode on blueline. Send `adb rescue getprop
ro.build.fingerprint` and check that rescue service doesn't exit.
Test: Stop sending the getprop command. Check that rescue service exits
after 300s.
Change-Id: Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531
2019-07-09 11:09:34 -07:00
Robin Lee and android-build-merger
3c18c36125
Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 am: 254e5c940b am: 2040283730
...
am: 0bbe38ed1e
Change-Id: Ie5fee017857e9f76184edb323da69c60b0c66942
2019-07-08 18:20:17 -07:00
Robin Lee and android-build-merger
0bbe38ed1e
Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 am: 254e5c940b
...
am: 2040283730
Change-Id: Id1e061da1299c46814ff125efef3bda613f7f748
2019-07-08 17:47:55 -07:00
Robin Lee and android-build-merger
2040283730
Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095
...
am: 254e5c940b
Change-Id: Ice3ba9af801cf9dfe4128248367088f090518043
2019-07-08 17:36:32 -07:00
Robin Lee and android-build-merger
254e5c940b
Merge "Add a GetMappedPackageLength to Updater"
...
am: 5135d1f095
Change-Id: I8368d36e84ba29f5f0bc88e89bcb606932d47a7a
2019-07-08 17:11:35 -07:00
Treehugger Robot and Gerrit Code Review
5135d1f095
Merge "Add a GetMappedPackageLength to Updater"
2019-07-08 23:12:38 +00:00
Josh Gao
290322b060
minadbd: delete unnecessary fdevent.h include.
...
Test: treehugger
Change-Id: I09e9850dabbd71bffbe568f240f9fde8b3743e5e
2019-07-08 15:54:33 -07:00
Robin Lee
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
Andreas Schneider and big biff
b0a0dbbab0
prebuilt: Add android.hardware.confirmationui@1.0 for /sbin/keystore
...
Change-Id: I62e68c137e9790392dd2fc44c2add990c2f408d6
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-07-04 00:39:02 +02:00
Xin Li and android-build-merger
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 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib456c0c8ee2dd5e041e8ffcdbb08c1de01fa32cd
2019-07-02 15:20:28 -07:00
Xin Li and android-build-merger
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
Change-Id: Ie3b14f8ec062de99e9f36222a52b0cb7762efcb1
2019-07-02 14:51:45 -07:00
Xin Li and android-build-merger
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 -s ours
am skip reason: subject contains skip directive
Change-Id: I147bce10af9c1ba213c45407e0808d4f4cff336b
2019-07-02 12:46:15 -07:00
Xin Li and android-build-merger
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 -s ours
am skip reason: subject contains skip directive
Change-Id: I53af26cc12b7f14f235d525fc7d8ed85415bb7b7
2019-07-02 11:59:45 -07:00
Xin Li and android-build-merger
a93c7ebf80
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s ours
...
am: 779d7d3a3d
Change-Id: Iff02a502acfab68f6e4d68c9fcafbf817901959d
2019-07-02 11:33:55 -07:00
Xin Li and android-build-merger
779d7d3a3d
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 457f7ea2fa -s ours
am skip reason: subject contains skip directive
Change-Id: Ib94a51bbc437761c7bbabb8f45d19102a57489d3
2019-07-02 10:01:34 -07:00
TreeHugger Robot and Android (Google) Code Review
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
Tianjie Xu and android-build-merger
42e8d5a878
Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422fa am: 304c389360
...
am: efdb35ac41
Change-Id: I15fbe315211bbe21ed32a7d467313b7ab72a7b57
2019-07-01 22:36:42 -07:00
Tianjie Xu and android-build-merger
efdb35ac41
Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422fa
...
am: 304c389360
Change-Id: I6a7e5721fdefc37955a7293d359c317471eb0b31
2019-07-01 22:26:40 -07:00
Tianjie Xu and android-build-merger
304c389360
Merge "Build libimgdiff as a host only library" am: 9341e970ba
...
am: b84b6422fa
Change-Id: If463bb7d777c824da38849bca8d715fd31a8e0ee
2019-07-01 22:16:39 -07:00
Tianjie Xu and android-build-merger
b84b6422fa
Merge "Build libimgdiff as a host only library"
...
am: 9341e970ba
Change-Id: I3b3a58f37469b07cc3f6e9eec801eec61e6d897f
2019-07-01 22:06:37 -07:00
Tianjie Xu and Gerrit Code Review
9341e970ba
Merge "Build libimgdiff as a host only library"
2019-07-02 04:27:44 +00:00
Xin Li
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
Tianjie Xu and android-build-merger
42b4e8abc1
Merge "Add unit tests for simulator" am: 4955648c4c am: 143b1d9aed am: ce2b33231e
...
am: 676791cea3
Change-Id: Iaedd2a7242fb38dd76ebb0b10381d5f39d52e29b
2019-06-28 11:41:32 -07:00
Tianjie Xu and android-build-merger
1bc7d52dbb
Merge "Rename product_services to system_ext" am: b9f356f581 am: b8e68bf831 am: 165fd3916e
...
am: bbb76d513b
Change-Id: Ibee26d312033073fd2af5b58189254193d30240a
2019-06-28 11:41:12 -07:00
Tianjie Xu and android-build-merger
cd1e0543ff
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db am: 116152d738 am: 378dda080b
...
am: 491a6abd01
Change-Id: Ibc83a5f3826bcbb7fac5573489f4ec36e9bbd884
2019-06-28 11:40:52 -07:00
Tianjie Xu and android-build-merger
676791cea3
Merge "Add unit tests for simulator" am: 4955648c4c am: 143b1d9aed
...
am: ce2b33231e
Change-Id: I92a1cf77649c500169d052f7e3c7defd5f5bb16d
2019-06-28 11:36:27 -07:00
Tianjie Xu and android-build-merger
bbb76d513b
Merge "Rename product_services to system_ext" am: b9f356f581 am: b8e68bf831
...
am: 165fd3916e
Change-Id: I9f279f9c8aaaff08e75a192caf11c8c07116cdd4
2019-06-28 11:36:09 -07:00
Tianjie Xu and android-build-merger
491a6abd01
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db am: 116152d738
...
am: 378dda080b
Change-Id: Id5d03b893021aaa57f819f70bb3829a22c59c08d
2019-06-28 11:35:50 -07:00
Tianjie Xu and android-build-merger
ce2b33231e
Merge "Add unit tests for simulator" am: 4955648c4c
...
am: 143b1d9aed
Change-Id: I8e77038c2b51751f6b2670aeb898d621a3d4a519
2019-06-28 11:29:26 -07:00
Tianjie Xu and android-build-merger
165fd3916e
Merge "Rename product_services to system_ext" am: b9f356f581
...
am: b8e68bf831
Change-Id: Ica5c92b3fc0d5b5aa4546ea64d845fe00b4a2c25
2019-06-28 11:29:06 -07:00
Tianjie Xu and android-build-merger
378dda080b
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db
...
am: 116152d738
Change-Id: Ic56b3a6926e13b97863d6bca684d45c75a279b7f
2019-06-28 11:28:47 -07:00
Tianjie Xu and android-build-merger
143b1d9aed
Merge "Add unit tests for simulator"
...
am: 4955648c4c
Change-Id: Ibf7c9092ea71f166c38f7feb644892d96f1da64c
2019-06-28 11:20:51 -07:00
Tianjie Xu and android-build-merger
b8e68bf831
Merge "Rename product_services to system_ext"
...
am: b9f356f581
Change-Id: I3b423d58a295b2cc5f9e2a57bf0e1c97a91e39ad
2019-06-28 11:20:14 -07:00
Tianjie Xu and android-build-merger
116152d738
Merge "Implement ShowMenu for StubRecoveryUI"
...
am: 6f114c72db
Change-Id: Id179a3a82c8d953d62dffc17b6d6d3307a0b9a44
2019-06-28 11:19:43 -07:00
Tianjie Xu
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
Tianjie Xu and Gerrit Code Review
4955648c4c
Merge "Add unit tests for simulator"
2019-06-28 17:47:23 +00:00
Tianjie Xu and Gerrit Code Review
b9f356f581
Merge "Rename product_services to system_ext"
2019-06-28 17:45:16 +00:00
Tianjie Xu and Gerrit Code Review
6f114c72db
Merge "Implement ShowMenu for StubRecoveryUI"
2019-06-28 17:45:01 +00:00
Justin Yun
7ba8f18590
Rename product_services to system_ext
...
Bug: 134359158
Test: build and boot
Change-Id: I2ea21a0e528bdbab7d2479b48c73e7f2274ecca5
2019-06-28 16:17:26 +09:00
Tao Bao and android-build-merger
3eda932237
Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4 am: 9b57172706 am: 18de138abd
...
am: cc849967ee
Change-Id: Ifd7f7adefe8800c03e6306f6111f6ded6aba981e
2019-06-27 16:18:16 -07:00
Tianjie Xu
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
Tao Bao and android-build-merger
cc849967ee
Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4 am: 9b57172706
...
am: 18de138abd
Change-Id: Ic584d1b5a8fb8cb29b439472d6ec945a582a7d46
2019-06-27 15:57:52 -07:00