Commit Graph

3325 Commits

Author SHA1 Message Date
Tianjie Xu a8764c46aa Merge "update_verifier should read dm wrapped partition" am: c44c479197
am: d40cd0e7cf

Change-Id: Ief705589ebe2293ecb2e688a7643c5f2e4a79ea9
2017-02-03 22:01:52 +00:00
Tianjie Xu d40cd0e7cf Merge "update_verifier should read dm wrapped partition"
am: c44c479197

Change-Id: I3ce467a3d634f2a566f87a936a86e7b55627c6cd
2017-02-03 21:57:21 +00:00
Tianjie Xu c44c479197 Merge "update_verifier should read dm wrapped partition" 2017-02-03 21:50:07 +00:00
Tao Bao 7d8e13a535 Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d
am: ec8d74580d

Change-Id: I9cb585a2cbca3d6a1dcf884aba179acf36380352
2017-02-03 20:55:45 +00:00
Tao Bao ec8d74580d Merge "minui: Minor clean up to graphics.cpp."
am: b04bc0540d

Change-Id: Ie1ebc638e9a013d69f0195b567a8a16aa3aaf79c
2017-02-03 20:51:14 +00:00
Tao Bao b04bc0540d Merge "minui: Minor clean up to graphics.cpp." 2017-02-03 20:48:47 +00:00
Tao Bao e8020f4fa3 minui: Minor clean up to graphics.cpp.
Remove unneeded header includes.

Remove the dead code in gr_test() (already commented out). Similar tests
have been covered by the "Run graphics test" from recovery menu.

Test: mmma -j32 bootable/recovery
Change-Id: If977c1b780602f5c5054469a3dae4fd85f34ab1a
2017-02-03 09:33:36 -08:00
Tao Bao 2be767eba4 Merge "Fix a log issue in ui.cpp." am: 7f38fbf976
am: c33d037d7d

Change-Id: I440288d7d518e9aa6cb13fe7d8647770bc7011f3
2017-02-01 16:44:58 +00:00
Tao Bao c33d037d7d Merge "Fix a log issue in ui.cpp."
am: 7f38fbf976

Change-Id: I84dcdabf341eb566ee7591259c405ac7d406ebf0
2017-02-01 16:42:58 +00:00
Tao Bao 7f38fbf976 Merge "Fix a log issue in ui.cpp." 2017-02-01 16:39:13 +00:00
Tao Bao 8eec37330b Fix a log issue in ui.cpp.
It's a copy/paste error when addressing reviewer's comment for commit
6278bdf349.

Test: recovery gives the right message (e.g. "Permission denied") when
      it fails to read max_brightness.

Change-Id: I10372c82595bdc00a6f6725f036c02721b19a1aa
2017-01-31 21:27:27 -08:00
Tao Bao 1c35b48253 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d
am: 29ef12f777

Change-Id: I95295f72efb73b6b40a2cd420514204b4bc93d63
2017-02-01 05:18:26 +00:00
Tao Bao 29ef12f777 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"
am: 7ab9c3812d

Change-Id: I779a671ef4756fb149dc1bd5823eb85f0e846269
2017-02-01 05:15:50 +00:00
Tao Bao 7ab9c3812d Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" 2017-02-01 05:10:15 +00:00
Tao Bao 79ce31073a Merge "recovery: Add screensaver mode." am: 389a29193c
am: 2684259c34

Change-Id: I94fa5b8e3d0faad7e16a8f696f9b96bb055f2fc6
2017-01-31 06:17:53 +00:00
Tao Bao 2684259c34 Merge "recovery: Add screensaver mode."
am: 389a29193c

Change-Id: Ia3a03dce52f6e6c0aa907643aa67ad725fea8005
2017-01-31 06:15:53 +00:00
Tao Bao 389a29193c Merge "recovery: Add screensaver mode." 2017-01-31 06:11:37 +00:00
Tao Bao 6278bdf349 recovery: Add screensaver mode.
While it's waiting for user input, dim or turn off the backlight to
avoid OLED burn-in. The backlight brightness will be reduced after the
first timeout (default 120s), and then turned off after the second.
Pressing any key will take it back to the normal brightness. While the
display is off, the first key input will only turn on the backlight.

The most common case that triggers the screensaver is under text mode,
such as waiting for menu selection or viewing recovery logs.

This CL doesn't change the brightness while it's installing updates or
performing wipes under UI mode.

When it encounters any install error under UI mode (user builds):
 - If it's NOT USB connected, it will reboot automatically after the
   first timeout (same as before);
 - If it's USB connected, it will dim and turn off the display per the
   change in this CL.

Bug: 34077703
Test: Boot a device with the new recovery image. Wait for timeout.

Change-Id: I0c14907e60340a7f037adb6e464942d099ada08b
2017-01-30 16:12:30 -08:00
Tianjie Xu b0ac872014 update_verifier should read dm wrapped partition
update_verifier used to read from system_block_device, which bypasses
dm-verity check completely. Switch update_verifier to read the corresponding
'/dev/block/dm-X' instead. U_v gets the verity block device number by
comparing the contents in '/sys/block/dm-X/dm/name'.

Bug: 34391662
Test: update_verifier detects the corrupped blocks and dm-verity trigger the reboot on Sailfish.
Change-Id: Ie5c50c23410bd29fcc6e733ba29cf892e9a07460
2017-01-26 11:08:03 -08:00
Alex Deymo 9518d34c0f Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1
am: 5b5b8333e0

Change-Id: I8a4889260b966acb63664ad8a04cde2853262113
2017-01-25 23:56:09 +00:00
Alex Deymo 5b5b8333e0 Merge "Remove '_static' suffix from libext2* references."
am: 56ff8061b1

Change-Id: Icadc8fe11a75ce85771e0ba6383e0ea7b1cceb10
2017-01-25 23:53:06 +00:00
Alex Deymo 56ff8061b1 Merge "Remove '_static' suffix from libext2* references." 2017-01-25 23:48:43 +00:00
Connor O'Brien 445f24f712 Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7
am: a78bbda4e2

Change-Id: Ia6a0eca88a49dc53d9cff27fb4f34c912530bc21
2017-01-25 04:22:13 +00:00
Connor O'Brien a78bbda4e2 Merge "Use flash erase & logical block size for userdata wipe"
am: c8f7b5bad7

Change-Id: Ie9ad2ca457ecb6bf68a57120bcc504faaabc0871
2017-01-25 04:16:19 +00:00
Treehugger Robot c8f7b5bad7 Merge "Use flash erase & logical block size for userdata wipe" 2017-01-25 04:14:00 +00:00
Connor O'Brien 98a658bb54 Use flash erase & logical block size for userdata wipe
If flash erase and logical block size are available, then pass them
to libext4_utils when rebuilding userdata.

Test: Factory reset marlin in recovery, confirmed params passed correctly
Bug: 33243520
Change-Id: I6bed976a73e7a64a80eaac50f48fbacb6d812517
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-01-24 18:04:02 -08:00
Tao Bao 19856bcb2e Merge "minui: Move callback functions to std::function." am: a476312714
am: 343987b2a1

Change-Id: Ib2d10bf8844591fd75b5b86e3f16fc3daaa5d6d6
2017-01-25 00:56:00 +00:00
Tao Bao 343987b2a1 Merge "minui: Move callback functions to std::function."
am: a476312714

Change-Id: I31bcb78f9f145fb97df82b6065d0e026c57c1d56
2017-01-25 00:53:33 +00:00
Tao Bao a476312714 Merge "minui: Move callback functions to std::function." 2017-01-25 00:49:48 +00:00
Tao Bao b30b8cf436 Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3
am: 8e01ded271

Change-Id: I8a71998ae2df2111a834ca375420961b283aab2b
2017-01-24 23:46:22 +00:00
Tao Bao 8e01ded271 Merge "update_verifier: Move property_get() to android::base::GetProperty()."
am: 42906e06b3

Change-Id: I3acda7030997b014801f691f2d8c87a82664938f
2017-01-24 23:41:51 +00:00
Tao Bao 42906e06b3 Merge "update_verifier: Move property_get() to android::base::GetProperty()." 2017-01-24 23:37:22 +00:00
Tao Bao 14be4eb8ce Merge "Print with newline for ui_print." am: 90deaf9ab7
am: 1313a9636d

Change-Id: I1cc5523b0ae213f5091caa6793c549e08dc148dc
2017-01-24 05:00:27 +00:00
Tao Bao 1313a9636d Merge "Print with newline for ui_print."
am: 90deaf9ab7

Change-Id: Idfeb698aec25a5fe1a577dd3baf36afed8107c8a
2017-01-24 04:58:27 +00:00
Tao Bao 90deaf9ab7 Merge "Print with newline for ui_print." 2017-01-24 04:54:52 +00:00
Alex Deymo 7c5dbd6751 Remove '_static' suffix from libext2* references.
Bug: 34220783
Test: make checkbuild
Change-Id: Iceea20e440a4bb6a3b254486a65a86401a2241ef
2017-01-23 15:18:29 -08:00
Chris Phoenix 58eace4a96 Merge "bootctrl HAL uses "default" service name" am: cf1af460d5
am: ee3030ad4e

Change-Id: I58625313d404e8f7e947d324441ae9a51c4d0931
2017-01-23 20:58:20 +00:00
Tianjie Xu f1a371b1b0 Merge "Restore the max width for recovery background texts" am: c1df344381
am: b037cff12e

Change-Id: I177c4d5edcf8e0ee9874bd1627d0ae12a43ae506
2017-01-23 20:58:06 +00:00
Chris Phoenix ee3030ad4e Merge "bootctrl HAL uses "default" service name"
am: cf1af460d5

Change-Id: Iae6ad548a1f3d10864daf95c05db05e5277f52ab
2017-01-23 20:53:23 +00:00
Tianjie Xu b037cff12e Merge "Restore the max width for recovery background texts"
am: c1df344381

Change-Id: I0a5900cba2e650082e9d9443c111f1682bb393e8
2017-01-23 20:53:06 +00:00
Chris Phoenix cf1af460d5 Merge "bootctrl HAL uses "default" service name" 2017-01-23 20:48:32 +00:00
Tianjie Xu c1df344381 Merge "Restore the max width for recovery background texts" 2017-01-23 20:37:12 +00:00
Tao Bao 0b1118d6b9 minui: Move callback functions to std::function.
Also make minor clean up to the header includes.

Test: mmma bootable/recovery system/core/healthd system/extra/slideshow
Change-Id: I3bfcf2c0e203c26a98ee08f1f8036c68356a69fd
2017-01-23 16:59:56 +00:00
Tianjie Xu 0f7031e295 Restore the max width for recovery background texts
Restore the max width to 900px for xxhdpi and 1200px for xxxhdpi

Bug: 34541299
Test: Checked width and images passed recovery_manual_test
Change-Id: If0fd51f93cfb3f965d4e9e69be5626eba89eb857
2017-01-22 18:46:04 -08:00
Tao Bao f013642477 Print with newline for ui_print.
Currently the ui_print command between the recovery and updater doesn't
append newline. Updater has to send an extra "ui_print" command without
any argument to get the line break. This looks unnecessary. And not all
the callers (including the ones in bootable/recovery) are following this
protocol when sending the ui_print command.

This CL simplifies the protocol to always print with a newline for
ui_print command. When updating from an old recovery with the new
updater, all the ui_print'd strings would appear in one line as a side
effect. But a) it would only affect the text-mode UI, which won't be
shown to users; b) log files won't be affected.

Bug: 32305035
Test: Apply an update with the new updater on top of an old and new
      recovery image respectively.
Change-Id: I305a0ffc6f180daf60919cf99d24d1495d68749b
2017-01-21 20:43:45 -08:00
Chris Phoenix 0157c78674 bootctrl HAL uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

In support of b/33844934

Change-Id: I5ce988128b0471384e1472298a0ae383df2b7c3e
Merged-In: I86c44aaaaf663e774c631a469ebf2b81619f89c4
2017-01-20 14:17:10 -08:00
Tao Bao 6a82bc228a Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656
am: ca261d3b48

Change-Id: I0278ded6acb4c003c65cb6b71b7b52a7824fe2fc
2017-01-20 20:22:13 +00:00
Tao Bao ca261d3b48 Merge "imgpatch: Compile with ZLIB_CONST defined."
am: e78ca37656

Change-Id: I636cfadd456cb6e256049a23f70e3a7a71c70d78
2017-01-20 20:19:44 +00:00
Tao Bao 4f8d217971 update_verifier: Move property_get() to android::base::GetProperty().
Also make minor changes to android::base::ParseUint(), which accepts
std::string now.

Test: Flash an A/B device and make sure update_verifier works (by
      marking the active slot as successfully booted).

Change-Id: Id6e578671cb3c87160c2b6ca717ee618ecf2342a
2017-01-20 12:19:23 -08:00
Tao Bao e78ca37656 Merge "imgpatch: Compile with ZLIB_CONST defined." 2017-01-20 20:15:57 +00:00