Commit Graph

3885 Commits

Author SHA1 Message Date
Tao Bao a40303bafc Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916 am: ed5ee5292c
am: 0f38c6da12

Change-Id: I20e3c6b46345df5035d7077dbd3aaf0a2be58670
2017-02-09 20:01:17 +00:00
Tao Bao 0f38c6da12 Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71 am: f6b6b75916
am: ed5ee5292c

Change-Id: I21eb69fec55c2f68142acd94f043557fa24f75f2
2017-02-09 19:52:46 +00:00
Tao Bao ed5ee5292c Merge "minui: Clean up graphics_drm.cpp." am: 648f252c71
am: f6b6b75916

Change-Id: I897a2b2a5046554a92ee8be59bc6e90ebbe2b8f5
2017-02-09 19:51:15 +00:00
Tao Bao f6b6b75916 Merge "minui: Clean up graphics_drm.cpp."
am: 648f252c71

Change-Id: I30f5536b2a0686424da0dc31ba9da787768a00d4
2017-02-09 19:49:15 +00:00
Treehugger Robot 648f252c71 Merge "minui: Clean up graphics_drm.cpp." 2017-02-09 19:43:20 +00:00
Tao Bao 76be34cb34 minui: Clean up graphics_drm.cpp.
Remove unneeded header includes. Switch a few memset() to '= {}'
style. Otherwise mostly cosmetic changes like reformatting.

Test: 'Run graphics test' on ryu (which is a DRM device).

Change-Id: I4b0ab2dc0da69a690f09e4f0674b8377de662962
2017-02-07 14:47:59 -08:00
Tao Bao 94720ced1a Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2 am: b8af1beed0
am: 5101b78f03

Change-Id: I0ae109fdc9c0600fdaf82dedbf56bb86a63ff6d3
2017-02-03 23:53:26 +00:00
Tao Bao 5101b78f03 Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2
am: b8af1beed0

Change-Id: I1f764a4f9c1cb442f9c6d8a5ae885739364fcc04
2017-02-03 23:51:27 +00:00
Tao Bao b8af1beed0 Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e
am: 80176c68b2

Change-Id: I6338fc4f929b0887563a0194719c887131538fec
2017-02-03 23:48:27 +00:00
Tao Bao 80176c68b2 Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)."
am: 95bcbfdd4e

Change-Id: Icbf6b4d02cc8d60c66f7ed8ebf9d7798a2d518c3
2017-02-03 23:45:58 +00:00
Treehugger Robot 95bcbfdd4e Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." 2017-02-03 23:40:06 +00:00
Tianjie Xu 8e81a98a71 Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 am: 15ab95bb63
am: 5eaf3cd966

Change-Id: Idd211a64de13886a6ca74b5bf33159d3b90cdf7d
2017-02-03 22:18:50 +00:00
Tianjie Xu 5eaf3cd966 Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9
am: 15ab95bb63

Change-Id: Ifedf5d53d6ff11ecfeda4a8a1fe7f4e802c9e152
2017-02-03 22:16:19 +00:00
Tianjie Xu 15ab95bb63 Merge "Avoid to call UI functions in child process" am: 0f275ae56e
am: 5fa2e576f9

Change-Id: I83d52f51ab6c788cc67a75ca6f7a46cd2f8289cd
2017-02-03 22:14:20 +00:00
Tianjie Xu 5fa2e576f9 Merge "Avoid to call UI functions in child process"
am: 0f275ae56e

Change-Id: Ia1a735d6ca5c966e6e84c5fe67456c3b5142632e
2017-02-03 22:12:19 +00:00
Tao Bao 3da880156b Replace _exit(-1) with _exit(EXIT_FAILURE).
-1 is not a valid exit status.

Also replace a few exit(1) with exit(EXIT_FAILURE).

Test: mmma bootable/recovery
Change-Id: I4596c8328b770bf95acccc06a4401bd5cabd4bfd
2017-02-03 14:11:11 -08:00
Tianjie Xu ce7d41150d Merge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cf am: a8764c46aa
am: f15097c98a

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

Change-Id: Iee59f57ae75c69ac2113ddf20e327b35d63bad23
2017-02-03 22:07:52 +00:00
Treehugger Robot 0f275ae56e Merge "Avoid to call UI functions in child process" 2017-02-03 22:06:50 +00:00
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 89c56ce014 Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d am: 7d8e13a535
am: cdd7b47545

Change-Id: Ib8e921d63f067bdf3547419e072cdb1a7ad9f0fc
2017-02-03 21:04:16 +00:00
Tao Bao cdd7b47545 Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d
am: 7d8e13a535

Change-Id: Ia8041250f259e3aded94a623c72aa589980b383a
2017-02-03 20:59:44 +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
Tianjie Xu ab1abae59c Avoid to call UI functions in child process
ui_print uses a mutex to protect the critical section. And a forked
child process may intialize the mutex inappropriatly, which leads to a
hanging child process. So we shall avoid to call the UI functions in
child process.

Bug: 34769056
Test: fake ota on fugu failed as expected due to updater format mismatch.
Change-Id: I81bc942a796878fac19cf712512092c2b0d807c9
2017-02-03 20:35:40 +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 9d15b4ea0d Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7d am: 2be767eba4
am: 8af3af933b

Change-Id: If2e117d67d4f26c9014d6eb53b9fdc4b33b9332b
2017-02-01 16:49:59 +00:00
Tao Bao 8af3af933b Merge "Fix a log issue in ui.cpp." am: 7f38fbf976 am: c33d037d7d
am: 2be767eba4

Change-Id: Id0b175413d92e994fb18c0b93bdfd20a02843e6c
2017-02-01 16:47:28 +00: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 3e41d22400 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777 am: 1c35b48253
am: e4cf63be78

Change-Id: I4fca7ee7e8164e049d966822670d486c3e3fc183
2017-02-01 05:23:22 +00:00
Tao Bao e4cf63be78 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: 7ab9c3812d am: 29ef12f777
am: 1c35b48253

Change-Id: Ic23c7a580b346220485c913e98304c5a3cf05026
2017-02-01 05:20:55 +00: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 85ff6f7d06 Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34 am: 79ce31073a
am: 1d17298958

Change-Id: Ie6692ff538ffb4600e4c912ca0f1dca0355e8cfb
2017-01-31 06:22:54 +00:00
Tao Bao 1d17298958 Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34
am: 79ce31073a

Change-Id: I7f8d0553853ed01acd9973a80c710b3eab1f370b
2017-01-31 06:20:23 +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 45ca9f203b Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 am: 9518d34c0f
am: ade61afd29

Change-Id: I8e5a22261264f0fd5506e9916a37e1af20261645
2017-01-26 00:01:41 +00:00
Alex Deymo ade61afd29 Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0
am: 9518d34c0f

Change-Id: I18abe00601a4642ebe3a2557e2f862b4a84221ba
2017-01-25 23:59:07 +00: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