7f41584d9d
[automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58b am: 0abc18d520 -s ours
...
am: 41e47d6d0a
2018-05-16 17:29:22 -07:00
41e47d6d0a
[automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58b
...
am: 0abc18d520
2018-05-16 17:03:35 -07:00
0abc18d520
Merge "recovery: Refactor common setup into main()"
...
am: 5b3d6cf58b
2018-05-16 16:59:37 -07:00
5b3d6cf58b
Merge "recovery: Refactor common setup into main()"
2018-05-16 23:46:01 +00:00
cd4122f122
Merge "Last command file should be updated after a command finishes" am: 6dfc54cae1 am: 45b7dbea74
...
am: 567570954e
2018-05-16 16:13:50 -07:00
567570954e
Merge "Last command file should be updated after a command finishes" am: 6dfc54cae1
...
am: 45b7dbea74
2018-05-16 16:05:19 -07:00
45b7dbea74
Merge "Last command file should be updated after a command finishes"
...
am: 6dfc54cae1
2018-05-16 16:00:46 -07:00
6dfc54cae1
Merge "Last command file should be updated after a command finishes"
2018-05-16 22:55:39 +00:00
4c4357848b
Merge "recovery: Refactor common setup into main()" into pi-dev-plus-aosp
...
am: 726c9271db
2018-05-16 12:39:21 -07:00
f5e319ac96
recovery: Refactor common setup into main()
...
Move more common setup into the main function.
Main() handles all 1 time setup, such as ui,
logging, and secontext. Recovery_main()
takes in command line arguments, does any
necessary recovery work, and can be called
multiple times from main().
Test: Recovery works
Bug: 78793464
Change-Id: I2d2595fc342b4ddfa80f4e06b30e44263132acd9
Merged-In: I2d2595fc342b4ddfa80f4e06b30e44263132acd9
2018-05-16 19:32:06 +00:00
726c9271db
Merge "recovery: Refactor common setup into main()" into pi-dev-plus-aosp
2018-05-16 19:18:53 +00:00
2aa8516102
Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38 am: b730743b40
...
am: 6171da90c5
2018-05-15 21:20:23 -07:00
6171da90c5
Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38
...
am: b730743b40
2018-05-15 21:16:22 -07:00
b730743b40
Merge "wear_ui: Address a TODO regarding {intro,loop}_frames."
...
am: 0f3aa6ec38
2018-05-15 21:12:19 -07:00
c2b2bb5d78
Last command file should be updated after a command finishes
...
The last command file has the last executed stash command by convention.
So we should update the file after we actually finishes executing the command;
instead of after loading src/tgt.
Bug: 79756267
Test: unit tests pass
Change-Id: I4535b5836e7eb13b3abe3d02f9f362ec5e9ec969
2018-05-15 21:05:30 -07:00
0f3aa6ec38
Merge "wear_ui: Address a TODO regarding {intro,loop}_frames."
2018-05-16 04:04:54 +00:00
6a64804965
recovery: Refactor common setup into main()
...
Move more common setup into the main function.
Main() handles all 1 time setup, such as ui,
logging, and secontext. Recovery_main()
takes in command line arguments, does any
necessary recovery work, and can be called
multiple times from main().
Test: Recovery works
Bug: 78793464
Change-Id: I2d2595fc342b4ddfa80f4e06b30e44263132acd9
2018-05-16 00:20:45 +00:00
152e0eb20b
wear_ui: Address a TODO regarding {intro,loop}_frames.
...
Also add tests for LoadAnimation that cover the change.
Test: Run `recovery_unit_test` on marlin.
Change-Id: I0380a5cdd0d85d55baecf7759eb647b6a9f3a085
2018-05-14 11:14:00 -07:00
baa4f0d2af
Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0 am: 0c2998ffe3
...
am: 554a876cc1
2018-05-11 18:15:46 -07:00
554a876cc1
Merge "Clean up the Makefile for recovery and tests." am: 1f0b9962b0
...
am: 0c2998ffe3
2018-05-11 18:06:19 -07:00
0c2998ffe3
Merge "Clean up the Makefile for recovery and tests."
...
am: 1f0b9962b0
2018-05-11 18:01:48 -07:00
1f0b9962b0
Merge "Clean up the Makefile for recovery and tests."
2018-05-12 00:55:35 +00:00
9e30997676
Clean up the Makefile for recovery and tests.
...
Reorder librecovery and librecovery_ui, so that librecovery stays closer
to recovery (in preparation for later changes that move more files
between the two). For the libraries in LOCAL_STATIC_LIBRARIES, reorder
them based on the dependency - local modules coming first, with external
libraries near the end. Sort the local / external modules, unless a
specific order is needed.
In tests/Android.mk, split the monolithic list of LOCAL_STATIC_LIBRARIES
based on modules. This makes adding / finding libraries easier.
There's no functionality in this CL.
Test: mmma -j bootable/recovery
Change-Id: I6836be574df565001ae9cd3d466a2b6460d90d08
2018-05-11 15:53:58 -07:00
b8c632aa9a
Merge "screen_ui: Fix an issue in RTL locale detection." am: 13d56e9bed am: 0e42c5680c
...
am: a8c819d98c
2018-05-11 15:27:19 -07:00
b3ef346da7
Merge "Move device.cpp into librecovery_ui." am: db6dc14bff am: fb8636f48f
...
am: 81726e4430
2018-05-11 15:19:12 -07:00
a8c819d98c
Merge "screen_ui: Fix an issue in RTL locale detection." am: 13d56e9bed
...
am: 0e42c5680c
2018-05-11 14:50:40 -07:00
0e42c5680c
Merge "screen_ui: Fix an issue in RTL locale detection."
...
am: 13d56e9bed
2018-05-11 14:50:21 -07:00
81726e4430
Merge "Move device.cpp into librecovery_ui." am: db6dc14bff
...
am: fb8636f48f
2018-05-11 14:50:21 -07:00
13d56e9bed
Merge "screen_ui: Fix an issue in RTL locale detection."
2018-05-11 21:46:52 +00:00
fb8636f48f
Merge "Move device.cpp into librecovery_ui."
...
am: db6dc14bff
2018-05-11 14:46:51 -07:00
db6dc14bff
Merge "Move device.cpp into librecovery_ui."
2018-05-11 21:38:01 +00:00
c03916ae5a
Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36 am: ca88c67135
...
am: e0871294aa
2018-05-11 14:34:42 -07:00
e0871294aa
Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36
...
am: ca88c67135
2018-05-11 13:22:26 -07:00
ca88c67135
Merge "tests: Add tests for ScreenRecoveryUI."
...
am: 8c6f699b36
2018-05-11 13:18:25 -07:00
8c6f699b36
Merge "tests: Add tests for ScreenRecoveryUI."
2018-05-11 20:06:22 +00:00
3bb7332a1e
Merge "recovery: Configure device menu based on runtime info." am: e498ef2f03 am: bd32e1b50b
...
am: 20976a0913
2018-05-11 11:22:56 -07:00
20976a0913
Merge "recovery: Configure device menu based on runtime info." am: e498ef2f03
...
am: bd32e1b50b
2018-05-11 10:57:40 -07:00
bd32e1b50b
Merge "recovery: Configure device menu based on runtime info."
...
am: e498ef2f03
2018-05-11 10:54:10 -07:00
6a542dcc3b
Move device.cpp into librecovery_ui.
...
librecovery_ui will be exposed for device-specific RecoveryUI. With the
current code structure, 'device.h' and 'ui.h' will always be needed in
order to implement device-specific RecoveryUI.
Bug: 76436783
Test: lunch aosp_{angler,marlin,dragon,walleye}-userdebug;
`mmma -j bootable/recovery` respectively.
Change-Id: I15e8851b230a65526ac9310e0ee6621b7daea589
2018-05-11 10:51:26 -07:00
e498ef2f03
Merge "recovery: Configure device menu based on runtime info."
2018-05-11 17:34:01 +00:00
e5d2c25ecf
recovery: Configure device menu based on runtime info.
...
Drop the dependency on build time flag of AB_OTA_UPDATER when compiling
device.cpp. Note that AB_OTA_UPDATER still guards the package install
behavior (install.cpp).
This can be extended to cover the entry of "Apply update from SD card".
Test: Build and boot into recovery on angler and walleye respectively.
Check the recovery menu.
Change-Id: I36a6a6b4101ba61d4d374e32353c36cc5716f9ce
2018-05-10 20:46:46 -07:00
76e6734173
Merge "updater_sample: add HAL compatibility check" am: 563d34f712 am: 0045e76c7c
...
am: 9ca1e2778a
2018-05-10 20:25:30 -07:00
9ca1e2778a
Merge "updater_sample: add HAL compatibility check" am: 563d34f712
...
am: 0045e76c7c
2018-05-10 20:19:57 -07:00
0045e76c7c
Merge "updater_sample: add HAL compatibility check"
...
am: 563d34f712
2018-05-10 20:14:25 -07:00
563d34f712
Merge "updater_sample: add HAL compatibility check"
2018-05-11 03:05:21 +00:00
0acf8ab264
Merge "Document the clang-format usage." am: 797550fb8b am: cc71d271c1
...
am: 374498ff33
2018-05-10 17:49:33 -07:00
07c495ac07
Merge "Device owns the RecoveryUI instance." am: 6df846e337 am: 8d593973d6
...
am: 4fd58ca28a
2018-05-10 17:30:11 -07:00
374498ff33
Merge "Document the clang-format usage." am: 797550fb8b
...
am: cc71d271c1
2018-05-10 17:20:59 -07:00
4fd58ca28a
Merge "Device owns the RecoveryUI instance." am: 6df846e337
...
am: 8d593973d6
2018-05-10 17:20:02 -07:00
cc71d271c1
Merge "Document the clang-format usage."
...
am: 797550fb8b
2018-05-10 17:16:52 -07:00
Tao Bao
Tianjie Xu
Jerry Zhang
Treehugger Robot
Zhomart Mukhamejanov