Tao Bao
1cd7dc43e1
am 85afda17: am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."
...
* commit '85afda17522e25637bab37bdff1c5ea56b7c7a51':
2015-08-27 14:13:56 +00:00
Dan Albert
672e28efe5
am 85a77d2a: am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."
...
* commit '85a77d2abef598099b1f64b9efd1af481f2f62fd':
2015-08-27 14:13:55 +00:00
Elliott Hughes
b49fe2b7df
am 34fa6d38: am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."
...
* commit '34fa6d3891aceef6af910f114310cec17e13b372':
2015-08-27 14:13:54 +00:00
Tao Bao
a18e59d046
am 371ab905: am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp
...
* commit '371ab9058e923679e7dd451bc8351e6e0ce0c3b0':
2015-08-27 14:13:54 +00:00
Tao Bao
3a77916ff0
am ea5d8f0a: am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."
...
* commit 'ea5d8f0affc1170fc9bd6ff05a00adca712f18d6':
2015-08-27 14:13:53 +00:00
Tao Bao
eec13b8377
am 3fd097f8: am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."
...
* commit '3fd097f8a81b57046f7200f659211971025ad7bf':
2015-08-27 14:13:52 +00:00
Tao Bao
c6bcbe310d
am 77de4783: am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."
...
* commit '77de478325225ae1adf8e669adff5cd5052cbea8':
2015-08-27 14:13:52 +00:00
Tao Bao
d3e0219aca
am 05c4b53e: am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."
...
* commit '05c4b53eb53c069ebb2433947193f7d613e4ff04':
2015-08-27 14:13:51 +00:00
Tao Bao
78551225df
am f6bebbd7: am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."
...
* commit 'f6bebbd72cf25acc65373cf26c3eac7d4b6bf686':
2015-08-27 14:13:50 +00:00
Tao Bao
258f83cc65
am d37f91d1: am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."
...
* commit 'd37f91d18da6e87eb3f2d11dd1cd1645e255cd38':
2015-08-27 14:13:49 +00:00
Tao Bao
9f012cd7a6
am c73e18f0: am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."
...
* commit 'c73e18f0a433268300cfaa767b06424df71ff63b':
2015-08-27 14:13:49 +00:00
Tao Bao
2addc407d0
am f075f9a1: am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."
...
* commit 'f075f9a17ab01fa13a651c675aed2837a8bf3191':
2015-08-27 14:13:48 +00:00
Tao Bao
477157d88a
am ca66fc1c: am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."
...
* commit 'ca66fc1cb204dfe9e9b8c8eaad5be95a78207212':
2015-08-27 14:13:47 +00:00
Tao Bao
43e4abd95f
am d33e21a7: am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."
...
* commit 'd33e21a7ae7b37590ad41fac56f87141c597616c':
2015-08-27 14:13:46 +00:00
Tao Bao
f8ab5bdba6
am 9da33c67: am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."
...
* commit '9da33c67655c5d113f75a1f493b51cfee86d298c':
2015-08-27 14:13:45 +00:00
Tao Bao
8e897953ac
am f0e341b4: am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""
...
* commit 'f0e341b44949564de0d33361c1284b8aff19a8bd':
2015-08-27 14:13:44 +00:00
Paul Lawrence
4b34bcf20f
am 3ac4765a: am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
...
* commit '3ac4765a14334f0aa574b5cffb5349cc1c214cfe':
2015-08-27 14:13:43 +00:00
Tao Bao
081408da86
am b3f4921c: am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"
...
* commit 'b3f4921c67bdc3260bfd6274c2ab53d10b53a9c2':
2015-08-27 14:13:42 +00:00
Paul Lawrence
e7767f0e00
am 04d9b850: am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev
...
* commit '04d9b8501a58de6ee7c5aa3635673150bf88cb06':
2015-08-27 14:13:40 +00:00
Tao Bao
85afda1752
am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."
...
* commit 'b65a90235e7d4fc3a2dbf68bb73ac323a88f1abc':
2015-08-27 03:38:47 +00:00
Dan Albert
85a77d2abe
am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."
...
* commit 'c2e91625a7333ae993bab4c7069f25c2e9ecc8d3':
2015-08-27 03:38:46 +00:00
Elliott Hughes
34fa6d3891
am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."
...
* commit '8fa0007a3eb59174f7c2fbf40a2a972dfb344531':
2015-08-27 03:38:45 +00:00
Tao Bao
371ab9058e
am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp
...
* commit '7daa48e62fa0ba002cffeddf8d520426a52d69a7':
2015-08-27 03:38:43 +00:00
Tao Bao
ea5d8f0aff
am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."
...
* commit '0e2efab34546e1678855c979f06f0f56f4f38eb0':
2015-08-27 03:38:36 +00:00
Tao Bao
3fd097f8a8
am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."
...
* commit '854ae7f9ba8981e0122549dceae9b371ad4f7be1':
2015-08-27 03:38:35 +00:00
Tao Bao
77de478325
am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."
...
* commit 'f3f27990f23a338c02a52bea713bf391e7994028':
2015-08-27 03:38:33 +00:00
Tao Bao
05c4b53eb5
am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."
...
* commit 'cb0e7f2da04b7dcaef50ec7a942cd5b5e64b4823':
2015-08-27 03:38:33 +00:00
Tao Bao
f6bebbd72c
am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."
...
* commit '33185233541dda72af3fd8a1fc1786251c88e122':
2015-08-27 03:38:30 +00:00
Tao Bao
d37f91d18d
am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."
...
* commit 'f0654b4414c750703f50d4e84319d31d57e86284':
2015-08-27 03:38:29 +00:00
Tao Bao
c73e18f0a4
am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."
...
* commit '7665d443e2e3de775661068c29df38581476cc71':
2015-08-27 03:38:28 +00:00
Tao Bao
f075f9a17a
am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."
...
* commit '5040636abd451e4e45227493f328f1cda39a5177':
2015-08-27 03:38:27 +00:00
Tao Bao
ca66fc1cb2
am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."
...
* commit '596219d9c2ea760a473c9f90bfa0317c326913af':
2015-08-27 03:38:26 +00:00
Tao Bao
d33e21a7ae
am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."
...
* commit '0e7368a505f647a07cf3b6b93622b48ef27c3f45':
2015-08-27 03:38:24 +00:00
Tao Bao
9da33c6765
am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."
...
* commit '3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f':
2015-08-27 03:38:23 +00:00
Tao Bao
f0e341b449
am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""
...
* commit '5391dfdb35221f782a4d0da29e31f4725dc507d3':
2015-08-27 03:38:22 +00:00
Paul Lawrence
3ac4765a14
am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
...
* commit '1915dd56e3cdc73d4d83453971486b64880e4603':
2015-08-27 03:38:15 +00:00
Tao Bao
b3f4921c67
am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"
...
* commit '2fc4d4359b268cbf3d0f73d670a219f12d440e86':
2015-08-27 03:38:08 +00:00
Paul Lawrence
04d9b8501a
am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev
...
* commit '7624d0d830ad6b185f0ba50f5ffd8b0e20386228':
2015-08-27 03:38:06 +00:00
Tao Bao
d3982955c6
am 165c6ad3: am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
...
* commit '165c6ad300380fcd132a676f809560a606894e52':
updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:28:35 +00:00
Tao Bao
165c6ad300
am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
...
* commit '5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5':
updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:17:00 +00:00
Tao Bao
5a16eba2c3
am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
...
* commit 'eef991389c7f739dd80bbe6e4a3699322c12dcfb':
updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:10:23 +00:00
Tao Bao
eef991389c
Merge "updater: Remove the unused isunresumable in SaveStash()."
2015-08-26 21:03:01 +00:00
Tao Bao
a89858766c
am 1a3ccc88: am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
...
* commit '1a3ccc881f451ff733a587b9fac8d73a83c12dfd':
GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 03:52:39 +00:00
Tao Bao
1a3ccc881f
am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
...
* commit 'dc61d17d5b3c9e85a2863ec461170263325f1466':
GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 03:47:45 +00:00
Tao Bao
9739a2920c
updater: Remove the unused isunresumable in SaveStash().
...
Change-Id: I6a8d9bea4c1cd8ea7b534682061b90e893b227a2
2015-08-25 18:05:38 -07:00
Tao Bao
dc61d17d5b
am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
...
* commit '50c17f9da69ed3de0cd3ed032c50af067c1dc1f1':
GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 01:05:09 +00:00
Tao Bao
50c17f9da6
Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
2015-08-26 00:57:42 +00:00
Tao Bao
8a4c081939
am ba781587: am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
...
* commit 'ba781587cb1926782d7561aa7dcb5db44d09a70b':
recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
2015-08-25 01:29:04 +00:00
Tao Bao
ba781587cb
am 337db14f: recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
...
* commit '337db14f274fc73dd540aa71d2c21c431fe686ec':
recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
2015-08-25 01:23:18 +00:00
Tao Bao
337db14f27
recovery: Factor out wear_ui.{cpp,h} into bootable/recovery.
...
Every watch has a (mostly identical) copy of the wear_ui. Factor them
out into a single copy for easier maintenance. Device-specific settings
should be defined in recovery_ui.cpp that inherits WearRecoveryUI class.
Bug: 22451422
Change-Id: Id07efca37d1b1d330e6327506c7b73ccf6ae9241
2015-08-24 17:31:47 -07:00