Commit Graph

5020 Commits

Author SHA1 Message Date
Tao Bao 88fd6aff38 Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac
am: fccf3bc0cf

Change-Id: Ia081fa95df4fb5eebf17d984cd012f6bbde12e40
2017-09-27 01:03:52 +00:00
Tao Bao fccf3bc0cf Merge "clang-format: Remove the override of PenaltyExcessCharacter."
am: 151f0820ac

Change-Id: I6239cc5a76c39ae6f6e183000f4cab0573183be9
2017-09-27 01:01:34 +00:00
Tao Bao 151f0820ac Merge "clang-format: Remove the override of PenaltyExcessCharacter." 2017-09-27 00:57:55 +00:00
Tianjie Xu 448af2aa77 Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841
am: eb5e194012

Change-Id: I6a9a4107fdc5a19941c4e506fd807a2b97bef3b0
2017-09-27 00:06:45 +00:00
Tianjie Xu eb5e194012 Merge "Output split information for imgdiff when handling large apks"
am: 7f54fe8841

Change-Id: I97ad82d84b16b46e9c0c0f8198d3ab73d43031b0
2017-09-27 00:02:43 +00:00
Tianjie Xu 7f54fe8841 Merge "Output split information for imgdiff when handling large apks" 2017-09-26 23:57:40 +00:00
Tao Bao a1f6980af7 clang-format: Remove the override of PenaltyExcessCharacter.
So it falls back (from 32) to the default value in Google style:
PenaltyExcessCharacter: 1000000

This way it no longer allows lines exceeding the 100-char limit.

const char* x[] = { "long enough so that the line has 101 chars", nullptr };

  would become

const char* x[] = { "long enough so that the line has 101 chars",
                    nullptr };

Test: clang-format the line above.
Change-Id: If578dbdae55d6d81f5e47889890e2afa12b4199a
2017-09-26 15:07:45 -07:00
Tianjie Xu 9425dba5b3 Merge "update the recovery background image with new translation" am: c0123e0c3a
am: 6a5204ac8d

Change-Id: I1ca72cab196f5c37f792d3728acfebdf4a781058
2017-09-21 22:12:02 +00:00
Tianjie Xu 6a5204ac8d Merge "update the recovery background image with new translation"
am: c0123e0c3a

Change-Id: I071133d52c92b7166df12313c7298621a6718eaa
2017-09-21 22:09:58 +00:00
Tianjie Xu c0123e0c3a Merge "update the recovery background image with new translation" 2017-09-21 22:05:29 +00:00
Tianjie Xu 82582b4562 Output split information for imgdiff when handling large apks
Add a mandatory option in imgdiff to write the split info (i.e.
patch_size, tgt_size, src_ranges) to file when handling large apks.
Therefore, the caller of imgdiff can create split transfers based on
the info.

Bug: 63542719
Test: unit tests pass
Change-Id: I853d55d1f999fd576474faa81077f7307f4d856d
2017-09-21 11:42:16 -07:00
Tianjie Xu 4a47a3e41f update the recovery background image with new translation
Test: recovery manual test && run graphic test under recovery
Change-Id: I2bc514a07a12276f42adb1eec5e208190b4602f2
2017-09-19 23:36:28 -07:00
Mark Salyzyn 4b8bbb95ab Merge "recovery: reduce overall boot time" am: a815d3fb59
am: 9da4179ee6

Change-Id: I03c6ce2eabb113534a57ba777360eb8d16a7a47b
2017-09-18 23:46:16 +00:00
Mark Salyzyn 9da4179ee6 Merge "recovery: reduce overall boot time"
am: a815d3fb59

Change-Id: I430edd95601b47d09861e289e0de51ff1bc32fdd
2017-09-18 23:44:20 +00:00
Treehugger Robot a815d3fb59 Merge "recovery: reduce overall boot time" 2017-09-18 23:37:59 +00:00
Mark Salyzyn 61744b95d0 recovery: reduce overall boot time
Move recovery-refresh and recovery-persist to onshot exec_background.
synchronous exec commands impact boot time.

Test: none
Bug: 65736247
Change-Id: Ic065c27b21f9bacbadee1e8c07bb15e2c41e0082
2017-09-18 13:55:32 -07:00
Tianjie Xu ed50c1817f Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307
am: 2cb1fb45c0

Change-Id: Ia4d4dd1f1f0e2667d0b4bbe06c76d20663ce580f
2017-09-17 21:45:23 +00:00
Tianjie Xu 2cb1fb45c0 Merge "Fix the dangling pointer when setting up arguments of imgdiff"
am: ca5a071307

Change-Id: I9411f0bce8d96c598db365d0257d4c9893e24104
2017-09-17 21:42:23 +00:00
Tianjie Xu ca5a071307 Merge "Fix the dangling pointer when setting up arguments of imgdiff" 2017-09-17 21:39:09 +00:00
Tao Bao 34e7d45fb3 Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b
am: ad878d5494

Change-Id: I26f95122637228debd396ad07928273e1f776da1
2017-09-13 21:57:04 +00:00
Tao Bao ad878d5494 Merge "Remove EXPAND/STRINGIFY macros."
am: 6e7df82c7b

Change-Id: Id3bf3e77e54c90739cf716029928197c3274632f
2017-09-13 21:40:03 +00:00
Tianjie Xu 8ba7c45e0b Fix the dangling pointer when setting up arguments of imgdiff
Test: unit tests pass
Change-Id: If884e805ccd4df73671ab3436eb90860786ff6c9
2017-09-13 14:05:42 -07:00
Tao Bao 6e7df82c7b Merge "Remove EXPAND/STRINGIFY macros." 2017-09-13 20:53:53 +00:00
Tao Bao bd0ddcd5e8 Remove EXPAND/STRINGIFY macros.
This reverts commit 8be0f39fec to reland
the change that removes EXPAND/STRINGIFY macros.

It's error-prone by putting anything into a string (e.g.
EXPAND(RECOVERY_API_VERSION) would become "RECOVER_API_VERSION" if we
forgot to pass -DRECOVERY_API_VERSION=3).

The initial attempt put RECOVERY_API_VERSION into common.h, which might
be included by device-specific codes but without defining that when
compiling the module. This CL avoids the issue by using a constant
in the header, with a static_assert in recovery.cpp that guards the
consistency.

Test: recovery_component_test
Test: Sideload OTAs on bullhead and sailfish respectively.
Change-Id: I12af3f73392a85554ba703f04970ec9d984ccbaa
2017-09-13 10:51:09 -07:00
Tianjie Xu d83c0a8715 Merge "Close cmd_pipe properly after updater test finishes" am: 64307daf5b
am: a11601da9b

Change-Id: If8f66fdf17f4878c067e7d7e5505ea00c1418fb2
2017-09-12 19:50:12 +00:00
Tianjie Xu a11601da9b Merge "Close cmd_pipe properly after updater test finishes"
am: 64307daf5b

Change-Id: Ic384d9de3c559855cfe0bd122adb5e69fa996ad1
2017-09-12 19:47:11 +00:00
Tianjie Xu 64307daf5b Merge "Close cmd_pipe properly after updater test finishes" 2017-09-12 19:14:38 +00:00
Tao Bao 547d5fd559 Merge "ui: Move locale and friends into ScreenRecoveryUI class." am: fc570c317b
am: 166188c2c6

Change-Id: I8f5010df98eb10f117a4391a107f956e8bbb97f4
2017-09-11 22:03:40 +00:00
Tao Bao 166188c2c6 Merge "ui: Move locale and friends into ScreenRecoveryUI class."
am: fc570c317b

Change-Id: I4e4849c837f11340b3cafdd04e678fd3f7cb4c5d
2017-09-11 21:56:40 +00:00
Tao Bao fc570c317b Merge "ui: Move locale and friends into ScreenRecoveryUI class." 2017-09-11 21:43:03 +00:00
Tianjie Xu 79327ac21d Close cmd_pipe properly after updater test finishes
Otherwise the test may fail after a large number of iterations due to
file open failure.

Bug: 65430057
Test: run recovery_component_test on sailfish for 2000 iterations.
Change-Id: I0d456284d6064467038911d63eade95740cbec2c
2017-09-11 14:38:49 -07:00
Tao Bao cce9b2c96a Merge "ui: Remove text_top_." am: 568644197f
am: d96ce15139

Change-Id: I005f49442b63fafe5642a6e416c176361d0beff0
2017-09-11 19:31:20 +00:00
Tao Bao d96ce15139 Merge "ui: Remove text_top_."
am: 568644197f

Change-Id: I83872bc318db77036f70bb07baaade12c1b34b6e
2017-09-11 19:26:49 +00:00
Tao Bao efb49add97 ui: Move locale and friends into ScreenRecoveryUI class.
Localized texts only make sense on devices with screens.

Test: Run fake OTA on angler; check the on-screen texts.
Change-Id: I3a644294c8b1f2056cfb78b2d61a598b8ddf2acf
2017-09-11 12:19:32 -07:00
Tao Bao 568644197f Merge "ui: Remove text_top_." 2017-09-11 19:06:12 +00:00
Tao Bao bd9ef0ad1a Merge "ui: Refactor the declaration orders." am: 79a23b30d2
am: cb94b611cf

Change-Id: I70be41861c95d25849190062dd710097b7648375
2017-09-11 18:25:23 +00:00
Tao Bao cb94b611cf Merge "ui: Refactor the declaration orders."
am: 79a23b30d2

Change-Id: Icf22068baae034b480333ac358a50c9368ebdc98
2017-09-11 18:20:43 +00:00
Tao Bao 79a23b30d2 Merge "ui: Refactor the declaration orders." 2017-09-11 18:06:24 +00:00
Tao Bao 7577965ba1 ui: Refactor the declaration orders.
By grouping similar kinds together, in an order of types, constants,
ctor/dtor, all other methods and data members.

Also rename ScreenRecoveryUI::density_ to ScreenRecoveryUI::kDensity to
align with others.

Test: mmma bootable/recovery
Change-Id: I1ba2d15c05ba7be8c39762f3d9dadf1fb2130de4
2017-09-10 11:36:54 -07:00
Tao Bao cb5524c23a ui: Remove text_top_.
After the cleanup to WearRecoveryUI, text_top_ now always equals to
((text_row_ + 1) % text_rows_).

Test: Check the recovery UI and 'View recovery logs'.
Change-Id: I69a7f377bbd990db2194f9d3efae257c323c06a8
2017-09-08 23:31:31 -07:00
Tao Bao 53bb5ff137 Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." am: fa4f014063
am: 5f5ccacef7

Change-Id: I287ef8936851abe69b50e1f3ca5f5dd0d752d9d6
2017-09-08 21:53:28 +00:00
Tao Bao 77425c5e15 Merge "ui: Manage menu_ with std::vector." am: f51bb0f2d6
am: 4e3e42bed8

Change-Id: I413c3d1734c51046784b9f2b94a2305023c2a890
2017-09-08 21:53:14 +00:00
Tao Bao 5f5ccacef7 Merge "wear_ui: Remove Print()/ShowFile()/PutChar()."
am: fa4f014063

Change-Id: If47ce2f16e839c10ac8447ef69eb40392abeaf00
2017-09-08 21:51:58 +00:00
Tao Bao 4e3e42bed8 Merge "ui: Manage menu_ with std::vector."
am: f51bb0f2d6

Change-Id: I16dfb5ee848cf97ee98626183aef8fdc228c8dae
2017-09-08 21:51:44 +00:00
Tao Bao fa4f014063 Merge "wear_ui: Remove Print()/ShowFile()/PutChar()." 2017-09-08 21:44:40 +00:00
Tao Bao f51bb0f2d6 Merge "ui: Manage menu_ with std::vector." 2017-09-08 21:43:41 +00:00
Tianjie Xu b2dac70423 Merge "Improve imgdiff for large zip files" am: 9f48641784
am: e24e90f403

Change-Id: I2692f832b720bdf966263d35f8e0a0bab8fe0699
2017-09-08 20:48:45 +00:00
Tianjie Xu e24e90f403 Merge "Improve imgdiff for large zip files"
am: 9f48641784

Change-Id: I999525af80c5423da275025d977de10399140479
2017-09-08 20:46:47 +00:00
Tianjie Xu 9f48641784 Merge "Improve imgdiff for large zip files" 2017-09-08 20:38:52 +00:00
Tao Bao f05e2bcff2 wear_ui: Remove Print()/ShowFile()/PutChar().
They're mostly identical to the ones in ScreenRecoveryUI, except for the
(legacy) use of 'text_top_'. Because wear_ui.cpp misses the change in
[1] that uses an alternate screen for viewing recovery logs.

Also clean up the included headers.

[1] commit c049163234 ('Add an alternate
screen for viewing recovery logs.').

Test: Build a wearable target recovery; `View recovery logs`.
Change-Id: Ic9208c42a11c037469f5b073ef7d9b721c14d1f3
2017-09-08 12:22:43 -07:00