Zhomart Mukhamejanov
9ca1e2778a
Merge "updater_sample: add HAL compatibility check" am: 563d34f712
...
am: 0045e76c7c
2018-05-10 20:19:57 -07:00
Zhomart Mukhamejanov
0045e76c7c
Merge "updater_sample: add HAL compatibility check"
...
am: 563d34f712
2018-05-10 20:14:25 -07:00
Zhomart Mukhamejanov
563d34f712
Merge "updater_sample: add HAL compatibility check"
2018-05-11 03:05:21 +00:00
Tao Bao
374498ff33
Merge "Document the clang-format usage." am: 797550fb8b
...
am: cc71d271c1
2018-05-10 17:20:59 -07:00
Tao Bao
4fd58ca28a
Merge "Device owns the RecoveryUI instance." am: 6df846e337
...
am: 8d593973d6
2018-05-10 17:20:02 -07:00
Tao Bao
cc71d271c1
Merge "Document the clang-format usage."
...
am: 797550fb8b
2018-05-10 17:16:52 -07:00
Tao Bao
8d593973d6
Merge "Device owns the RecoveryUI instance."
...
am: 6df846e337
2018-05-10 17:16:00 -07:00
Tao Bao
797550fb8b
Merge "Document the clang-format usage."
2018-05-11 00:04:06 +00:00
Tao Bao
6df846e337
Merge "Device owns the RecoveryUI instance."
2018-05-11 00:03:55 +00:00
Zhomart Mukhamejanov
cc65b655bb
Merge "updater_sample: fix UpdateConfig" am: 7217e7045d
...
am: 48294e3d86
2018-05-10 15:00:57 -07:00
Zhomart Mukhamejanov
48294e3d86
Merge "updater_sample: fix UpdateConfig"
...
am: 7217e7045d
2018-05-10 14:56:56 -07:00
Zhomart Mukhamejanov
46a51ac4b6
updater_sample: add HAL compatibility check
...
- Refactor PrepareStreamingService#onHandleIntent
- Add PrepareStreamingService#verifyPackageCompatibility
Test: on the device
Bug: 79471299
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
Change-Id: I1b18502f0638d66810a3f7ada582e4c7cea20cdb
2018-05-10 14:45:52 -07:00
Zhomart Mukhamejanov
7217e7045d
Merge "updater_sample: fix UpdateConfig"
2018-05-10 21:45:03 +00:00
Tao Bao
601493e8c4
Document the clang-format usage.
...
`repo upload` and `git clang-format` may give slightly different
results, because they may trigger different `clang-format` binaries.
Document the setup to get consistent formatting results.
Test: N/A
Change-Id: I927dd25c7a6dd51be4812d5b3857a4b08c5a3f81
2018-05-10 13:12:59 -07:00
Zhomart Mukhamejanov
bb8a215138
updater_sample: fix UpdateConfig
...
- fix UpdateConfig
- fix smaple.json
- fix FileDownloaderTest
Test: manually
Change-Id: I09d272f77c89a02f54a24cf753fdfda4ce243927
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-10 12:19:16 -07:00
Zhomart Mukhamejanov
775cdd1c76
Merge "updater_sample: add http header demo" am: fe5b3e2b2d
...
am: 319e191238
2018-05-10 11:10:09 -07:00
Zhomart Mukhamejanov
319e191238
Merge "updater_sample: add http header demo"
...
am: fe5b3e2b2d
2018-05-10 10:59:06 -07:00
Zhomart Mukhamejanov
fe5b3e2b2d
Merge "updater_sample: add http header demo"
2018-05-10 16:03:34 +00:00
Tao Bao
551d2c3181
Device owns the RecoveryUI instance.
...
Test: mmma -j bootable/recovery
Test: Build and boot into recovery, w/ and w/o enabling quiescent mode
respectively.
Change-Id: I5d9bb945a6c3c9a3b96199fa0c8071a2f91339a0
2018-05-09 21:22:26 -07:00
Zhomart Mukhamejanov
6aa5fb0bbe
updater_sample: add http header demo
...
Added demo passing http headers to UpdateEngine#applyPayload.
Bug: 79483768
Test: manually
Change-Id: I3e9c812dba2066acadbcea8d07c933368806e20c
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-09 17:33:52 -07:00
Tao Bao
641692f11d
Merge "screen_ui: Fix an issue when displaying wrapped text." am: 1d4ef4ba4b
...
am: ae4b00c427
2018-05-09 14:21:01 -07:00
Tao Bao
ae4b00c427
Merge "screen_ui: Fix an issue when displaying wrapped text."
...
am: 1d4ef4ba4b
2018-05-09 14:17:29 -07:00
Tao Bao
1d4ef4ba4b
Merge "screen_ui: Fix an issue when displaying wrapped text."
2018-05-09 21:11:09 +00:00
Tao Bao
452b487f31
screen_ui: Fix an issue when displaying wrapped text.
...
The last character at EOL is cut when showing the prompt-for-data-wipe
message on angler. Address the issue by keeping symmetrical margins
based on the given offset.
Test: Trigger prompt-and-wipe-data menu. No cutout character at EOL.
Change-Id: Id6e8dc7815bf681435bcaf13e7bdd09cf870d95f
2018-05-09 12:32:27 -07:00
Zhomart Mukhamejanov
e6a50aa78d
Merge "updater_sample: update tools" am: daa86e9024
...
am: 9fdeb57ab0
2018-05-08 18:22:11 -07:00
Zhomart Mukhamejanov
e970d6857f
Merge "updater_sample: add streaming support" am: c23a53c272
...
am: e88d4682ea
2018-05-08 18:21:53 -07:00
Zhomart Mukhamejanov
9fdeb57ab0
Merge "updater_sample: update tools"
...
am: daa86e9024
2018-05-08 18:18:22 -07:00
Zhomart Mukhamejanov
e88d4682ea
Merge "updater_sample: add streaming support"
...
am: c23a53c272
2018-05-08 18:17:23 -07:00
Zhomart Mukhamejanov
daa86e9024
Merge "updater_sample: update tools"
2018-05-09 01:04:59 +00:00
Zhomart Mukhamejanov
c23a53c272
Merge "updater_sample: add streaming support"
2018-05-09 01:04:41 +00:00
Tao Bao
347a659d9b
screen_ui: Fix an issue in RTL locale detection.
...
The CL in [1] moved android.os.RecoverySystem to send the locale
argument in well-formed BCP 47 language tags (e.g. "en-US" instead of
"en_US"), with the matching changes to recovery code in [2]. However,
the one in ScreenRecoveryUI::SetLocale() was missed, which broke RTL
locale detection when using new format.
[1] commit 38715228 in platform/frameworks/base
[2] commit 2078b22e
2018-05-08 17:56:33 -07:00
Tao Bao
6cd816859e
tests: Add tests for ScreenRecoveryUI.
...
In order to support that, this CL adds Paths::set_resource_dir() to
override the default resource dir ("/res/images/") that's only available
under recovery. Note that since there're external modules depending on
libminui, it adds a separate function of res_set_resource_dir(), instead
of requiring the dependency on libotautil for everyone.
Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin.
Change-Id: I0a7dcf4476808bea9e634eaffc9676f6cbaf92b7
2018-05-08 15:53:56 -07:00
Zhomart Mukhamejanov
96eb59e4b1
updater_sample: update tools
...
- Allow gen_update_config.py to use ota_from_target_files from
$ANDROID_BUILD_TOP/build/make/tools/releasetools/
- tests/res/raw/ota_002_package.zip re-generated using functions from
$ANDROID_BUILD_TOP/build/make/tools/releasetools/test_ota_from_target_files.py
- sample app tests updated
Test: ./tools/gen_update_config_test.py
Change-Id: I5c492ec22782ba54fe481f592a44e797c695684e
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-08 21:13:34 +00:00
Zhomart Mukhamejanov
0dd5a83d0e
updater_sample: add streaming support
...
- UpdateConfigs: add helper methods for streaming
- add PrepareStreamingService intent service
Test: manually and junit4
Bug: 77148143
Change-Id: I61711eb9abe051987e725fbd94f8cd029ff21dd3
2018-05-08 21:12:33 +00:00
Tao Bao
8141ad8364
Merge "recovery: Remove unneeded include of minui.h." am: 0a2c4e260f
...
am: 5004300d6f
2018-05-08 11:28:14 -07:00
Tao Bao
5004300d6f
Merge "recovery: Remove unneeded include of minui.h."
...
am: 0a2c4e260f
2018-05-08 11:24:42 -07:00
android-build-prod (mdb)
6fc9795fbe
Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." am: 1f3a9c0a43
...
am: 730d541588
2018-05-08 11:24:42 -07:00
android-build-prod (mdb)
730d541588
Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages."
...
am: 1f3a9c0a43
2018-05-08 11:21:43 -07:00
Tao Bao
0a2c4e260f
Merge "recovery: Remove unneeded include of minui.h."
2018-05-08 18:21:00 +00:00
android-build-prod (mdb)
1f3a9c0a43
Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages."
2018-05-08 18:11:35 +00:00
Tao Bao
e5caa4095b
Merge "recovery: Get UI and locale from device." am: d8abd2bd70
...
am: 07bf50a51d
2018-05-08 10:46:01 -07:00
Tao Bao
07bf50a51d
Merge "recovery: Get UI and locale from device."
...
am: d8abd2bd70
2018-05-08 10:42:31 -07:00
Tao Bao
d8abd2bd70
Merge "recovery: Get UI and locale from device."
2018-05-08 17:32:36 +00:00
Tao Bao
39c4918a40
screen_ui: Drop the parameter in CheckBackgroundTextImages.
...
ScreenRecoveryUI already has the info in locale_.
Also when showing "Current locale: X/Y" on screen, use 1-based index for
X, so that we have 1 <= X <= Y.
Test: Build anf flash recovery image on aosp_bullhead-userdebug. Choose
`Run locale test` from UI.
Change-Id: I5dd4de82e63890ddf755f4e23cd2290ad5d50ece
2018-05-07 23:50:50 -07:00
Jerry Zhang
2dea53ef2b
recovery: Get UI and locale from device.
...
This removes some reliance on the global
locale and ui variables.
Test: Recovery works
Bug: 78793464
Change-Id: I78f1a2b321f5d50aa58b10735a73ae137283353a
2018-05-08 06:09:54 +00:00
Tao Bao
9faf292488
[automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4
...
am: 260d4ba55f
2018-05-07 20:44:52 -07:00
Tao Bao
260d4ba55f
Merge "recovery: Refactor logging code into logging.cpp"
...
am: 5285c27bf4
2018-05-07 20:39:54 -07:00
Tao Bao
83ff1f0b05
recovery: Remove unneeded include of minui.h.
...
Test: mmma -j bootable/recovery
Change-Id: I1a79fa6386d56bf5e20ee074352d287403d2d745
2018-05-07 20:31:26 -07:00
Tao Bao
5285c27bf4
Merge "recovery: Refactor logging code into logging.cpp"
2018-05-08 03:30:50 +00:00
Tao Bao
6ca5e0c252
Merge "updater: Skip an updated partition on retry." am: 0ffe13b56f
...
am: 83906f75bb
2018-05-07 18:21:17 -07:00
