PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,598 Commits 1 Branch 0 Tags
1ab7bf47a60a39cc3d44fdac977e0a044cf06d8a
Commit Graph
5598 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xuandandroid-build-merger 1ab7bf47a6 Merge "Detect interrupted update due to power off" am: d8fadfb606 am: d9caba2bbe 
am: db20e41b0c

Change-Id: Ibd568f8881e3c9dd16c1567857d49badf9d4cdc2
 2017-12-01 03:02:14 +00:00
Tianjie Xuandandroid-build-merger db20e41b0c Merge "Detect interrupted update due to power off" am: d8fadfb606 
am: d9caba2bbe

Change-Id: I1f15871dde9525441f292bd1f546aaad0de158e5
 2017-12-01 03:00:12 +00:00
Tianjie Xuandandroid-build-merger d9caba2bbe Merge "Detect interrupted update due to power off" 
am: d8fadfb606

Change-Id: I2295430f7153711fb4e23d3e6f7af7c65efb7c54
 2017-12-01 02:58:41 +00:00
Treehugger RobotandGerrit Code Review d8fadfb606 Merge "Detect interrupted update due to power off" 2017-12-01 02:52:23 +00:00
Tianjie Xu 99b73be3a8 Detect interrupted update due to power off 
An interrupted update may stash extra blocks in /cache, leading to a
failure when checking the cache size. We can save the incremented
retry_count in the BCB before installing the update; and distinguish
a fresh update from an interrupted one this way.

Bug: 68679601
Test: An interrupted update reapplies successfully.
Change-Id: Ic1403e1fd25a937c91ef34c14b92a0f6c8f1c0f4
 2017-11-30 16:25:47 -08:00
Yifan HongandAndroid (Google) Code Review debdd1732c Merge "is_battery_ok use health 2.0 HAL" 2017-11-20 22:52:05 +00:00
Jin Qianandandroid-build-merger 86104180a0 Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c am: 25e27f48db 
am: 7a1abb9279

Change-Id: I6836e9294639fd99f65541960f33234e30262e2e
 2017-11-20 18:57:20 +00:00
Jin Qianandandroid-build-merger 7a1abb9279 Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c 
am: 25e27f48db

Change-Id: I1a9171a1f31384915c7a3b72785265b85a697979
 2017-11-20 18:54:48 +00:00
Jin Qianandandroid-build-merger 25e27f48db Merge "root: Fix an issue when volume length from fs_mgr is negative." 
am: 5ce9fe355c

Change-Id: I4ff7bccb0dd2fecf309f3a3d23379d2467d64aea
 2017-11-20 18:52:48 +00:00
Treehugger RobotandGerrit Code Review 5ce9fe355c Merge "root: Fix an issue when volume length from fs_mgr is negative." 2017-11-20 18:47:56 +00:00
Jin Qian cc10008887 root: Fix an issue when volume length from fs_mgr is negative. 
fs_mgr passes negative length as offset for crypt_footer. We need
to compute the actual device size for this case in addition to
when length is zero.

Bug: 68949069
Change-Id: I803955dd9591ad7752cee0dea9b683be8f4fd4ba
 2017-11-18 21:54:44 -08:00
Tianjie Xuandandroid-build-merger 0a0b6a9fe1 Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922 am: 086202e30d 
am: 2a8e4095cb

Change-Id: I40e952051126d2df4530a11c4aee434142a55736
 2017-11-17 16:18:17 +00:00
Tianjie Xuandandroid-build-merger 2a8e4095cb Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922 
am: 086202e30d

Change-Id: I7d6725aec1f22e006b1945c0068c61352785c509
 2017-11-17 16:15:43 +00:00
Tianjie Xuandandroid-build-merger 086202e30d Merge "Add libbrotli as a dependency when building applypatch binary" 
am: c7069cc922

Change-Id: I3379f84048c1b4c4858da537d045a1012c358b8b
 2017-11-17 16:13:13 +00:00
Tianjie XuandGerrit Code Review c7069cc922 Merge "Add libbrotli as a dependency when building applypatch binary" 2017-11-17 16:09:08 +00:00
Tianjie Xuandandroid-build-merger bb436b397a Merge "Switch imgdiff to libbase logging" am: fd9c25e636 am: 47c8c290ec 
am: 365c98fd1d

Change-Id: I88eca49e6004615f9398c42b6dfc79f8dc53085c
 2017-11-17 06:00:12 +00:00
Tianjie Xuandandroid-build-merger 365c98fd1d Merge "Switch imgdiff to libbase logging" am: fd9c25e636 
am: 47c8c290ec

Change-Id: I8712d65b019e294104bcbc8497a05fa6cc49024a
 2017-11-17 05:58:10 +00:00
Tianjie Xuandandroid-build-merger 47c8c290ec Merge "Switch imgdiff to libbase logging" 
am: fd9c25e636

Change-Id: Iaf36238df9567f9e0e08abec2581e55d4692068b
 2017-11-17 05:56:10 +00:00
Tianjie XuandGerrit Code Review fd9c25e636 Merge "Switch imgdiff to libbase logging" 2017-11-17 05:53:58 +00:00
Tianjie Xu 6e293c99c1 Switch imgdiff to libbase logging 
Also add a verbose option. And we won't print messages of 'info'
severity unless '-v' is present.

Test: run imgdiff and check the logs.
Change-Id: I1b90874baea8e72e2a2323a0b63bc5d35e653e6b
 2017-11-15 22:35:39 -08:00
Tao Baoandandroid-build-merger 8e376e01e7 Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 am: 345f350540 
am: 97a4750098

Change-Id: I5b8199d02212b0b2283e647effa3b1829704e27c
 2017-11-15 23:07:38 +00:00
Tao Baoandandroid-build-merger 97a4750098 Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 
am: 345f350540

Change-Id: I95cf7f4af44c8abc2ced807e0a3a2fb063448fc1
 2017-11-15 23:06:11 +00:00
Tao Baoandandroid-build-merger 345f350540 Merge "minadbd: Remove two warning options." 
am: 7bd61f0cc0

Change-Id: Id5e986ecd00cb2b953d761957a987a1b0c5ebf20
 2017-11-15 23:04:09 +00:00
Tao BaoandGerrit Code Review 7bd61f0cc0 Merge "minadbd: Remove two warning options." 2017-11-15 22:59:40 +00:00
Tao Bao f87d20404d minadbd: Remove two warning options. 
'-Wimplicit-function-declaration' is not needed (it's for C89) and
already enabled by -Wall.

For '-Wno-missing-field-initializers', don't see any existing case that
requires the flag.

Test: `mmma -j bootable/recovery` on aosp_{bullhead,marlin}-userdebug.
Change-Id: I46604723087ed9a7747f6cae31a95fc0074c6758
 2017-11-15 11:34:26 -08:00
Yifan Hong e8e4c40246 is_battery_ok use health 2.0 HAL 
Test: call is_battery_ok in graphics test, and test manually
Bug: 69268160
Bug: 63702641

Change-Id: Ifcf4d2e2cb459689c11fc5d1b880bb053aaae8ae
 2017-11-14 11:29:53 -08:00
Jaegeuk Kimandandroid-build-merger 60ee026849 Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd am: c418bfeae2 
am: e9e7fcf327

Change-Id: I8d2d42d66f4b96ea281b5ca7a3092273a12f7b7b
 2017-11-14 03:22:31 +00:00
Jaegeuk Kimandandroid-build-merger e9e7fcf327 Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd 
am: c418bfeae2

Change-Id: I2a040a11a71868915658958dbecf4bdd23c25e0c
 2017-11-14 03:01:01 +00:00
Jaegeuk Kimandandroid-build-merger c418bfeae2 Merge "recovery: format f2fs with encrypt/quota" 
am: d4b6e25fdd

Change-Id: I1d17a488d2eea4d858fa31e7a00d694e20b011b3
 2017-11-14 02:45:25 +00:00
Treehugger RobotandGerrit Code Review d4b6e25fdd Merge "recovery: format f2fs with encrypt/quota" 2017-11-14 01:49:26 +00:00
Jaegeuk Kim 1a8bb0f542 recovery: format f2fs with encrypt/quota 
Change-Id: Ia393b7b78b45f09964449ec0e255aa26bb3b8ddf
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
 2017-11-13 14:05:00 -08:00
Tao Baoandandroid-build-merger d70f5d924b Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03 am: e2296b7a25 
am: efcd98da32

Change-Id: I47c49255a65452c4842d5cffd382689a52129dcb
 2017-11-11 01:22:35 +00:00
Tao Baoandandroid-build-merger efcd98da32 Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03 
am: e2296b7a25

Change-Id: I7e1a7bd12c1cc3a03b7947b22a947eee16dacbff
 2017-11-11 01:20:04 +00:00
Tao Baoandandroid-build-merger e2296b7a25 Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." 
am: de07371b03

Change-Id: I2261486420f8e55cfbdd61f130be24f6e4deebf4
 2017-11-11 01:18:04 +00:00
Tao BaoandGerrit Code Review de07371b03 Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." 2017-11-11 01:09:47 +00:00
Tao Bao 1e0941f4f6 applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch. 
It used to be "const Value*", but nullptr won't be a valid input.

Test: recovery_host_test; recovery_component_test
Change-Id: I904b5689ac3e64504088bf0544c9fb5d45a52243
 2017-11-10 12:18:34 -08:00
Alex Deymoandandroid-build-merger 2c6b53899d Merge "Include bspatch.h from bsdiff/" am: 29cd3215ec am: e73bca40dc 
am: 0347049768

Change-Id: I67d921d4067ae55eed562e5364a5ad80594a6a21
 2017-11-10 10:01:05 +00:00
Alex Deymoandandroid-build-merger 0347049768 Merge "Include bspatch.h from bsdiff/" am: 29cd3215ec 
am: e73bca40dc

Change-Id: I22144a647f408bcf8a403db07937ce0793e531a4
 2017-11-10 09:59:04 +00:00
Alex Deymoandandroid-build-merger e73bca40dc Merge "Include bspatch.h from bsdiff/" 
am: 29cd3215ec

Change-Id: Ib53e96bee59300c4f94bf5de1801d4482a5abe3c
 2017-11-10 09:57:04 +00:00
Alex DeymoandGerrit Code Review 29cd3215ec Merge "Include bspatch.h from bsdiff/" 2017-11-10 09:54:11 +00:00
Tao Baoandandroid-build-merger 198db195af Merge "uncrypt: Move to Soong." am: 992bccfef4 am: e6250057b8 
am: ff0143d09e

Change-Id: I1692679a02c12b81533598a44d87bdcaabdd24ae
 2017-11-09 23:50:52 +00:00
Tao Baoandandroid-build-merger ff0143d09e Merge "uncrypt: Move to Soong." am: 992bccfef4 
am: e6250057b8

Change-Id: I360688f91c83bf2db3634ebc0f20ea2876980c03
 2017-11-09 23:31:50 +00:00
Tao Baoandandroid-build-merger e6250057b8 Merge "uncrypt: Move to Soong." 
am: 992bccfef4

Change-Id: If87cf6f7e32eb8089ec72207222eb5ec0b22adac
 2017-11-09 23:29:04 +00:00
Tao BaoandGerrit Code Review 992bccfef4 Merge "uncrypt: Move to Soong." 2017-11-09 23:09:33 +00:00
Tao Baoandandroid-build-merger 9715398c4b Merge "Load-balancing update_verifier worker threads." am: f1e70b93f1 am: 1d8cb3659a 
am: c5df267599

Change-Id: Ide0e35396eca221bc28b3a95ad35f9f3a380c9ce
 2017-11-09 22:00:36 +00:00
Tao Baoandandroid-build-merger c5df267599 Merge "Load-balancing update_verifier worker threads." am: f1e70b93f1 
am: 1d8cb3659a

Change-Id: I7e8ae9f60ef37d6948fa4d048b7a4317adc5e20c
 2017-11-09 20:49:09 +00:00
Tao Baoandandroid-build-merger 1d8cb3659a Merge "Load-balancing update_verifier worker threads." 
am: f1e70b93f1

Change-Id: Ia1224ef69a80ebd247943c2f010bc7cee00e3f69
 2017-11-09 20:35:38 +00:00
Tao Bao a2a68a522e uncrypt: Move to Soong. 
Test: mmma -j bootable/recovery
Change-Id: I405f2a70f51904c02c49a287c23cbc115a4c5132
 2017-11-09 12:34:00 -08:00
Treehugger RobotandGerrit Code Review f1e70b93f1 Merge "Load-balancing update_verifier worker threads." 2017-11-09 20:14:08 +00:00
Tao Bao 160514bf2b Load-balancing update_verifier worker threads. 
Prior to this CL, the block verification works were assigned based on
the pattern of the ranges, which could lead to unbalanced workloads. This
CL adds RangeSet::Split() and moves update_verifier over.

a) For the following care_map.txt on walleye:
system
20,0,347,348,540,556,32770,33084,98306,98620,163842,164156,229378,229692,294914,295228,524289,524291,524292,524348,529059
vendor
8,0,120,135,32770,32831,94564,98304,98306

Measured the time costs prior to and with this CL with the following
script.

$ cat test_update_verifier.sh
  #!/bin/sh

  adb shell stop
  adb shell "cp /data/local/tmp/care_map.txt /data/ota_package/"
  for i in $(seq 1 50)
  do
    echo "Iteration: $i"
    adb shell "bootctl set-active-boot-slot 0"
    adb shell "echo 3 > /proc/sys/vm/drop_caches"
    adb shell "time /data/local/tmp/update_verifier"
    sleep 3
  done

Without this CL, the average time cost is 5.66s, while with the CL it's
reduced to 3.2s.

b) For the following care_map.txt, measured the performance on marlin:
system
18,0,271,286,457,8350,32770,33022,98306,98558,163842,164094,196609,204800,229378,229630,294914,295166,501547
vendor
10,0,42,44,85,2408,32770,32806,32807,36902,74242

It takes 12.9s and 5.6s without and with the CL respectively.

Fixes: 68553827
Test: recovery_unit_test
Test: Flash new build and trigger update_verifier. Check the balanced
      block verification.
Change-Id: I5fa4bf09a84e6b9b0975ee5f522724464181333f
 2017-11-08 23:04:28 -08:00