Xin Li
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
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
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
Tianjie Xu
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
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
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
b84b6422fa
Merge "Build libimgdiff as a host only library"
...
am: 9341e970ba
Change-Id: I3b3a58f37469b07cc3f6e9eec801eec61e6d897f
2019-07-01 22:06:37 -07:00
Tianjie Xu
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
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
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
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
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
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
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
ce2b33231e
Merge "Add unit tests for simulator" am: 4955648c4c
...
am: 143b1d9aed
Change-Id: I8e77038c2b51751f6b2670aeb898d621a3d4a519
2019-06-28 11:29:26 -07:00
Tianjie Xu
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
378dda080b
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db
...
am: 116152d738
Change-Id: Ic56b3a6926e13b97863d6bca684d45c75a279b7f
2019-06-28 11:28:47 -07:00
Tianjie Xu
143b1d9aed
Merge "Add unit tests for simulator"
...
am: 4955648c4c
Change-Id: Ibf7c9092ea71f166c38f7feb644892d96f1da64c
2019-06-28 11:20:51 -07:00
Tianjie Xu
b8e68bf831
Merge "Rename product_services to system_ext"
...
am: b9f356f581
Change-Id: I3b423d58a295b2cc5f9e2a57bf0e1c97a91e39ad
2019-06-28 11:20:14 -07:00
Tianjie Xu
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
4955648c4c
Merge "Add unit tests for simulator"
2019-06-28 17:47:23 +00:00
Tianjie Xu
b9f356f581
Merge "Rename product_services to system_ext"
2019-06-28 17:45:16 +00:00
Tianjie Xu
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
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
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
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
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
9b57172706
Merge "recovery_ui: Remove redundant menu creation."
...
am: 0ad3ec03e4
Change-Id: Ied20e2cb3b6eb91cc819242b3782cf2fd5021e83
2019-06-27 15:27:33 -07:00
Treehugger Robot
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
dc267f46ce
Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7 am: 3aaf87cf4e am: a2a500381a
...
am: eaacfc1362
Change-Id: Ib410c48f9253468f03468c21fdf3e7fc36e7881b
2019-06-24 14:46:28 -07:00
Tianjie Xu
eaacfc1362
Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7 am: 3aaf87cf4e
...
am: a2a500381a
Change-Id: I9a82bd762e22a1bc6868084912b4d54217709429
2019-06-24 14:36:30 -07:00
Tianjie Xu
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
3aaf87cf4e
Merge "Implement updater runtime for dynamic partitions"
...
am: db0a68e6b7
Change-Id: I3de90cb6730b05cb1d238131a5d474e20d48890c
2019-06-24 14:28:55 -07:00
Treehugger Robot
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
a46af60399
Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b am: b50f855396 am: 00d4092790
...
am: c467b32bdb
Change-Id: I3532ccf5a602e60b308a15e670b589823680d553
2019-06-24 10:36:00 -07:00
Tao Bao
c467b32bdb
Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b am: b50f855396
...
am: 00d4092790
Change-Id: I46235b57a1845503698e280452b55a87e3d29842
2019-06-24 10:17:16 -07:00
Tao Bao
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
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
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
877381c08f
Merge "Support starting fuse from a block map" am: 090b62832f am: b96f2bf618 am: a51a41101a
...
am: fe52eb7869
Change-Id: Iae78957aff06d62c3a3fba61ada09e512281e757
2019-06-21 11:10:20 -07:00
Tianjie Xu
fe52eb7869
Merge "Support starting fuse from a block map" am: 090b62832f am: b96f2bf618
...
am: a51a41101a
Change-Id: I0e71e89b2cf9d81fe30db5666e5dfec4282fb221
2019-06-21 10:59:16 -07:00
Tianjie Xu
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
b96f2bf618
Merge "Support starting fuse from a block map"
...
am: 090b62832f
Change-Id: I7f90b15d7ab0cf00b66ac242954490112cbd661d
2019-06-21 10:41:10 -07:00