Tianjie Xu
4e8d032183
Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 am: ece0b68ca6
...
am: 502e34c301
Change-Id: I64648714a96a2d9b734441c15557eb2b1f268f69
2016-10-19 00:55:33 +00:00
Tianjie Xu
502e34c301
Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37
...
am: ece0b68ca6
Change-Id: I94f84db1cc053fa583adefc2ea69b3d4c0547de4
2016-10-19 00:48:02 +00:00
Tianjie Xu
ece0b68ca6
Merge "Fix applypatch_check failure when applying update on angler"
...
am: 7df1850d37
Change-Id: I5d5509d15df4ec42077b68bac7977b56cfab9097
2016-10-19 00:42:01 +00:00
Tianjie Xu
7df1850d37
Merge "Fix applypatch_check failure when applying update on angler"
2016-10-19 00:29:23 +00:00
Yabin Cui
c8a872ce44
Merge "Fix bootloader_message." am: 7c95fe10de am: 83e4e6d35c
...
am: f258f601a0
Change-Id: I72376cae20beeae2ee4aa13f6d28f5a61ffdce49
2016-10-18 23:50:29 +00:00
Yabin Cui
f258f601a0
Merge "Fix bootloader_message." am: 7c95fe10de
...
am: 83e4e6d35c
Change-Id: I2e3986837c7a1daaa6fa4a8c1031f619efb8b361
2016-10-18 23:43:29 +00:00
Yabin Cui
83e4e6d35c
Merge "Fix bootloader_message."
...
am: 7c95fe10de
Change-Id: I102d5b27dcb295e82b7ec094a641a43efca793dc
2016-10-18 23:36:28 +00:00
Treehugger Robot
7c95fe10de
Merge "Fix bootloader_message."
2016-10-18 23:23:09 +00:00
Tao Bao
e2a706824e
resolve merge conflicts of e89bf25 to stage-aosp-master am: 69c117c2ff
...
am: 2a576e2097
Change-Id: Iee6000f594a04a0862b3687f1d87daa809fb3804
2016-10-18 23:08:05 +00:00
Tao Bao
2a576e2097
resolve merge conflicts of e89bf25 to stage-aosp-master
...
am: 69c117c2ff
Change-Id: I668395a8f8ec5d004755ed39f8b7517be1e3527d
2016-10-18 23:00:55 +00:00
Tianjie Xu
81e54eddd4
resolve merge conflicts of 434697f to master
...
Change-Id: I0fea3d33b97065a3bf50f8e3669c2b50166a14ed
2016-10-18 15:33:23 -07:00
Yabin Cui
0d5b85944c
Fix bootloader_message.
...
Bug: 29945717
Change-Id: I934fd6c52b0111937fa75455de2fa4157fb30f6f
(cherry picked from commit 9da04d595f )
2016-10-18 15:10:59 -07:00
Tao Bao
69c117c2ff
resolve merge conflicts of e89bf25 to stage-aosp-master
...
Change-Id: I3b0ddb23daf264d407370cd8ace31eceb230a11a
2016-10-18 15:08:07 -07:00
Tianjie Xu
434697f06b
resolve merge conflicts of 6fba98c to stage-aosp-master
...
am: 8176cf232e
Change-Id: I01b34cb31604ea5caffe96ad69ab4d4d21bfe28e
2016-10-18 22:05:21 +00:00
Tao Bao
e89bf257a1
Merge "Create bootloader_message static library."
2016-10-18 21:48:23 +00:00
Tianjie Xu
8176cf232e
resolve merge conflicts of 6fba98c to stage-aosp-master
...
Change-Id: I2fa8b85109309ec88c1f8d8def593aa65ab885d7
2016-10-18 21:31:04 +00:00
Tianjie Xu
984d7d058e
Fix applypatch_check failure when applying update on angler
...
Applypatch_check should be skipped if no sha is specified. As the
comments said: "It's okay to specify no sha1s; the check will pass if
the LoadFileContents is successful. Useful for reading partitions,
where the filename encodes the sha1s."
Test: The update package applied on angler successfully.
Bug: 32243751
Change-Id: Ib8f3dadf19f745c2dbd350d60da46ab12d75bc87
2016-10-18 21:22:48 +00:00
Yabin Cui
8b309f6970
Create bootloader_message static library.
...
bootloader_messages merges bootloader_message_writer
and bootloader.cpp, so we can use the same library to
manage bootloader_message in normal boot and recovery mode.
Bug: 29582118
Change-Id: I9efdf776ef8f02b53911ff43a518e035e0c29618
(cherry picked from commit 2f272c0551 )
2016-10-18 11:37:05 -07:00
Tianjie Xu
6fba98ce64
Merge "Replace minzip with libziparchive"
2016-10-18 17:30:02 +00:00
Tianjie Xu
8cf5c8f60f
Replace minzip with libziparchive
...
Clean up the duplicated codes that handle the zip files in
bootable/recovery; and rename the library of the remaining
utility functions to libotautil.
Test: Update package installed successfully on angler.
Bug: 19472796
Change-Id: Iea8962fcf3004473cb0322b6bb3a9ea3ca7f679e
2016-10-17 17:41:51 -07:00
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