Commit graph

3140 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Tao Bao
087bc0c7d3 imgpatch: Compile with ZLIB_CONST defined.
So z_stream.next_in takes pointer to const data.

Test: mmma bootable/recovery/applypatch
Change-Id: If269b766a7c84fa2f67424ee61ba5afab0159261
2017-01-20 12:13:28 -08:00
Sen Jiang
9bb0819ef6 Merge "imgdiff: cache bsdiff suffix array in zip mode."
am: 37bda6a004

Change-Id: I444a0b2245ed72cd874f734a354feb2eb51e4b5a
2017-01-19 20:50:13 +00:00
Sen Jiang
37bda6a004 Merge "imgdiff: cache bsdiff suffix array in zip mode." 2017-01-19 20:45:27 +00:00
Tianjie Xu
a38224eadb Merge "Add checkers and tests for empty locale in PNG file"
am: 69e73ab7a9

Change-Id: Ie7f4dd37a6dbe08ced5c8735fb03af4601bc8f88
2017-01-19 19:20:36 +00:00
Tianjie Xu
69e73ab7a9 Merge "Add checkers and tests for empty locale in PNG file" 2017-01-19 19:17:18 +00:00
Tianjie Xu
d17a688525 Add checkers and tests for empty locale in PNG file
match_locale() will return false for empty locale string in the PNG
file. Also add a manual test to validate if a PNG file is qualified to
use under recovery.

Bug: 34054052
Test: recovery_manual_test catches invalid PNG files successfully & Locale_test passed

Change-Id: Id7e2136e1d8abf20da15825aa7901effbced8b03
2017-01-18 19:37:06 -08:00
Sen Jiang
930edb6661 imgdiff: cache bsdiff suffix array in zip mode.
In zip mode, if a chunk is not deflate or its filename can't be found
in source chunks, the entire source file is used as old data for bsdiff,
To avoid repeatedly construct the suffix array used by bsdiff, we cache
the suffix array of the entire source file.

Bug: 34281147
Test: =time -v imgdiff -z Chrome-ORF74B.apk Chrome-ORF76B.apk Chrome.imgdiff
Change-Id: Ifd957ccecf7226fcb44dbf28c58969a06ef74f4b
2017-01-18 17:26:42 -08:00
Tao Bao
ad20b76397 Merge "minui: Export minui/minui.h."
am: 13d15af08f

Change-Id: I12755c0fa6b184e68b49899e1cf589161e24eb62
2017-01-17 19:12:28 +00:00
Tao Bao
13d15af08f Merge "minui: Export minui/minui.h." 2017-01-17 19:08:48 +00:00
Tao Bao
0ecbd76b22 minui: Export minui/minui.h.
For libminui static and shared libraries.

Test: build
Change-Id: Ib30dc5e2ef4a3c8b3ca3a0cec68cb65e229a0c16
2017-01-16 21:28:18 -08:00
Tao Bao
421d92707d Merge "recovery: Move property_get() to android::base::GetProperty()."
am: ebb4e96a71

Change-Id: I248ed1d7e9099c5e89a758fb8d36fa5e13ab538c
2017-01-14 15:40:10 +00:00
Tao Bao
ebb4e96a71 Merge "recovery: Move property_get() to android::base::GetProperty()." 2017-01-14 15:37:01 +00:00
Tianjie Xu
19e4f627d8 Merge "Update background text images in recovery"
am: f0af02fea6

Change-Id: I9d287b5d0f5e7b93f77c8c5ea966e800a06a8178
2017-01-13 23:06:36 +00:00
Tianjie Xu
f0af02fea6 Merge "Update background text images in recovery" 2017-01-13 23:02:17 +00:00
Tao Bao
efc35594dd recovery: Move property_get() to android::base::GetProperty().
Test: Apply two A/B incremental OTAs with the new recovery image. The
      one with incorrect pre-build should be blocked, while the other
      works fine.

Change-Id: I94d97eb8798599da1630f66343fb603e87464187
2017-01-13 12:08:34 -08:00
Alex Deymo
f8f1a25850 Merge changes from topic 'host_suffix_cleanup'
am: 8031c2d2bb

Change-Id: Ifcbf0829692fcac31c5246a07994be1ce0f6ba59
2017-01-12 21:32:34 +00:00
Alex Deymo
204369ef1a Remove "_static" suffix from libsparse
am: 67f3aa8804

Change-Id: Id40f2a7335fed5b0669a98eaa0815b129e35432d
2017-01-12 21:27:38 +00:00
Alex Deymo
4b54093899 Remove "_static" suffix from libext4_utils.
am: 31653660ad

Change-Id: Iae744743d29b3669dd57403a2eb90153e5efbe46
2017-01-12 21:27:37 +00:00
Alex Deymo
8031c2d2bb Merge changes from topic 'host_suffix_cleanup'
* changes:
  Remove "_static" suffix from libsparse
  Remove "_static" suffix from libext4_utils.
2017-01-12 21:23:10 +00:00
Alex Deymo
67f3aa8804 Remove "_static" suffix from libsparse
Bug: 34220783

Change-Id: I358f931f0b29f5bd526e1475180e477e2e90b936
2017-01-11 14:38:30 -08:00
Alex Deymo
31653660ad Remove "_static" suffix from libext4_utils.
Bug: 34220783
Change-Id: I34ccc3b11da0d1b48805967ad75b9ddade569930
2017-01-11 14:02:13 -08:00
Tianjie Xu
854ef3b9d1 Merge "Do not inject I/O fault on a retry"
am: 37d74f3e20

Change-Id: Ie34000f89b027b79f4161edc7b53b3dd14e51d6a
2017-01-10 19:07:23 +00:00