PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,090 Commits 1 Branch 0 Tags
13b64beab63fc11222538f805ea0b09564dc6e96
Commit Graph

6090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhomart Mukhamejanov 13b64beab6 Merge "updater_sample: update tools" am: daa86e9024 am: 9fdeb57ab0 
am: e6a50aa78d

Change-Id: I4172bea382b100981640d566b9b9433df23375a0
 2018-05-08 18:27:30 -07:00
Zhomart Mukhamejanov 208774bdee Merge "updater_sample: add streaming support" am: c23a53c272 am: e88d4682ea 
am: e970d6857f

Change-Id: Ic356d1186891bd8e0b7d4e2af6e4e650eebc4a69
 2018-05-08 18:26:40 -07:00
Zhomart Mukhamejanov e6a50aa78d Merge "updater_sample: update tools" am: daa86e9024 
am: 9fdeb57ab0

Change-Id: I1e517b533628e4ae8d27b00cc9a3852fa961f267
 2018-05-08 18:22:11 -07:00
Zhomart Mukhamejanov e970d6857f Merge "updater_sample: add streaming support" am: c23a53c272 
am: e88d4682ea

Change-Id: Iba9d5541b0a853e1eb91794dc01994c4454486a7
 2018-05-08 18:21:53 -07:00
Zhomart Mukhamejanov 9fdeb57ab0 Merge "updater_sample: update tools" 
am: daa86e9024

Change-Id: I8d2d6173e307a6c409742439c4707d522bcd7be1
 2018-05-08 18:18:22 -07:00
Zhomart Mukhamejanov e88d4682ea Merge "updater_sample: add streaming support" 
am: c23a53c272

Change-Id: I4aa8a41a4dd3afd4b1c5fb3d6955abea45c16fc4
 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
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 fe76180cfa Merge "recovery: Remove unneeded include of minui.h." am: 0a2c4e260f am: 5004300d6f 
am: 8141ad8364

Change-Id: Ia27732a734e0c257b26b60e2f1ab73f2983921bd
 2018-05-08 11:52:36 -07:00
android-build-prod (mdb) 18928bfc72 Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." am: 1f3a9c0a43 am: 730d541588 
am: 6fc9795fbe

Change-Id: I0e29703558a65efc3b7f49a998ebc390a98b6ed8
 2018-05-08 11:37:32 -07:00
Tao Bao 8141ad8364 Merge "recovery: Remove unneeded include of minui.h." am: 0a2c4e260f 
am: 5004300d6f

Change-Id: I46cabe2bf6289a222b8a554f74cee565b7e7e03b
 2018-05-08 11:28:14 -07:00
Tao Bao 5004300d6f Merge "recovery: Remove unneeded include of minui.h." 
am: 0a2c4e260f

Change-Id: I6b072fba4b509ce801663e28e4fc53f180a776f2
 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

Change-Id: I6b5f29414be17ec8814c8729add689f0672270f0
 2018-05-08 11:24:42 -07:00
android-build-prod (mdb) 730d541588 Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." 
am: 1f3a9c0a43

Change-Id: Ibbb3e5673670ce112e1d15f961ad7ce5ea2d5c60
 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 d016ed4d78 Merge "recovery: Get UI and locale from device." am: d8abd2bd70 am: 07bf50a51d 
am: e5caa4095b

Change-Id: I6a2be86bb2d03a0f603ba137e71dfc664cabc302
 2018-05-08 11:07:41 -07:00
Tao Bao e5caa4095b Merge "recovery: Get UI and locale from device." am: d8abd2bd70 
am: 07bf50a51d

Change-Id: Ia362ec6f81d04502be6cb0212b655577bbd33bb8
 2018-05-08 10:46:01 -07:00
Tao Bao 07bf50a51d Merge "recovery: Get UI and locale from device." 
am: d8abd2bd70

Change-Id: I15d5c733081a453224868a6dea9274456e7f7b89
 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 55bdab5e8d [automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4 am: 260d4ba55f -s ours 
am: 9faf292488  -s ours

Change-Id: I2147acff8dfb76ba106796b9b7eb7fb9de840097
 2018-05-07 20:51:22 -07:00
Tao Bao 9faf292488 [automerger skipped] Merge "recovery: Refactor logging code into logging.cpp" am: 5285c27bf4 
am: 260d4ba55f  -s ours

Change-Id: I5cb92b10097463148a9b2cfe694de470d3dbec90
 2018-05-07 20:44:52 -07:00
Tao Bao 260d4ba55f Merge "recovery: Refactor logging code into logging.cpp" 
am: 5285c27bf4

Change-Id: I661d2250aeefb56a77ad686b726fc825f1d5a56f
 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 4fb85d58d6 Merge "updater: Skip an updated partition on retry." am: 0ffe13b56f am: 83906f75bb 
am: 6ca5e0c252

Change-Id: I99dd9c4edd5320515bda1db2d229f11c9ad9507f
 2018-05-07 18:54:59 -07:00
Tao Bao 6ca5e0c252 Merge "updater: Skip an updated partition on retry." am: 0ffe13b56f 
am: 83906f75bb

Change-Id: I7b7b4d974bb639be0bc97ef03a63f81ceaaae76d
 2018-05-07 18:21:17 -07:00
Tao Bao 83906f75bb Merge "updater: Skip an updated partition on retry." 
am: 0ffe13b56f

Change-Id: I50582c6c397194713bb52cf1d04e541236e9d5c0
 2018-05-07 18:15:43 -07:00
Tao Bao 0ffe13b56f Merge "updater: Skip an updated partition on retry." 2018-05-08 00:57:14 +00:00
Tao Bao 422bc60f4e Merge "updater: Fix an issue when resuming an update." am: 1dc9e2ddef am: 47bf5e68e6 
am: 13784d1511

Change-Id: I2bf115ee8c4a77c6097e6e52e0ec2ef9b5f73f72
 2018-05-07 17:44:39 -07:00
Tao Bao 13784d1511 Merge "updater: Fix an issue when resuming an update." am: 1dc9e2ddef 
am: 47bf5e68e6

Change-Id: I2e555a2534bb0e14b520aa4c9036aaa7d73407c4
 2018-05-07 17:36:32 -07:00
Tao Bao 47bf5e68e6 Merge "updater: Fix an issue when resuming an update." 
am: 1dc9e2ddef

Change-Id: Iee6d93057ee1c63a35fda2603a5fd5836db83179
 2018-05-07 17:29:00 -07:00
Tao Bao 1dc9e2ddef Merge "updater: Fix an issue when resuming an update." 2018-05-08 00:16:32 +00:00
Tao Bao 98f875eee7 updater: Fix an issue when resuming an update. 
We cannot skip "new" commands while resuming an update with
last_command_file, because they read in the data sequentially from the
package.

Bug: 69858743
Test: Interrupt an update that has new commands. Check the update log.
Change-Id: I05fb67246f5ea3ba2a0f78f10255c0d9b0bc2f5a
 2018-05-07 22:14:45 +00:00
Tao Bao 864c668dd2 updater: Skip an updated partition on retry. 
Prior to the change, the BBOTA updater would try to re-run all the
commands for a given partition on retry, including creating stashes
according to the list of commands. This could fail a retry when the
previous update had moved on to next stage, with leftovers in /cache.

This CL creates a marker on /cache upon successfully updating a
partition. The update commands will be skipped when trying to apply
updates on an updated partition. Note that the marker is expected to be
removed while doing a normal boot (in particular, handled by
RecoverySystem#handleAftermath). If that didn't happen, the updater
would also remove the marker before starting next fresh update.

Alternatively, we can achieve the same goal by changing the OTA script,
which needs to additionally compare the checksum against the target
build. For example,

  range_sha1("/system", "ranges") == SHA1_of_updated_system ||
  block_image_update("/system");

The downside is that we need to pay that cost on each install, as the
edify script doesn't support caching the result in a variable.

Bug: 79165963
Test: Simulate the process on device (by triggering a reboot while
      updating /vendor). Check the update log and result.
Change-Id: I731031fa336133e1221b33edfc469969706e8091
 2018-05-07 15:05:00 -07:00
Jerry Zhang 152933a28e recovery: Refactor logging code into logging.cpp 
Move common logging related functions to
rotate_logs.cpp, and rename that to logging.cpp.

Test: Recovery works
Bug: 78793464
Merged-In: I00f20a79a296680122b8437d54a87897c5cb2fc7
Change-Id: I00f20a79a296680122b8437d54a87897c5cb2fc7
 2018-05-07 14:14:17 -07:00
Jerry Zhang 6bdb289d7f recovery: Refactor logging code into logging.cpp 
am: cadf4ed451

Change-Id: I2966ae6be9500cfed2054c6539209ea4a293efd5
 2018-05-07 13:30:59 -07:00
Jerry Zhang cadf4ed451 recovery: Refactor logging code into logging.cpp 
Move common logging related functions to
rotate_logs.cpp, and rename that to logging.cpp.

Test: Recovery works
Bug: 78793464
Change-Id: I00f20a79a296680122b8437d54a87897c5cb2fc7
(cherry picked from commit 3c3f211d1e)
 2018-05-07 19:25:03 +00:00
Jerry Zhang 3c3f211d1e recovery: Refactor logging code into logging.cpp 
Move common logging related functions to
rotate_logs.cpp, and rename that to logging.cpp.

Test: Recovery works
Bug: 78793464
Change-Id: I00f20a79a296680122b8437d54a87897c5cb2fc7
 2018-05-07 11:12:32 -07:00
android-build-prod (mdb) 6cf0a98b93 Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4 am: c4ba6b738f 
am: 13415d9138

Change-Id: If1f0b46e3134fc8a36553ad98f8e03b3e3488f81
 2018-05-04 10:49:39 -07:00
android-build-prod (mdb) 13415d9138 Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4 
am: c4ba6b738f

Change-Id: I7696fb68e13e214ee830b9de1bf66dc6f1cac691
 2018-05-04 10:43:36 -07:00
android-build-prod (mdb) c4ba6b738f Merge changes I1cc5d702,I32ab9854 
am: 420f7f8df4

Change-Id: I4efb48a107303b58c2b40a7a9d8e663c537e5a84
 2018-05-04 10:38:41 -07:00
android-build-prod (mdb) 420f7f8df4 Merge changes I1cc5d702,I32ab9854 
* changes:
  Move reboot() from common.h into otautil/sysutil.h.
  otautil: Rename dir/sys/thermal utils.
 2018-05-04 17:26:11 +00:00
Tao Bao 0ac03af39e Merge "otautil: Only build the needed files for host build." am: 5818e894df am: d7d087f31c 
am: 17a27aa2e2

Change-Id: Ie5268384f4ed8cd98b6d03089bcbfd2b14179f30
 2018-05-04 09:40:55 -07:00
Tao Bao 17a27aa2e2 Merge "otautil: Only build the needed files for host build." am: 5818e894df 
am: d7d087f31c

Change-Id: I2fe3c3b0a718482114bcb744211ed6b9fa1d0904
 2018-05-04 09:36:27 -07:00
Tao Bao d7d087f31c Merge "otautil: Only build the needed files for host build." 
am: 5818e894df

Change-Id: I2c9bf65f56c0bf9fe1d912717ef7952768d9a664
 2018-05-04 09:30:47 -07:00