Commit graph

6224 commits

Author SHA1 Message Date
Jiyong Park
93ea306913 Merge "Recovery image is self-contained"
am: 397e8f2279

Change-Id: Ieb43e946cb694635b3b4aad91e7874f87ae39b47
2018-06-13 16:40:33 -07:00
Zhomart Mukhamejanov
9b6a9aceae Merge "updater_sample: add proguard.flags"
am: 5ced47d120

Change-Id: Ib5d900fa689fe391148b6da6dc6c0e14d94f6119
2018-06-13 16:40:14 -07:00
Tao Bao
cc08655e65 Merge "minui: Add constness to GRSurface* in gr_get_{width,height}."
am: 6dbdbbc8fe

Change-Id: I21e6912c33464647b490b6baeea7bf52f2f457af
2018-06-13 16:38:04 -07:00
Treehugger Robot
397e8f2279 Merge "Recovery image is self-contained" 2018-06-13 23:14:29 +00:00
Zhomart Mukhamejanov
5ced47d120 Merge "updater_sample: add proguard.flags" 2018-06-13 23:11:54 +00:00
Tao Bao
6dbdbbc8fe Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." 2018-06-13 22:55:47 +00:00
Tao Bao
9f4263346b minui: Add constness to GRSurface* in gr_get_{width,height}.
Also free gr_font in gr_exit(), as it's owned by minui.

Test: mmma -j bootable/recovery system/core/healthd
Test: recovery_unit_test on marlin
Test: Boot into recovery. Run graphics test.
Change-Id: I00457bb97ed3dc95ef5aad493827fb5a62a258dc
2018-06-13 13:24:58 -07:00
Zhomart Mukhamejanov
8c3af4aa8c updater_sample: add proguard.flags
Test: junit
Change-Id: I0175271935fdd87dd49ad9936d0e1b550d164e05
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-06-13 09:53:29 -07:00
Tao Bao
941d3ab754 Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()."
am: 0eb10b382a

Change-Id: I0bba5a09ac62b7c152d22d72f0432868008592cc
2018-06-08 16:50:38 -07:00
Xin Li
d8a411c90a Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master 2018-06-08 23:09:59 +00:00
Tao Bao
0eb10b382a Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." 2018-06-08 23:01:59 +00:00
Tao Bao
4a13508f0b updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3().
Test: Run recovery_component_test on marlin.
Change-Id: I93afca891c5c9c1a351c907b023cd20c4704a66a
2018-06-08 12:53:31 -07:00
Tao Bao
165a197cdf Merge "updater: Remove the redundant check on line count."
am: 4a8f5ec06d

Change-Id: Iabb63de552d823305fd6330d9819d5ec32718ebc
2018-06-08 12:44:00 -07:00
Tao Bao
4a8f5ec06d Merge "updater: Remove the redundant check on line count." 2018-06-08 19:29:45 +00:00
Xin Li
b5c2c714f0 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: Iaf450edb8262cef5465f06309556ab24a08222b4
2018-06-08 11:06:44 -07:00
Zhomart Mukhamejanov
c54885f8a1 Merge "updater_sample: update README.md" am: 1cb7222784
am: fc824cb998

Change-Id: If5ec06c7974cf6c174ce812e49b20d6dc67c1181
2018-06-07 18:07:06 -07:00
Zhomart Mukhamejanov
31b517c510 Merge "updater_sample: fix payload spec tests" am: 684d7216e6
am: 7c8e5b6ee8

Change-Id: I2a413794f315f53000f937760595d5ba99c1755f
2018-06-07 17:25:33 -07:00
Zhomart Mukhamejanov
fc824cb998 Merge "updater_sample: update README.md"
am: 1cb7222784

Change-Id: I4347b45f3d0abc9fa93bc70b42ec6df94be595e4
2018-06-07 16:39:05 -07:00
Zhomart Mukhamejanov
7c8e5b6ee8 Merge "updater_sample: fix payload spec tests"
am: 684d7216e6

Change-Id: I2aac8aa24dd5d4287010ea2b8e70828671858864
2018-06-07 16:38:08 -07:00
Zhomart Mukhamejanov
1cb7222784 Merge "updater_sample: update README.md" 2018-06-07 22:50:09 +00:00
Zhomart Mukhamejanov
ec33e4504c updater_sample: update README.md
Test: n/a
Change-Id: I0b488ca9fe628c3614c203ab9264175f291f49db
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-06-07 22:49:22 +00:00
Zhomart Mukhamejanov
684d7216e6 Merge "updater_sample: fix payload spec tests" 2018-06-07 22:49:14 +00:00
Zhomart Mukhamejanov
8a6a86a101 updater_sample: fix payload spec tests
Test: junit4
Change-Id: Ia2f7475cfba01a65486bb0e5d0f3976304ca0969
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-06-07 12:07:20 -07:00
Tao Bao
ffede3e8d9 updater: Remove the redundant check on line count.
Test: recovery_component_test on marlin.
Change-Id: I2ac2bd47469d1aec8a97a8c4ed0fe80ffd65c95b
2018-06-07 10:43:24 -07:00
Zhomart Mukhamejanov
0f191fc8f6 Merge "updater_sample: change gen_update_config args" am: eeabbecb64
am: 493e6cb9e0

Change-Id: I12371f4985c5d39eb3b7361cf5ef9e167eddc8a3
2018-06-07 09:09:39 -07:00
Zhomart Mukhamejanov
493e6cb9e0 Merge "updater_sample: change gen_update_config args"
am: eeabbecb64

Change-Id: I5d8a229fce5599762f290a583d779808dc836b23
2018-06-07 09:05:37 -07:00
Zhomart Mukhamejanov
eeabbecb64 Merge "updater_sample: change gen_update_config args" 2018-06-07 15:53:20 +00:00
Jiyong Park
8b7af4c0ee Recovery image is self-contained
Now recovery mode is self-contained, which means we don't need to mount
system.img to run shell, etc. What is needed in recovery mode is all in
the recovery ramdisk image.

Since we no longer use /system as the mount point for the system.img,
this allows us to have identical filesystem layout as the system.img.
Executables and libs are installed to /system/bin and /system/lib.
Right now, we only have adbd, sh, toybox in /system/bin but will move
static executables from /sbin to /system/bin as soon as they are
converted to dynamic executables.

system.img is mounted to /mnt/system instead.

Bug: 63673171
Test: `adb reboot recovery; adb devices` shows the device ID
Test: `adb root && adb shell` and then
$ lsof -p `pidof adbd` shows that libm.so, libc.so, etc. are loaded from
the /lib directory.

Change-Id: I801ebd18f3e0a112db3d9a11e4fbb4e49181652a
2018-06-07 23:24:33 +09:00
Zhomart Mukhamejanov
e202fa8949 Merge "updater_sample: Add suspend/resume update" am: 382691fbb0
am: f4c1420742

Change-Id: Idbdb61d87c1ce5ddde1de04b00909675dfe467e5
2018-06-06 18:57:06 -07:00
Tao Bao
a0e3e6f489 Merge "updater: Replace the reference arguments with pointers." am: cef8431fed
am: 9c22d924e8

Change-Id: Ibb4ee1d240768e2cb941d1c4c89e5584c126290b
2018-06-06 18:55:06 -07:00
Zhomart Mukhamejanov
da96070ffd updater_sample: change gen_update_config args
Change gen_update_config arg '--ab_force_switch_slot'
from 'bool' to 'store_action'.

Test: manually
Change-Id: Ic65ac9ca3feb99b3a1751a44dec038d49c2b446a
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-06-06 18:38:51 -07:00
Zhomart Mukhamejanov
f4c1420742 Merge "updater_sample: Add suspend/resume update"
am: 382691fbb0

Change-Id: Ibd18c8751b2a157aaaf9139bbb01ba0ec84101b7
2018-06-06 18:30:00 -07:00
Zhomart Mukhamejanov
382691fbb0 Merge "updater_sample: Add suspend/resume update" 2018-06-07 00:49:09 +00:00
Tao Bao
9c22d924e8 Merge "updater: Replace the reference arguments with pointers."
am: cef8431fed

Change-Id: Iae45ce2282661f97f5726b1ee1e4db6a6e6af503
2018-06-06 17:08:25 -07:00
Tao Bao
cef8431fed Merge "updater: Replace the reference arguments with pointers." 2018-06-06 23:07:07 +00:00
Tianjie Xu
3e9493d891 Merge "minui: Handle the failures from the drm backend in gr_init" am: 0e2d900739
am: c8d9d6ca17

Change-Id: I57b6c5a91a08b4d52bd11ff37b29c43e28d7837d
2018-06-06 15:22:52 -07:00
Tianjie Xu
c8d9d6ca17 Merge "minui: Handle the failures from the drm backend in gr_init"
am: 0e2d900739

Change-Id: I690e4ea0a8750dbabfbea8d4401df641d991bfd1
2018-06-06 13:32:54 -07:00
Tao Bao
b4aad37e21 Merge "ui: join only if joinable." am: 2454b2493a
am: ccff03d196

Change-Id: I6752eaf96637a9263eb49caa5322a815a6208ef5
2018-06-06 11:07:02 -07:00
Tianjie Xu
0e2d900739 Merge "minui: Handle the failures from the drm backend in gr_init" 2018-06-06 17:53:20 +00:00
Tao Bao
ccff03d196 Merge "ui: join only if joinable."
am: 2454b2493a

Change-Id: I84d7bb6be8dbf35d0161237902a7b7e076200e10
2018-06-06 10:08:15 -07:00
Tao Bao
2454b2493a Merge "ui: join only if joinable." 2018-06-06 16:41:52 +00:00
Tao Bao
94371fd012 ui: join only if joinable.
The threads in RecoveryUI only get initialized if their Init()s finish
successfully.

Test: recovery_unit_test on marlin.
Change-Id: Ic4b62300a3cbd47887d9f4a90dc26f8a7deab616
2018-06-06 07:49:47 -07:00
Tao Bao
34a7cdc8ce Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0
am: d770790a8f

Change-Id: Ia87e290bacfbad079e4aedf30a6f2c2c2ab13e9b
2018-06-05 23:25:35 -07:00
Tao Bao
d770790a8f Merge "tests: Specify the death test style to avoid flakiness."
am: 878d5a77f0

Change-Id: Ia1cb4cea72323c80d605fdd9cedfa80d5e3145fb
2018-06-05 23:21:32 -07:00
Tao Bao
878d5a77f0 Merge "tests: Specify the death test style to avoid flakiness." 2018-06-06 06:14:18 +00:00
Tianjie Xu
ccf00a2007 minui: Handle the failures from the drm backend in gr_init
In a charger mode manual test, we encounter failures from the
MinuiBackendDrm when calling DrmEnableCrtc and Flip. To make the minui
more robust, we should fall back to another backend if drm's SetCrtc
fails. And check the value of gr_draw before dereferencing.

Bug: 80249440
Test: boot to recovery
Change-Id: Ibd1ca1fb1115fe1132684586c54eccd8fb4c3ad9
2018-06-05 17:10:23 -07:00
Tao Bao
42be0d47d9 tests: Specify the death test style to avoid flakiness.
As warned below (while running the test), the default death test style
(i.e. "fast") doesn't work well in a threaded context, which causes test
flakiness (timeout or early exit).

[WARNING] external/googletest/googletest/src/gtest-death-test.cc:836:: Death tests use fork(), which is unsafe particularly in a threaded context. For this test, Google Test detected 3 threads.

This CL specifies the death test styles to be "threadsafe" for the
following death tests.
- RangeSetTest.GetBlockNumber
- RangeSetTest.file_range
- ScreenRecoveryUITest.LoadAnimation_MissingAnimation

Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin. Test passes and the above
      warning is gone.
Change-Id: I245bbc09286702d5cb326f878c4391e842b66cc5
2018-06-05 14:06:59 -07:00
Tao Bao
de3bbb81c2 updater: Replace the reference arguments with pointers.
As suggested by the style guide
(https://google.github.io/styleguide/cppguide.html#Reference_Arguments),
all parameters passed by reference must be labeled const. This CL moves
most of the non-const references in blockimg.cpp to pointers, except for
the CommandParameters& parameter in PerformCommand* functions, which
will be handled in separate CLs.

Test: mmma -j bootable/recovery
Test: Run recovery_component_test on marlin.
Change-Id: I84299208e9a1699f5381fb2228d4120f0c8dacb3
2018-06-04 23:14:54 -07:00
Zhomart Mukhamejanov
8eed4aca52 Merge "updater_sample: Add UI docs to README" am: e36b6ec97c
am: 321a7134e9

Change-Id: Ie80f7d87be9cbff62784cdcac6241f0352e3bbc1
2018-06-04 17:39:22 -07:00
Zhomart Mukhamejanov
ca9d2d71bf Merge "updater_sample: improve updater state handling" am: 269be9f22d
am: 188190cc8c

Change-Id: I01dd12acc6a53844d9f0285e8ce091ee8eca3564
2018-06-04 17:37:30 -07:00