4cd2cf96a0
Merge "screen_ui: Call gr_exit() from dtor."
2018-06-14 01:27:30 +00:00
a475967ba1
Merge "Recovery image is self-contained" am: 397e8f2279 am: 93ea306913
...
am: 26e8481fc8
2018-06-13 17:45:19 -07:00
53b1c46a0b
Merge "updater_sample: add proguard.flags" am: 5ced47d120 am: 9b6a9aceae
...
am: 441f38e9e5
2018-06-13 17:34:59 -07:00
903a91f7f4
Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe am: cc08655e65
...
am: e25dfa5fd0
2018-06-13 17:06:43 -07:00
26e8481fc8
Merge "Recovery image is self-contained" am: 397e8f2279
...
am: 93ea306913
2018-06-13 17:05:54 -07:00
441f38e9e5
Merge "updater_sample: add proguard.flags" am: 5ced47d120
...
am: 9b6a9aceae
2018-06-13 16:56:47 -07:00
e25dfa5fd0
Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe
...
am: cc08655e65
2018-06-13 16:56:27 -07:00
93ea306913
Merge "Recovery image is self-contained"
...
am: 397e8f2279
2018-06-13 16:40:33 -07:00
9b6a9aceae
Merge "updater_sample: add proguard.flags"
...
am: 5ced47d120
2018-06-13 16:40:14 -07:00
cc08655e65
Merge "minui: Add constness to GRSurface* in gr_get_{width,height}."
...
am: 6dbdbbc8fe
2018-06-13 16:38:04 -07:00
ba4edb3e82
screen_ui: Move the call to gr_init() into Init().
...
gr_init() does general initialization works, in addition to loading font
file. InitTextParams() handles text related works.
Also check the font initialization result before using, as gr_init()
would ignore font initialization failures.
Test: recovery_unit_test on marlin.
Test: Boot into recovery. Run graphics test.
Change-Id: I12da22dfe8d13448cfbc83dbc51cd96f23c2deee
2018-06-13 16:18:46 -07:00
ebee98df6f
updater_sample: add metadata mismatch error code
...
Update util/UpdateEngineErrorCodes.java
Test: n/a
Change-Id: I7250b1198b1d5ff0e38b7d4effe61eebd114a44f
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-06-13 16:18:38 -07:00
60ac622245
screen_ui: Call gr_exit() from dtor.
...
ScreenRecoveryUI calls gr_init() during Init(), and should release any
allocated resource upon destructing. It's a no-op to call gr_exit() if
gr_init() was not called or didn't finish successfully.
Test: recovery_unit_test on marlin.
Test: Boot into recovery. Run graphics test.
Change-Id: Ib9632170174cdacd51d382f23c8daf6a9bc59f7a
2018-06-13 16:17:53 -07:00
397e8f2279
Merge "Recovery image is self-contained"
2018-06-13 23:14:29 +00:00
5ced47d120
Merge "updater_sample: add proguard.flags"
2018-06-13 23:11:54 +00:00
6dbdbbc8fe
Merge "minui: Add constness to GRSurface* in gr_get_{width,height}."
2018-06-13 22:55:47 +00:00
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
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
821d03bb6f
Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a am: 941d3ab754
...
am: e2777de4b0
2018-06-09 09:04:43 -07:00
e2777de4b0
Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a
...
am: 941d3ab754
2018-06-09 05:28:40 -07:00
e6a3f9e91a
Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master am: d8a411c90a
...
am: d320d12235
2018-06-09 05:16:46 -07:00
d320d12235
Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master
...
am: d8a411c90a
2018-06-09 01:45:12 -07:00
941d3ab754
Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()."
...
am: 0eb10b382a
2018-06-08 16:50:38 -07:00
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
0eb10b382a
Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()."
2018-06-08 23:01:59 +00:00
4fed385c6c
Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d am: 165a197cdf
...
am: 73ab0d12ce
2018-06-08 12:56:03 -07:00
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
73ab0d12ce
Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d
...
am: 165a197cdf
2018-06-08 12:48:07 -07:00
165a197cdf
Merge "updater: Remove the redundant check on line count."
...
am: 4a8f5ec06d
2018-06-08 12:44:00 -07:00
4a8f5ec06d
Merge "updater: Remove the redundant check on line count."
2018-06-08 19:29:45 +00:00
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
4b5dc30a92
Merge "updater_sample: update README.md" am: 1cb7222784 am: fc824cb998
...
am: c54885f8a1
2018-06-07 19:34:34 -07:00
2a13ae72d0
Merge "updater_sample: fix payload spec tests" am: 684d7216e6 am: 7c8e5b6ee8
...
am: 31b517c510
2018-06-07 19:28:02 -07:00
c54885f8a1
Merge "updater_sample: update README.md" am: 1cb7222784
...
am: fc824cb998
2018-06-07 18:07:06 -07:00
31b517c510
Merge "updater_sample: fix payload spec tests" am: 684d7216e6
...
am: 7c8e5b6ee8
2018-06-07 17:25:33 -07:00
fc824cb998
Merge "updater_sample: update README.md"
...
am: 1cb7222784
2018-06-07 16:39:05 -07:00
7c8e5b6ee8
Merge "updater_sample: fix payload spec tests"
...
am: 684d7216e6
2018-06-07 16:38:08 -07:00
1cb7222784
Merge "updater_sample: update README.md"
2018-06-07 22:50:09 +00:00
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
684d7216e6
Merge "updater_sample: fix payload spec tests"
2018-06-07 22:49:14 +00:00
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
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
30f1d99a91
Merge "updater_sample: change gen_update_config args" am: eeabbecb64 am: 493e6cb9e0
...
am: 0f191fc8f6
2018-06-07 09:13:12 -07:00
0f191fc8f6
Merge "updater_sample: change gen_update_config args" am: eeabbecb64
...
am: 493e6cb9e0
2018-06-07 09:09:39 -07:00
493e6cb9e0
Merge "updater_sample: change gen_update_config args"
...
am: eeabbecb64
2018-06-07 09:05:37 -07:00
eeabbecb64
Merge "updater_sample: change gen_update_config args"
2018-06-07 15:53:20 +00:00
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
26e8689f60
Merge "updater_sample: Add suspend/resume update" am: 382691fbb0 am: f4c1420742
...
am: e202fa8949
2018-06-06 19:04:19 -07:00
d2d0456d98
Merge "updater: Replace the reference arguments with pointers." am: cef8431fed am: 9c22d924e8
...
am: a0e3e6f489
2018-06-06 19:01:41 -07:00
e202fa8949
Merge "updater_sample: Add suspend/resume update" am: 382691fbb0
...
am: f4c1420742
2018-06-06 18:57:06 -07:00
Treehugger Robot
Jiyong Park
Zhomart Mukhamejanov
Tao Bao
Xin Li