Commit Graph

3785 Commits

Author SHA1 Message Date
Tom Cherry bec8264c6f Merge "update_verifier: correct group in rc file" am: 310fa65c02
am: 2717c28e77

Change-Id: I1f4f5330857098875addea53875f045003459b33
2017-04-04 01:15:54 +00:00
Tom Cherry 2717c28e77 Merge "update_verifier: correct group in rc file"
am: 310fa65c02

Change-Id: I66e145f77ab1543f91a2b666f6bd4f4287b61292
2017-04-04 01:11:54 +00:00
Treehugger Robot 310fa65c02 Merge "update_verifier: correct group in rc file" 2017-04-04 01:06:21 +00:00
Tom Cherry 3a8002f8c0 update_verifier: correct group in rc file
update_verifier should be in the cache group, not 'class'.

Also use PLOG instead of LOG if care_map.txt cannot be opened.

Bug: 36818743
Test: boot sailfish
Test: fake OTA on sailfish and verify update_verifier reads care_package
Change-Id: I0ec844cac5ef5c63b18ebee90160854fd84ee829
2017-04-03 16:31:16 -07:00
Wei Wang 8ed4fd4b69 Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d
am: 56e9b9cc26

Change-Id: Id664f6e38c53ada64365e7ce296de2a2832d179b
2017-04-03 23:26:47 +00:00
Wei Wang 56e9b9cc26 Merge "update_verifier: tweak priority of update_verifier for quick boot"
am: a6ea26987d

Change-Id: I19d4e2680f731d78a22f595a049cb079f1531516
2017-04-03 23:22:47 +00:00
Treehugger Robot a6ea26987d Merge "update_verifier: tweak priority of update_verifier for quick boot" 2017-04-03 23:15:52 +00:00
Wei Wang a015cd1d7a update_verifier: tweak priority of update_verifier for quick boot
Highest ioprio is 0 for CFQ and we should run update_verifier with that.
Tested on device and showing boottime decreased.

Bug: 36511808
Bug: 36102163
Test: Boot marlin
Change-Id: Iddd925951d976e21014b61e5590bcdae3cea8470
2017-04-03 13:53:49 -07:00
Tao Bao 0f72cf5403 Merge "applypatch: Remove duplicate test files." am: b6609f8895
am: 1f38a9b96e

Change-Id: I07005e37314f65775da6e9d6178652c624fc6379
2017-04-03 16:27:00 +00:00
Tao Bao 78e277cd42 Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2
am: a982e53a6e

Change-Id: Ib17659287aed12399b226236144d1f1561b05815
2017-04-03 16:26:50 +00:00
Tao Bao 1f38a9b96e Merge "applypatch: Remove duplicate test files."
am: b6609f8895

Change-Id: I725317517485f5332cf4ebd326deb027bfc397e8
2017-04-03 16:23:31 +00:00
Tao Bao a982e53a6e Merge "updater: Keep the parsed parameters in std::unique_ptr."
am: c80dd4ade2

Change-Id: I1387f9134a9bfeada23120b64544cdd7630f25e1
2017-04-03 16:23:20 +00:00
Tao Bao b6609f8895 Merge "applypatch: Remove duplicate test files." 2017-04-03 16:18:37 +00:00
Tao Bao c80dd4ade2 Merge "updater: Keep the parsed parameters in std::unique_ptr." 2017-04-03 16:18:12 +00:00
Tao Bao c3ef089dfa applypatch: Remove duplicate test files.
CL in commit b8a693bbc7 has ported the
tests to gtest-based recovery_component_tests.

Test: N/A
Change-Id: I485fa11413df68a11416d4a9f91f090f302bcfc0
2017-04-02 11:27:13 -07:00
Bill Yi bdf8a3106c Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 474dc18479  -s ours

Change-Id: I173829304cd93380fb3dedfd43d8b4774686d8a9
2017-04-02 04:00:17 +00:00
TreeHugger Robot 474dc18479 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 03:57:09 +00:00
Tianjie Xu 705a4d72c8 Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6
am: cd66e52573

Change-Id: I1e2df685b2e5fbf3b1affc949faf1cfc0348ca9e
2017-04-02 03:08:14 +00:00
Tianjie Xu cd66e52573 Merge "Use regular check for partition name instead of CHECK()"
am: 76cb4eeda6

Change-Id: Idd4686a7d30f08baa92557a0bcc872e95f867ba3
2017-04-02 03:05:45 +00:00
Tianjie Xu 76cb4eeda6 Merge "Use regular check for partition name instead of CHECK()" 2017-04-02 03:01:18 +00:00
Bill Yi 14eb2086c0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I1bfbb1791a4d7925491d7574c08994f6e7ff640d
2017-04-01 15:49:37 -07:00
Tianjie Xu 5a176c0d3c Use regular check for partition name instead of CHECK()
Bug: 36260064
Test: Device reboots for invalid care_map.
Change-Id: Id614f0d118fc2b9d9abf24918aa4b4324f4c94e1
2017-03-31 23:54:05 +00:00
Tianjie Xu 81f5b04df2 Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e
am: 89559e3cfe

Change-Id: Ia129cd76c9ab62d34d79d39046ceab3e4778e9bc
2017-03-31 22:24:36 +00:00
Tianjie Xu 89559e3cfe Merge "Update_verifier should read blocks in EIO mode"
am: 21d481c81e

Change-Id: Ib564e410f614ef516784eeaf9df24f33e4a07d8c
2017-03-31 22:22:06 +00:00
Tianjie Xu 21d481c81e Merge "Update_verifier should read blocks in EIO mode" 2017-03-31 22:17:00 +00:00
Tao Bao 3cf1113021 Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7
am: 74c4da4c01

Change-Id: I4675097d3b6938eef80db469e367e29296a69756
2017-03-31 19:27:25 +00:00
Tao Bao 74c4da4c01 Merge "Move parse_range() and range_overlaps() into RangeSet."
am: 8fab8f97b7

Change-Id: Ibb85242f50b14baea227661443d105e1a68e9504
2017-03-31 19:24:56 +00:00
Tao Bao c97edcb4f4 updater: Keep the parsed parameters in std::unique_ptr.
We don't need to take raw pointers out of the parsed arguments.
std::unique_ptr handles the dereferencing automatically.

Test: mmma bootable/recovery
Change-Id: I1beabf6e04dc350bdad7b36cee5fb345c82b28f2
2017-03-31 12:24:22 -07:00
Tao Bao 8fab8f97b7 Merge "Move parse_range() and range_overlaps() into RangeSet." 2017-03-31 19:18:45 +00:00
Tao Bao 8f23757ad4 Move parse_range() and range_overlaps() into RangeSet.
Also move RangeSet into a header file to make it testable, and add unit
tests.

In RangeSet::Parse() (the former parse_range()), use libbase logging to
do assertions. This has the same effect as the previous
exit(EXIT_FAILURE) to terminate the updater process and abort an update.
The difference lies in the exit status code (i.e. WEXITSTATUS(status) in
install.cpp), which changes from 1 (i.e. EXIT_FAILURE) to 0.

Test: recovery_unit_test
Test: Apply an incremental update with the new updater.
Change-Id: Ie8393c78b0d8ae0fd5f0ca0646d871308d71fff0
2017-03-31 00:04:56 -07:00
Tianjie Xu 3958a95f54 Update_verifier should read blocks in EIO mode
Update_verifier will reboot the device if it fails to read some blocks
on the care_map when veritymode=eio. Also make some partition name
changes to match the care_map.txt.

Test: Update_verifier reboots the device after read failures in eio mode.
Change-Id: Icf68e6151dee72f626a9ab72946100cf482a4e6c
2017-03-30 22:11:56 -07:00
Bowgo Tsai 18cc5b330a Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6
am: 0e728806f3

Change-Id: I5d8072efbefa8e3dea693b8e4367fcb7063c523b
2017-03-31 02:35:16 +00:00
Bowgo Tsai 0e728806f3 Merge "recovery: switch to fs_mgr_read_fstab_default()"
am: d0c7ae1fa6

Change-Id: I2afb42ed6b87e3e8d8e8289eb99fa6198d1a7daf
2017-03-31 02:32:48 +00:00
Treehugger Robot d0c7ae1fa6 Merge "recovery: switch to fs_mgr_read_fstab_default()" 2017-03-31 02:28:31 +00:00
Tao Bao 8538fab040 Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb
am: 7ccb4090d1

Change-Id: I3656d90bf395850fe183f278eb809a7f150e57eb
2017-03-31 00:03:44 +00:00
Tao Bao 7ccb4090d1 Merge "updater: Move RangeSinkWrite into RangeSinkState."
am: 65c065b4bb

Change-Id: Ic58d5dc9343840feaf916fdeac556b4191e64dfe
2017-03-31 00:01:46 +00:00
Tao Bao 65c065b4bb Merge "updater: Move RangeSinkWrite into RangeSinkState." 2017-03-30 23:56:14 +00:00
Tao Bao f39093d968 Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac
am: 08224f745c

Change-Id: I15e03a6cd11aa65e111db124b08fe567509256ab
2017-03-30 19:29:57 +00:00
Tao Bao 08224f745c Merge "updater: Don't append newline when calling uiPrint()."
am: 58cb690eac

Change-Id: Ib7f2356c3a519be52c65ebae179c24a138058b37
2017-03-30 19:27:29 +00:00
Tao Bao 58cb690eac Merge "updater: Don't append newline when calling uiPrint()." 2017-03-30 19:22:04 +00:00
Tao Bao 4d6f904a88 Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d
am: b648a8781f

Change-Id: I37702cf53e98ee389c2defdea92d99e8596af41e
2017-03-30 17:55:21 +00:00
Tao Bao b648a8781f Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES."
am: 3f0a3a2b1d

Change-Id: I9bad302ba2f047362ac920e92f135098fe32cbeb
2017-03-30 17:52:15 +00:00
Treehugger Robot 3f0a3a2b1d Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." 2017-03-30 17:45:48 +00:00
Tao Bao 0bbc764bbe updater: Don't append newline when calling uiPrint().
LOG(INFO) already appends a newline. Don't print redundant newline.

Test: No extra blank lines when calling ui_print(). And on-screen UI
      shows the same.
Change-Id: I74e9a8504a7146a6cb3dae02fe2406d0dd54069b
2017-03-30 10:28:37 -07:00
Dan Shi 57bb313b1e Merge "Add test config to minadbd_test" am: df1a585504
am: b8f33fdf5f

Change-Id: Ifa25165e3b03d49cfb4b5e6b0af14e1059837022
2017-03-30 15:47:13 +00:00
Dan Shi b8f33fdf5f Merge "Add test config to minadbd_test"
am: df1a585504

Change-Id: Ib5a65fd6f8e300812cea9aeccf05e31363096a09
2017-03-30 15:44:43 +00:00
Tao Bao 31b6bc5ced tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES.
Per the comment in build/make/core/base_rules.mk:
  Ninja has an implicit dependency on the command being run, and kati will
  regenerate the ninja manifest if any read makefile changes, so there is no
  need to have dependencies on makefiles.

Test: mmma bootable/recovery
Change-Id: I27b97df10d40f39ad966be70b33811175a665439
2017-03-30 08:43:47 -07:00
Treehugger Robot df1a585504 Merge "Add test config to minadbd_test" 2017-03-30 15:39:21 +00:00
Tom Cherry 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 Cherry 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