Zhomart Mukhamejanov and android-build-merger
22fb42b53f
Merge "updater_sample: add updater state" am: c290e088ed
...
am: 4e17087235
Change-Id: I698a9821d0e452e47a379051d68142f633ddb20a
2018-05-25 11:18:38 -07:00
Treehugger Robot and Gerrit Code Review
44e857390a
Merge "updater_sample: Add OWNERS."
2018-05-25 18:15:13 +00:00
Zhomart Mukhamejanov and android-build-merger
4e17087235
Merge "updater_sample: add updater state"
...
am: c290e088ed
Change-Id: I714b69a34be85fa46df2f533328a20efe45c5f83
2018-05-25 11:13:06 -07:00
Zhomart Mukhamejanov and Gerrit Code Review
c290e088ed
Merge "updater_sample: add updater state"
2018-05-25 18:03:17 +00:00
Tao Bao
35db9cf666
updater_sample: Add OWNERS.
...
Test: N/A
Change-Id: I519a0fa38b87c7d826ed07414d14a4f7a858aeb4
2018-05-25 09:43:08 -07:00
Zhomart Mukhamejanov
8f4059d603
updater_sample: add updater state
...
- Add util.UpdaterStates - the state of SystemUpdaterSample.
It's different from status of UpdateEngine;
when UpdateEngine#cancel is used to suspend the update,
UpdateEngine sets status to IDLE, which cannot be used
to track the suspended state.
- UI: Change 'Update status' to 'Engine status'.
- UI: Change 'Update completion' to 'Engine error code'.
- UI: Add 'Updater state'.
Test: manually on the device
Test: using JUnit4
Change-Id: I9c58b5ed0eae3be7ab8b217fc01a621e8fb2f4bf
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-05-25 16:25:34 +00:00
Tao Bao and android-build-merger
5d63c909ab
Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6 am: 17d46f2551
...
am: b78304e9c1
Change-Id: If12310f16affc88d6b7d52ee3ab91bfb8a26c5a0
2018-05-25 00:32:59 -07:00
Jiyong Park and android-build-merger
c5e16710e1
Merge "Mark as recovery_available:true" am: ddf2947359 am: 6d81f8732c
...
am: 63f4683ba7
Change-Id: I41a553d596e53b8673d44fac83ba04ee8b6e2aaf
2018-05-25 00:21:25 -07:00
Tao Bao and android-build-merger
b78304e9c1
Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6
...
am: 17d46f2551
Change-Id: Id67f00ecda761245c7a4ea7862542a2fd3f306d1
2018-05-24 23:41:49 -07:00
Tao Bao and android-build-merger
17d46f2551
Merge "tests: Setup last_command_file for UpdaterTest."
...
am: d1e0cda4d6
Change-Id: I8c1ea753886f284d1e8462e16b06968ebdffc874
2018-05-24 23:37:48 -07:00
Tao Bao and Gerrit Code Review
d1e0cda4d6
Merge "tests: Setup last_command_file for UpdaterTest."
2018-05-25 06:30:36 +00:00
Jiyong Park and android-build-merger
63f4683ba7
Merge "Mark as recovery_available:true" am: ddf2947359
...
am: 6d81f8732c
Change-Id: I9b646784d89ccaf09074ae921d8bc0741479b3aa
2018-05-24 23:15:01 -07:00
Jiyong Park and android-build-merger
6d81f8732c
Merge "Mark as recovery_available:true"
...
am: ddf2947359
Change-Id: I1fbe5d274f1f1b5a00675a80fa9ad76cd603b042
2018-05-24 23:06:29 -07:00
Treehugger Robot and Gerrit Code Review
ddf2947359
Merge "Mark as recovery_available:true"
2018-05-25 05:58:01 +00:00
Tao Bao
7064aa2862
tests: Setup last_command_file for UpdaterTest.
...
Otherwise tests may interfere with each other by using the same / default
location.
Test: Run recovery_component_test on marlin.
Change-Id: I6b0455489f2fdce819009964dd92bfd9bfeb06ef
2018-05-24 21:49:58 -07:00
Tao Bao and android-build-merger
498e284c78
Merge "tests: Refactor the common lines in UpdaterTest." am: faa47854f4 am: 83e341e754
...
am: f4b2c3645e
Change-Id: Ie2860f2e5502071b8a52802a917795ddf751c744
2018-05-24 19:20:03 -07:00
Tianjie Xu and android-build-merger
0ae5022187
Merge "Convert deflate image chunks to raw if the raw data is smaller" am: fc0f04cba7 am: 8e72eb7077
...
am: 93938c10f1
Change-Id: Ib7029502657788ffa18369091dc8eb38065d4369
2018-05-24 19:15:30 -07:00
Zhomart Mukhamejanov and android-build-merger
f0e5627cd2
Merge "updater_sample: create UpdateManager" am: 2a0b23bdf6 am: dd885ab568
...
am: 8706d3336e
Change-Id: Iee35bb02b776a9f5214c43df714d57a068cea162
2018-05-24 18:59:54 -07:00
Tao Bao and android-build-merger
f4b2c3645e
Merge "tests: Refactor the common lines in UpdaterTest." am: faa47854f4
...
am: 83e341e754
Change-Id: I14a0f04552fdbe0f61e374438107ed845331f5a1
2018-05-24 16:18:45 -07:00
Tianjie Xu and android-build-merger
93938c10f1
Merge "Convert deflate image chunks to raw if the raw data is smaller" am: fc0f04cba7
...
am: 8e72eb7077
Change-Id: Ie2b2b87adcb4f80d2e895e7de4f1b200f721394c
2018-05-24 16:17:57 -07:00
Tao Bao and android-build-merger
83e341e754
Merge "tests: Refactor the common lines in UpdaterTest."
...
am: faa47854f4
Change-Id: Ib674f713c68985ddc826fba83c6bdaaa3c06d623
2018-05-24 16:11:53 -07:00
Tao Bao and Gerrit Code Review
faa47854f4
Merge "tests: Refactor the common lines in UpdaterTest."
2018-05-24 23:03:05 +00:00
Tianjie Xu and android-build-merger
8e72eb7077
Merge "Convert deflate image chunks to raw if the raw data is smaller"
...
am: fc0f04cba7
Change-Id: I9873d3ef545bb3880a863e76a3782ff119f6c29c
2018-05-24 15:58:51 -07:00
Tianjie Xu and Gerrit Code Review
fc0f04cba7
Merge "Convert deflate image chunks to raw if the raw data is smaller"
2018-05-24 22:42:54 +00:00
Zhomart Mukhamejanov and android-build-merger
8706d3336e
Merge "updater_sample: create UpdateManager" am: 2a0b23bdf6
...
am: dd885ab568
Change-Id: I7a93e763640a3e318348e388cc9adb0dcaf1513e
2018-05-24 14:28:35 -07:00
Tianjie Xu
cc61cf6a9f
Convert deflate image chunks to raw if the raw data is smaller
...
The imgpatch will fail on empty deflates because the bspatch won't call
the sink function if the target length is zero.
Instead of compressing an empty string, it's cleaner to not generate such
empty deflate chunks in the patch. Therefore, we can just convert the
chunk type to raw if the target length is smaller than the patch data.
Also adjust some unit tests and add the testdata gzipped_source &
gzipped_target. These two files are ~1K each and are generated by
gzipping two slightly different regular files.
Bug: 79265132
Test: unit tests pass, imgpatch applys successfully on the given src/tgt
Change-Id: I6bfff3251918137f6762a6f9e9551642371a1124
2018-05-24 10:49:54 -07:00
Zhomart Mukhamejanov and android-build-merger
dd885ab568
Merge "updater_sample: create UpdateManager"
...
am: 2a0b23bdf6
Change-Id: I2d01925d91b028ff9a86aadf2cc8a478c3e42c78
2018-05-24 10:44:06 -07:00
Zhomart Mukhamejanov and Gerrit Code Review
2a0b23bdf6
Merge "updater_sample: create UpdateManager"
2018-05-24 16:10:56 +00:00
Tao Bao
bc4a6d59f6
tests: Refactor the common lines in UpdaterTest.
...
Move the common codes into RunBlockImageUpdate(). Also clean up the
partition updated marker after running each test.
Test: Run recovery_component_test on marlin.
Change-Id: Id4302e4da4c664231b737a1e83d2e164ef58ed97
2018-05-24 00:15:56 -07:00
Jiyong Park
fafcfccc3c
Mark as recovery_available:true
...
Libraries that are direct or indirect dependencies of modules installed
to recovery partition (e.g. adbd) are marked as recovery_available:
true. This allows a recovery variant of the lib is created when it is
depended by other recovery or recovery_available modules.
Bug: 79146551
Test: m -j
Change-Id: I9ca07ef53fbd89e7c86c0ba269fa52bb48d6deb4
2018-05-24 14:04:32 +09:00
Zhomart Mukhamejanov
6f26e71263
updater_sample: create UpdateManager
...
- Add UpdateManager - responsible for the update logic.
Now ui.MainActivity is responsible for only UI.
- Create sample test for UpdateManager
- Remove MainActivityTest - now MainActivity is really simple.
- Add separate callback for progress update.
- MainActivity: UpdateEngine#bind/unbind on pause/resume.
Test: manually on the device
Test: using JUnit4
Change-Id: I1dba7c4ec74b1afb520be762413cfc261ccfbc08
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-05-23 15:37:43 -07:00
Tao Bao and android-build-merger
d0c3f62d3e
Merge "updater: Use a bool to indicate if allowed to skip a command." am: 3a8b348936 am: 082733b555
...
am: 09dbf50713
Change-Id: I03a79e3e7be2775866a29a3edeac35780ca6c2f3
2018-05-21 18:49:35 -07:00
Tao Bao and android-build-merger
09dbf50713
Merge "updater: Use a bool to indicate if allowed to skip a command." am: 3a8b348936
...
am: 082733b555
Change-Id: Ia8bd235b2cc4a2a53339e848c34cb89c4af0621f
2018-05-21 18:46:04 -07:00
Tao Bao and android-build-merger
082733b555
Merge "updater: Use a bool to indicate if allowed to skip a command."
...
am: 3a8b348936
Change-Id: I3b7fe231de183723be3f5dd158e3d130e3e797f2
2018-05-21 18:42:33 -07:00
Tao Bao and Gerrit Code Review
3a8b348936
Merge "updater: Use a bool to indicate if allowed to skip a command."
2018-05-22 01:34:03 +00:00
Jerry Zhang and android-build-merger
118d6ac3a0
Merge "recovery: Add ability to set title lines" am: cba047f944 am: 6283f64568
...
am: ebc910901c
Change-Id: I51055a2ae70534c0107e6001d6db0e31f2a2932d
2018-05-21 17:14:56 -07:00
Tao Bao and android-build-merger
67d0309460
Merge "updater: Clean up the header lines computation." am: a5735e9b5f am: 1e29bb6717
...
am: b8a04272c8
Change-Id: Ie044e694af47e2c115f1ba1030e331c99202611d
2018-05-21 17:09:11 -07:00
Jerry Zhang and android-build-merger
ebc910901c
Merge "recovery: Add ability to set title lines" am: cba047f944
...
am: 6283f64568
Change-Id: I9c40c26a28de5d45b4651bd5cd5d36d57ff9d9fb
2018-05-21 17:05:28 -07:00
Tao Bao and android-build-merger
b8a04272c8
Merge "updater: Clean up the header lines computation." am: a5735e9b5f
...
am: 1e29bb6717
Change-Id: I48a43bb615d9850375774b6827bc34352b0b7c76
2018-05-21 17:05:04 -07:00
Jerry Zhang and android-build-merger
6283f64568
Merge "recovery: Add ability to set title lines"
...
am: cba047f944
Change-Id: I6795eba1ab0cbc56e04fbed4d0ae3b8fe4925920
2018-05-21 17:00:23 -07:00
Tao Bao and android-build-merger
1e29bb6717
Merge "updater: Clean up the header lines computation."
...
am: a5735e9b5f
Change-Id: Id8270c2dce8ac907ea443f667ede40f3eba8fa2d
2018-05-21 17:00:02 -07:00
Jerry Zhang and Gerrit Code Review
cba047f944
Merge "recovery: Add ability to set title lines"
2018-05-21 23:52:43 +00:00
Tao Bao and Gerrit Code Review
a5735e9b5f
Merge "updater: Clean up the header lines computation."
2018-05-21 23:47:51 +00:00
Tao Bao and Jerry Zhang
26ea9591bc
ui: Use std::thread to create input/progress threads.
...
Test: Build and boot into recovery on walleye. Check the long press
detection; `Run graphics test`.
Change-Id: Ic3e9b0652fc3ff6fb3ad118df5ebb9bb4abda2cd
2018-05-21 16:37:07 -07:00
Jerry Zhang
0e577ee424
recovery: Add ability to set title lines
...
Add the ability to change the contents of
the title lines, displayed at the top of
the screen. Once set, the same lines are
displayed for all menus until changed again.
Test: Recovery works
Bug: 78793464
Change-Id: I7ef5594b0d76dbbd2e01ad7508863af1270b2a2a
2018-05-21 16:37:07 -07:00
Tao Bao and android-build-merger
ba579eec7d
[automerger skipped] Merge "Move stuff from recovery into librecovery." am: 901f0c3516 am: dd88112054 -s ours
...
am: f64feaac0f -s ours
Change-Id: Iaf063b9ed0b485813ac77edb3d610c5b5392487b
2018-05-21 16:33:36 -07:00
Tao Bao and android-build-merger
f64feaac0f
[automerger skipped] Merge "Move stuff from recovery into librecovery." am: 901f0c3516
...
am: dd88112054 -s ours
Change-Id: I59e680bbc6dd9a0895b594cd5a4a5f32719ec4b3
2018-05-21 16:24:29 -07:00
Tao Bao and android-build-merger
dd88112054
Merge "Move stuff from recovery into librecovery."
...
am: 901f0c3516
Change-Id: Ief503e9d2be627474df385790e5ac55399f08744
2018-05-21 16:21:09 -07:00
Tao Bao and Gerrit Code Review
901f0c3516
Merge "Move stuff from recovery into librecovery."
2018-05-21 23:05:45 +00:00
Tao Bao and android-build-merger
08fa07c132
Merge "Move stuff from recovery into librecovery." into pi-dev-plus-aosp
...
am: adbf380258
Change-Id: I6ed490a28a7cdd1da3a1564fa9fb96bf2040a77c
2018-05-21 16:00:20 -07:00