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
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
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
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
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
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
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
Tianjie Xu
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
Tao Bao and android-build-merger
18de138abd
Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4
...
am: 9b57172706
Change-Id: Iafb11e2631ffb889c12293f82a9fce2af00e8f7c
2019-06-27 15:38:36 -07:00
Tao Bao and android-build-merger
9b57172706
Merge "recovery_ui: Remove redundant menu creation."
...
am: 0ad3ec03e4
Change-Id: Ied20e2cb3b6eb91cc819242b3782cf2fd5021e83
2019-06-27 15:27:33 -07:00
Treehugger Robot and Gerrit Code Review
0ad3ec03e4
Merge "recovery_ui: Remove redundant menu creation."
2019-06-27 21:46:14 +00:00
Tao Bao
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
Tianjie Xu and android-build-merger
a2a500381a
Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7
...
am: 3aaf87cf4e
Change-Id: I66feb637884013458816bb89e766aedb39bef990
2019-06-24 14:32:30 -07:00
Tianjie Xu and android-build-merger
3aaf87cf4e
Merge "Implement updater runtime for dynamic partitions"
...
am: db0a68e6b7
Change-Id: I3de90cb6730b05cb1d238131a5d474e20d48890c
2019-06-24 14:28:55 -07:00
Treehugger Robot and Gerrit Code Review
db0a68e6b7
Merge "Implement updater runtime for dynamic partitions"
2019-06-24 20:24:49 +00:00
Tianjie Xu
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
Tao Bao and android-build-merger
00d4092790
Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b
...
am: b50f855396
Change-Id: If1cc36794ce4dd4a14b6e1225c025305a95d793e
2019-06-24 09:24:31 -07:00
Tao Bao and android-build-merger
b50f855396
Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default."
...
am: b87520077b
Change-Id: I1098551642eda063cc2c0c19cc36ce10cbf58804
2019-06-24 08:57:34 -07:00
Treehugger Robot and Gerrit Code Review
b87520077b
Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default."
2019-06-24 15:41:27 +00:00
Tao Bao
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
Tianjie Xu and android-build-merger
a51a41101a
Merge "Support starting fuse from a block map" am: 090b62832f
...
am: b96f2bf618
Change-Id: I2a201ebe2a2bdcdfac1a2ffbf8c948b9df1b8c76
2019-06-21 10:51:22 -07:00
Tianjie Xu and android-build-merger
b96f2bf618
Merge "Support starting fuse from a block map"
...
am: 090b62832f
Change-Id: I7f90b15d7ab0cf00b66ac242954490112cbd661d
2019-06-21 10:41:10 -07:00
Tianjie Xu and Gerrit Code Review
090b62832f
Merge "Support starting fuse from a block map"
2019-06-21 17:14:10 +00:00
Tianjie Xu and android-build-merger
252f3d3392
Merge "Implement the TargetFile and BuildInfo" am: 9b76970e9a
...
am: 75c4b32e3a
Change-Id: I2eec826e00d4a9fbe2660c76d49d78be886406c8
2019-06-20 17:29:04 -07:00
Tianjie Xu and android-build-merger
75c4b32e3a
Merge "Implement the TargetFile and BuildInfo"
...
am: 9b76970e9a
Change-Id: I2d188eae7305bb82c7407bcbb04282b65768dde1
2019-06-20 17:17:56 -07:00
Tianjie Xu and Gerrit Code Review
9b76970e9a
Merge "Implement the TargetFile and BuildInfo"
2019-06-20 22:39:42 +00:00
Tianjie Xu
f6158eb918
Support starting fuse from a block map
...
Factor out a new function from ApplyFromSdcard that installs a package
from a local path. Inside this function, we start the fuse and choose the
type of data provider depending on the path string. And similar to the
existing logic, we treat the package as a block map if the path starts
with a '@'.
This is part of the effort to install larger than 2GiB packages on ILP32
devices.
Bug: 127071893
Test: Build a 32 bit sailfish and create a 3GiB OTA package. Sideload
the package, uncrypt and install the package from sdcard.
Change-Id: I328ea34fa530731acbce7554bfc3059313ad6ece
2019-06-20 13:53:40 -07:00
Zhijun He and android-build-merger
81e341f224
Revert "libprocessgroup users use libcutils"
...
am: cdbd84de26
Change-Id: Ie511de7ec122730be63bca07eb4f3eda9bff266b
2019-06-18 22:50:33 -07:00
Zhijun He
cdbd84de26
Revert "libprocessgroup users use libcutils"
...
This reverts commit 46ec20b692 .
Reason for revert: breaks all camera use cases
Bug: 135568875
Change-Id: I86747c0df5489f80d1966dd07669637597fb2b00
2019-06-19 04:44:04 +00:00
Steven Moreland and android-build-merger
60f68c7862
libprocessgroup users use libcutils
...
am: 46ec20b692
Change-Id: If70f26c1294fb892eb517e945a76a120b7b4c324
2019-06-18 16:48:39 -07:00