Commit Graph

3073 Commits

Author SHA1 Message Date
Tianjie Xu c012c3ce01 Merge "Change StringValue to use std::string" am: 2b17b24ae5 am: 430b7ae469
am: 13d8ee8c72

Change-Id: Ib8730f1656dfea01cb8dcb5a3ee50a40d13179ac
2016-10-18 00:28:30 +00:00
Tianjie Xu 13d8ee8c72 Merge "Change StringValue to use std::string" am: 2b17b24ae5
am: 430b7ae469

Change-Id: Ife83f67a57629747b9804ca332265344a8350d2a
2016-10-18 00:21:59 +00:00
Tianjie Xu 430b7ae469 Merge "Change StringValue to use std::string"
am: 2b17b24ae5

Change-Id: Ie3c7e6993848f53893e9079bb5cffa11d9c2a3f0
2016-10-18 00:15:29 +00:00
Treehugger Robot 2b17b24ae5 Merge "Change StringValue to use std::string" 2016-10-18 00:05:12 +00:00
Tao Bao d0c3085a91 Merge "init: move healthd to late-init" am: a01ffc73ef am: 4de11bb370
am: f194cb3b99

Change-Id: Ib2df5497cc9e113eacbbbe92b61f7e6608055767
2016-10-17 17:57:35 +00:00
Tao Bao f194cb3b99 Merge "init: move healthd to late-init" am: a01ffc73ef
am: 4de11bb370

Change-Id: I81b584ea1f60f7495afc85d38b5e91fae4769b98
2016-10-17 17:50:34 +00:00
Tao Bao 4de11bb370 Merge "init: move healthd to late-init"
am: a01ffc73ef

Change-Id: Iab786297c3dd19c61b11364d6fb49d52fcf007a4
2016-10-17 17:44:33 +00:00
Tao Bao a01ffc73ef Merge "init: move healthd to late-init" 2016-10-17 17:32:56 +00:00
Tianjie Xu aced5d9e4e Change StringValue to use std::string
Changing the field of 'Value' in edify to std::string from char*.
Meanwhile cleaning up the users of 'Value' and switching them to
cpp style.

Test: compontent tests passed.
Bug: 31713288

Change-Id: Iec5a7d601b1e4ca40935bf1c70d325dafecec235
2016-10-15 01:18:23 +00:00
Tao Bao 1dfe482021 resolve merge conflicts of 08d0ae9 to stage-aosp-master am: ddf293aa0c
am: 36415acf6a

Change-Id: I8b71b0d55971f6d94ef6af59b6efa1300fe17df4
2016-10-14 23:45:15 +00:00
Tao Bao 36415acf6a resolve merge conflicts of 08d0ae9 to stage-aosp-master
am: ddf293aa0c

Change-Id: Ia4fb968c0b45b584a69f28401507826f837a978d
2016-10-14 23:40:53 +00:00
Tao Bao ddf293aa0c resolve merge conflicts of 08d0ae9 to stage-aosp-master
Change-Id: I4d0cc04fd5853cabdd950691dfb2e7115cb1ff17
2016-10-14 15:51:00 -07:00
Treehugger Robot 08d0ae9254 Merge "Fix the prefix matching for uncrypt status." 2016-10-14 22:39:19 +00:00
Tao Bao a1b9c560b7 Fix the prefix matching for uncrypt status.
am: 1709d22b4e

Change-Id: I4d48fddb7698f45413543f806ab6ccfac350832d
2016-10-14 20:15:07 +00:00
Tao Bao 1709d22b4e Fix the prefix matching for uncrypt status.
Also change its logging statement from PLOG to LOG, since
android::base::StartsWith() doesn't set errno.

Test: Build and reboot into recovery image. Check last_log.

Change-Id: I55ac7eec24228db76a13580958b4a4330b06cf57
(cherry picked from commit ee9b95544a)
(cherry picked from commit e30a5b3a44)
2016-10-14 18:07:47 +00:00
Tao Bao e30a5b3a44 Fix the prefix matching for uncrypt status.
Also change its logging statement from PLOG to LOG, since
android::base::StartsWith() doesn't set errno.

Test: Build and reboot into recovery image. Check last_log.

Change-Id: I55ac7eec24228db76a13580958b4a4330b06cf57
(cherry picked from commit ee9b95544a)
2016-10-13 17:17:16 -07:00
Tao Bao ee9b95544a Fix the prefix matching for uncrypt status.
Also change its logging statement from PLOG to LOG, since
android::base::StartsWith() doesn't set errno.

Test: Build and reboot into recovery image. Check last_log.

Change-Id: I55ac7eec24228db76a13580958b4a4330b06cf57
2016-10-13 16:07:15 -07:00
Tao Bao 5f3982056d Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca am: bd16939bbf
am: 1b1a4edb4b

Change-Id: Idc74e9e549fe61c8b3bb566579821660ecf459c4
2016-10-13 18:02:46 +00:00
Tao Bao 1b1a4edb4b Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca
am: bd16939bbf

Change-Id: Ibbbe5b4b202263e4f3a5d3e802210baf81347708
2016-10-13 17:50:16 +00:00
Tao Bao bd16939bbf Merge "edify: Some clean-ups to libedify." am: c5b4b71913
am: 039e9dc5ca

Change-Id: I0188f978c2ef1497ffbad1c3e3125fa61d11ddf5
2016-10-13 17:38:14 +00:00
Tao Bao 039e9dc5ca Merge "edify: Some clean-ups to libedify."
am: c5b4b71913

Change-Id: I6ac4dfc514dfa917698268a999d8435987790302
2016-10-13 17:30:14 +00:00
Tao Bao c5b4b71913 Merge "edify: Some clean-ups to libedify." 2016-10-13 17:18:07 +00:00
Tao Bao 39119ad8ec edify: Some clean-ups to libedify.
- Remove dead declarations in expr.h: SetError(), GetError(),
  ClearError().
- Remove the declaration of Build() out of expr.h.
- Use std::unordered_map to implement RegisterFunction() and
  FindFunction(); kill FinishRegistration().
- Add a testcase for calling unknown functions.

Test: mmma bootable/recovery; recovery_component_test passes.
Change-Id: I9af6825ae677f92b22d716a4a5682f58522af03b
2016-10-12 23:29:59 -07:00
Tao Bao f3d3dca01d Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd am: aa9f017ceb
am: 998c6debca

Change-Id: Ifb2e1a950c685816a70e4edfb2514319a4b03cc1
2016-10-12 19:48:56 +00:00
Tao Bao 998c6debca Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd
am: aa9f017ceb

Change-Id: I713aa645bdff6ff6c73f28d15b46cd642e23d1a0
2016-10-12 19:42:24 +00:00
Tao Bao aa9f017ceb Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7
am: 3ac1995cfd

Change-Id: I431110e967af930aaed0e684dc9b3b7c91a25c25
2016-10-12 19:34:54 +00:00
Tao Bao 3ac1995cfd Merge "updater: Kill the duplicate PrintSha1() in install.cpp."
am: 19bb05dfc7

Change-Id: I04198ff3cdfca583334eb532f83a6ecd0bfd0ad8
2016-10-12 19:28:24 +00:00
Tao Bao 19bb05dfc7 Merge "updater: Kill the duplicate PrintSha1() in install.cpp." 2016-10-12 19:22:16 +00:00
Tao Bao e9c0753995 Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0 am: 44864a75ed
am: 40677619d2

Change-Id: I17030f19ba6970c7943681b9f705e686ff56acfc
2016-10-11 04:00:41 +00:00
Tao Bao df6da4adad Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 am: 8ff7cd20ba
am: 3a01338332

Change-Id: I1d03d8107d354122edbb88a817b76c490e35210c
2016-10-11 04:00:31 +00:00
Tao Bao 40677619d2 Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0
am: 44864a75ed

Change-Id: I14f5e027f8905163100d4d5bd25855544aae787d
2016-10-11 03:55:10 +00:00
Tao Bao 3a01338332 Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854
am: 8ff7cd20ba

Change-Id: I421800ada6015970dae038ecd58c1d985f8b4b8f
2016-10-11 03:55:00 +00:00
Tao Bao 44864a75ed Merge "Refactor libupdater into a seperate module." am: a7995d7581
am: f2cbf0fbe0

Change-Id: I0123851b44800e34b12e428df79259d656f960df
2016-10-11 03:49:42 +00:00
Tao Bao 8ff7cd20ba Refactor libupdater into a seperate module. am: 0c7839ac14
am: cf1dbfa854

Change-Id: Ifb2c199bc32e164e5bd53f3910a35801237c4ef3
2016-10-11 03:49:30 +00:00
Tao Bao f2cbf0fbe0 Merge "Refactor libupdater into a seperate module."
am: a7995d7581

Change-Id: Ie3b643513c44abfc2a42f5544638057a903a5070
2016-10-11 03:44:01 +00:00
Tao Bao cf1dbfa854 Refactor libupdater into a seperate module.
am: 0c7839ac14

Change-Id: I5ff4c438daa6df248cee38b62251c78baac67a76
2016-10-11 03:44:00 +00:00
Tao Bao 361342cbd2 updater: Kill the duplicate PrintSha1() in install.cpp.
Also add a testcase for sha1_check().

Test: mmma bootable/recovery; recovery_component_test passes.

Change-Id: I4d06d551a771aec84e460148544f68b247a7e721
2016-10-10 20:36:17 -07:00
Tao Bao a7995d7581 Merge "Refactor libupdater into a seperate module." 2016-10-11 03:36:04 +00:00
Andriy Naborskyy 544a1562d9 init: move healthd to late-init
Starting healthd in early-init is not needed and can delay coldboot done
Now healthd is starting at boot as usual service.

Test: check kmsg that healthd starting after /dev/.coldboot_done

Bug: 30292927
Change-Id: I367d022f5885122da49181db3db536012e83f564
2016-10-10 17:29:11 -07:00
Tao Bao 0c7839ac14 Refactor libupdater into a seperate module.
So that we can write native tests for updater functions. This CL adds a
testcase for getprop() function.

Test: mmma bootable/recovery; Run recovery_component_test on device.

Change-Id: Iff4c1ff63c5c71aded2f9686fed6b71cc298c228
2016-10-10 16:49:50 -07:00
Tao Bao 5546d785d4 Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815 am: 514dc15399
am: c26e3770f6

Change-Id: Ibcf7ed88599cd997a0b240ee85900f87d88b041e
2016-10-10 22:35:39 +00:00
Tao Bao c26e3770f6 Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815
am: 514dc15399

Change-Id: I38332f7eab24a49375ef0f410a3cd3d552749e06
2016-10-10 22:14:43 +00:00
Tao Bao 514dc15399 Merge "Update the header path for ext4_utils." am: 2bd94433f8
am: 00a9050815

Change-Id: Id897069e1ea0ad04ee7f1096c9ae36fb2b9d7974
2016-10-10 21:45:57 +00:00
Tao Bao 00a9050815 Merge "Update the header path for ext4_utils."
am: 2bd94433f8

Change-Id: I6a8dbfcecbabbba26acc81ca0c704b9a7f3c63db
2016-10-10 21:14:34 +00:00
Tao Bao 2bd94433f8 Merge "Update the header path for ext4_utils." 2016-10-10 20:07:32 +00:00
Tao Bao 1984d55ece Merge "Update the header path for ext4_utils." 2016-10-10 16:44:40 +00:00
Mark Salyzyn 5803cbaad2 Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd am: 5ceada5bea
am: b2ee79101b

Change-Id: Ie1a96c43737fb4b78d79cbb28a0d43ad3bfba6e6
2016-10-10 14:41:12 +00:00
Mark Salyzyn b2ee79101b Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd
am: 5ceada5bea

Change-Id: Id48d36a1a61171aa199e85f50a454229c50b72e9
2016-10-10 14:30:11 +00:00
Mark Salyzyn 5ceada5bea Merge "No longer need android/log.h" am: b330559fb6
am: 7bf11aadfd

Change-Id: I2399e35aacb6703aedf21bf352f47638720b7d1a
2016-10-10 14:25:30 +00:00
Mark Salyzyn 7bf11aadfd Merge "No longer need android/log.h"
am: b330559fb6

Change-Id: Ie2b65008349d874eb96f40da24b1333e7e62e7da
2016-10-10 14:19:41 +00:00