PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,734 Commits 1 Branch 0 Tags
e404f5d9c85bf9b588d72c24002c2277ebf6bc94
Commit Graph
3734 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Cherryandandroid-build-merger e404f5d9c8 Merge "update_verifier: raise priority and ioprio and start with exec_start" am: 3a8919e813 
am: 8fe39a28b0

Change-Id: I08ec1da1be30d8fa240785e0d0261d1279a646bc
 2017-03-29 18:46:55 +00:00
Tom Cherryandandroid-build-merger 8fe39a28b0 Merge "update_verifier: raise priority and ioprio and start with exec_start" 
am: 3a8919e813

Change-Id: Ie61669fa42793d0e3620ba20720f1aed1735d49e
 2017-03-29 18:44:57 +00:00
Treehugger RobotandGerrit Code Review 3a8919e813 Merge "update_verifier: raise priority and ioprio and start with exec_start" 2017-03-29 18:39:31 +00:00
Tao Baoandandroid-build-merger cbc90e5c2c Merge "Log the error message when failing to mount/umount." am: 850f89f198 
am: 23fe20fb6e

Change-Id: Ic9aa9f793ea2e13dc877d7c55e3c396e8cba455c
 2017-03-29 06:26:40 +00:00
Tao Baoandandroid-build-merger 23fe20fb6e Merge "Log the error message when failing to mount/umount." 
am: 850f89f198

Change-Id: I5de062307d6a395035cada802fd8fe202418407b
 2017-03-29 06:24:41 +00:00
Tao BaoandGerrit Code Review 850f89f198 Merge "Log the error message when failing to mount/umount." 2017-03-29 06:19:03 +00:00
Tao Bao 5f85d1fb0a Log the error message when failing to mount/umount. 
Test: Observe the error messaage for a umount failure case.
Bug: 36686818
Change-Id: I28e335c2df4454dd0192f95e3909599fcc9dc1c0
 2017-03-28 21:21:28 -07:00
Tao Baoandandroid-build-merger 39ef2d7f3d Merge "tests: Construct two bad packages at runtime for VerifierTest." am: 3f2d35522a 
am: 197e49d60c

Change-Id: I65b0abc35d2d6044447099f534c894f86132045f
 2017-03-29 00:47:18 +00:00
Tao Baoandandroid-build-merger 197e49d60c Merge "tests: Construct two bad packages at runtime for VerifierTest." 
am: 3f2d35522a

Change-Id: I439b941da099c4b45853b12a9e0f2a190208e2d9
 2017-03-29 00:43:48 +00:00
Tao BaoandGerrit Code Review 3f2d35522a Merge "tests: Construct two bad packages at runtime for VerifierTest." 2017-03-29 00:37:05 +00:00
Tom Cherry 545317f4fb update_verifier: raise priority and ioprio and start with exec_start 
Raise the priority and ioprio of update_verifier and launch with
exec_start.  This saves ~100ms of time before `class_start main` is executed.

Bug: 36511808
Bug: 36102163
Test: Boot bullhead
Test: Verify boottime decrease on sailfish
Change-Id: I944a6c0d4368ead5b99171f49142da2523ed1bdd
 2017-03-28 15:55:20 -07:00
Tao Baoandandroid-build-merger 62a4e5ca98 Merge "tests: Add a test for --wipe_ab into UncryptTest." am: 7b0cda5b37 
am: c6df7d2937

Change-Id: Iea518cbea5e64bd06475c472f88c6cc8c75602d6
 2017-03-28 22:27:41 +00:00
Tao Baoandandroid-build-merger c6df7d2937 Merge "tests: Add a test for --wipe_ab into UncryptTest." 
am: 7b0cda5b37

Change-Id: Iadc316dd0503240b3d8bbdf30334c9da92ac238f
 2017-03-28 22:22:12 +00:00
Tao BaoandGerrit Code Review 7b0cda5b37 Merge "tests: Add a test for --wipe_ab into UncryptTest." 2017-03-28 22:12:35 +00:00
Tianjie Xuandandroid-build-merger 6835d52c7e Merge "Suppress the unused variable warning in parser.yy" am: b9b03a282b 
am: 05c111b90b

Change-Id: I111bdd2b72dd4ae04e7c6bcb020621fdc77915b7
 2017-03-28 21:34:15 +00:00
Tianjie Xuandandroid-build-merger 556ca4e301 Merge "Log temperature during OTA update" am: bc2c51a97f 
am: 1d7e500bfc

Change-Id: I44a64b7cf0054fcc4cea9b6124c3f6a089f268e1
 2017-03-28 21:34:07 +00:00
Tianjie Xuandandroid-build-merger 05c111b90b Merge "Suppress the unused variable warning in parser.yy" 
am: b9b03a282b

Change-Id: I722683e1a474180dc7bfd85d249e05aab66c8712
 2017-03-28 21:28:50 +00:00
Tianjie Xuandandroid-build-merger 1d7e500bfc Merge "Log temperature during OTA update" 
am: bc2c51a97f

Change-Id: I7feda067a7e343868a7a1fef3a561afa9d14e77c
 2017-03-28 21:28:37 +00:00
Treehugger RobotandGerrit Code Review b9b03a282b Merge "Suppress the unused variable warning in parser.yy" 2017-03-28 21:21:06 +00:00
Tianjie XuandGerrit Code Review bc2c51a97f Merge "Log temperature during OTA update" 2017-03-28 21:16:45 +00:00
Tianjie Xuandandroid-build-merger 5ec12126f0 Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 
am: dc235b5ab9

Change-Id: I8683d9c8d6d2dfe1ef6085b48f6edc2cb8b1834d
 2017-03-28 20:02:45 +00:00
Tianjie Xuandandroid-build-merger dc235b5ab9 Merge "Add the missing sr-Latn into png files and rename the png locale header" 
am: 713d915636

Change-Id: I23a8ac215d4a549cda347b86a91df1bb97e089c5
 2017-03-28 19:52:47 +00:00
Tianjie Xu c3c3496ab2 Suppress the unused variable warning in parser.yy 
The warning says: bootable/recovery/edify/parser.yy:123.3-9: warning:
unused value: $1

Bug: 36678950
Test: mma
Change-Id: Ic734c416a5a8f62fb5e516669102c1d2b4ad5083
 2017-03-28 12:44:10 -07:00
Tianjie XuandGerrit Code Review 713d915636 Merge "Add the missing sr-Latn into png files and rename the png locale header" 2017-03-28 19:42:54 +00:00
Tao Baoandandroid-build-merger a2015e0d86 Merge changes from topic 'sinkfn' am: 34df98ee6d 
am: 862b7e8523

Change-Id: I859296b62fcd7b43775885f4d2ece3272a9bff11
 2017-03-28 19:16:34 +00:00
Tao Baoandandroid-build-merger 52569ce2ed applypatch: Change the ssize_t length parameters to size_t. am: f7eb760fe7 
am: d4d9ef3941

Change-Id: Ifd231403d2d5960faf35859d445de73a78b6a371
 2017-03-28 19:16:31 +00:00
Tao Baoandandroid-build-merger 862b7e8523 Merge changes from topic 'sinkfn' 
am: 34df98ee6d

Change-Id: I05710606fac5b4b8746416799635691f4083aef4
 2017-03-28 19:11:11 +00:00
Tao Baoandandroid-build-merger d4d9ef3941 applypatch: Change the ssize_t length parameters to size_t. 
am: f7eb760fe7

Change-Id: I4661186d7bd696e4fa5318217b383cbe0a2902c3
 2017-03-28 19:11:06 +00:00
Treehugger RobotandGerrit Code Review 34df98ee6d Merge changes from topic 'sinkfn' 
* changes:
  applypatch: Let Apply{BSDiff,Image}Patch accept std::function.
  applypatch: Change the ssize_t length parameters to size_t.
 2017-03-28 19:01:32 +00:00
Tianjie Xu 3ee2b9db5a Log temperature during OTA update 
Log the maximum temperature as well as the start/end temperature of an
update to last_install. Check the temperature at the end of each
block_image_update(verify). To get the maximum temp, we iterate through
/sys/class/thermal/thermal_zone*/temp and find the maximum value
present.

Bug: 32518487
Test: temperature logs in last_install
Change-Id: Iaf22a9fbc5b18611bbc5320ffea995417872e514
 2017-03-28 11:28:47 -07:00
Tao Bao bdc8c1a264 tests: Add a test for --wipe_ab into UncryptTest. 
Also factor out the common parts in {setup,clear}_bcb into a separate
function.

Test: recovery_component_test
Change-Id: I7b95cced925c8135e020dcb791ca2425d4f28449
 2017-03-28 10:55:02 -07:00
Tao Bao c0e1c46a70 applypatch: Let Apply{BSDiff,Image}Patch accept std::function. 
Test: mmma bootable/recovery system/update_engine
Test: recovery_component_test
Change-Id: I93c2caa87bf94a53509bb37f98f2c02bcadb6f5c
 2017-03-28 10:14:53 -07:00
Tao Bao f7eb760fe7 applypatch: Change the ssize_t length parameters to size_t. 
Mostly for applypatch family APIs like ApplyBSDiffPatch() and
ApplyImagePatch(). Changing to size_t doesn't indicate they would
necessarily work with very large size_t (e.g. > ssize_t), just
similar to write(2). But otherwise accepting negative length doesn't
make much sense.

Also change the return type of SinkFn from ssize_t to size_t. Callers
tell a successful sink by comparing the number of written bytes against
the desired value. Negative return values like -1 are not needed. This
also makes it consistent with bsdiff::bspatch interface.

Test: recovery_component_test
Test: Apply an incremental with the new updater.
Change-Id: I7ff1615203a5c9854134f75d019e266f4ea6e714
 2017-03-28 10:13:38 -07:00
Tao Baoandandroid-build-merger 21b5268fbd Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 
am: 51159a069d

Change-Id: Ia542c58abd931af5f2b0bc089ff2b67886c91070
 2017-03-28 05:51:11 +00:00
Tao Baoandandroid-build-merger 51159a069d Merge "updater: Clean up LoadSrcTgtVersion2()." 
am: f037b7b535

Change-Id: I6e2488d12fadebb5b17949b5fbecbaee335700af
 2017-03-28 05:46:42 +00:00
Tao BaoandGerrit Code Review f037b7b535 Merge "updater: Clean up LoadSrcTgtVersion2()." 2017-03-28 05:40:20 +00:00
Tao Bao d2aecd465b updater: Clean up LoadSrcTgtVersion2(). 
Rename to LoadSourceBlocks() by moving the target blocks parsing part
into the caller. This allows detecting whether the target blocks have
already had the expected data before loading the source blocks. It
doesn't affect anything when applying an update package for the first
time, but it skips loading the unneeded source blocks when resuming an
update. It additionally avoids unnecessarily dumping the "corrupt"
source/stash blocks when resuming an update.

Bug: 33694730
Test: Apply an incremental update with the new updater.
Test: Resume an incremental update with the new updater.
Change-Id: I794fd0d1045be7b3b7f8619285dc0dade01398d0
 2017-03-27 16:21:55 -07:00
Tao Bao 217d9f9859 tests: Construct two bad packages at runtime for VerifierTest. 
For the BadPackage tests from VerifierTest: one alters the footer, and
the other alters the metadata. Move the two tests to be based on
otasigned_v3.zip (they're based on otasigned_v1.zip previously). Also
construct the testdata files dynamically (to save the space and for
better readability).

Test: recovery_component_test
Change-Id: I7604d563f8b4fa0c55fec8730c063384158e3abc
 2017-03-27 16:10:11 -07:00
Tao Baoandandroid-build-merger e65835d5ac Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853 
am: b0e768e269

Change-Id: I87d8040917dcd2fc6e233458c8b14f4cdb15e457
 2017-03-27 19:32:06 +00:00
Tao Baoandandroid-build-merger b0e768e269 Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" 
am: 27c3e47853

Change-Id: Ie55f8cbbcec911192d9fd3b92f32731721dba36f
 2017-03-27 19:29:34 +00:00
Tao BaoandGerrit Code Review 27c3e47853 Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" 2017-03-27 19:23:12 +00:00
Bowgo Tsai 4508f23884 Revert "libbootloader_message: use different fstab paths for normal/recovery boot" 
This reverts commit 37bd44174b.

The logic here is better to be moved into fs_mgr, not fs_mgr clients.

Bug: 35811655
Bug: 36502022

Change-Id: Iae79bd8f7131516ad223f3323f1bc1d805206d51
Test: normal boot sailfish, go to Settings > System & tap 
      on "Factory Data reset"
Test: recovery boot sailfish
 2017-03-27 17:47:21 +00:00
Tianjie Xuandandroid-build-merger 334850c9fe Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours 
am: a97b0712d8  -s ours

Change-Id: I94338224aa3f9b7b88518527f14dd51f7ce62b22
 2017-03-27 05:40:27 +00:00
Tianjie Xuandandroid-build-merger 898fa718a9 Skip logging the warning for uncrypt_status for devices w/o /cache 
am: 340e6762f8

Change-Id: I05e9925238255de835b8a9317a74f9d199cef494
 2017-03-27 05:40:15 +00:00
Tianjie Xuandandroid-build-merger a97b0712d8 Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" 
am: df0619edea  -s ours

Change-Id: I997f1ad6197e8a92530f50ed7fc002b972681407
 2017-03-27 05:37:19 +00:00
Tianjie Xu 340e6762f8 Skip logging the warning for uncrypt_status for devices w/o /cache 
This warning may cause confusion for users.

Bug: 36590598
Test: Warning line no longer shows for sailfish.
Change-Id: I277c87a50a72fdb499be790ee25b97f815d980be
(cherry picked from commit bcb5b18630f518835a0768535b43ccfe91683fc9)
 2017-03-27 05:36:48 +00:00
Tianjie XuandGerrit Code Review df0619edea Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" 2017-03-27 05:15:40 +00:00
Tianjie XuandAndroid (Google) Code Review 49420e6c3d Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp 2017-03-27 02:56:28 +00:00
Tao Baoandandroid-build-merger dcbabd5932 Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 
am: 351f69e64a

Change-Id: I83220c87347e6f4fe76b73924347b55a9c9e18ff
 2017-03-26 18:06:09 +00:00
Tao Baoandandroid-build-merger 351f69e64a Merge "applypatch: Drop the support for patching non-EMMC targets." 
am: b4c4f8c494

Change-Id: If2eadfe81c5a7942c2709a548dcd3957323e3436
 2017-03-26 18:03:10 +00:00