Tianjie Xu
b66b94c56c
Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 am: 260573b3c2
...
am: cd3513c8dd
Change-Id: I3244b7ff4f67a04b34c3531caae49bb50dc4917f
2016-11-08 21:13:54 +00:00
Tianjie Xu
da0f2b2adf
Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 am: a1c121e034
...
am: e04fd5375c
Change-Id: I0592b6ca98fd7ca598139165b198314623f69dfa
2016-11-08 21:13:43 +00:00
Tianjie Xu
cd3513c8dd
Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7
...
am: 260573b3c2
Change-Id: Icc898211217bf9ecfcefba02ecc96be17b636579
2016-11-08 21:08:23 +00:00
Tianjie Xu
e04fd5375c
Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9
...
am: a1c121e034
Change-Id: I42cc7e9246516b7f6f9feff6f58187cee3b4b89e
2016-11-08 21:08:12 +00:00
Tianjie Xu
260573b3c2
Merge "Make make_parent() to take const argument" am: 52e2a97aa7
...
am: 1fd9f0aff7
Change-Id: I5ce1d09108c90e3a800942653777c374a302449a
2016-11-08 21:03:25 +00:00
Tianjie Xu
a1c121e034
Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8
...
am: e9390679c9
Change-Id: Ie5be9db1d0d01f90181dba071df69e24f802c29d
2016-11-08 21:03:12 +00:00
Tianjie Xu
1fd9f0aff7
Merge "Make make_parent() to take const argument"
...
am: 52e2a97aa7
Change-Id: Ia4d597510cf99ade837a9c6a33b19788b8cf2291
2016-11-08 20:57:54 +00:00
Tianjie Xu
e9390679c9
Merge "Move recovery_test.cpp out of unit test"
...
am: 8bfd96c0f8
Change-Id: I34ecca789d64dda77bec85d577ff0b7320a2b128
2016-11-08 20:57:42 +00:00
Treehugger Robot
52e2a97aa7
Merge "Make make_parent() to take const argument"
2016-11-08 20:53:59 +00:00
Treehugger Robot
8bfd96c0f8
Merge "Move recovery_test.cpp out of unit test"
2016-11-08 20:48:20 +00:00
Tao Bao
296ddcace9
resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d am: 5d52303488
...
am: 5fee534a8a -s ours
Change-Id: Ibcb8796c73d236442e49285659ce04bc563e7932
2016-11-08 20:04:08 +00:00
Tao Bao
5fee534a8a
resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d
...
am: 5d52303488
Change-Id: I15771163a003a498dbe7d9731f90e29171b97d7d
2016-11-08 19:53:07 +00:00
Tao Bao
5d52303488
resolve merge conflicts of 70172d7 to stage-aosp-master
...
am: 55883f660d
Change-Id: I5946acb7c1c83061ae84b16d6b94ff502007d981
2016-11-08 19:48:07 +00:00
Tao Bao
55883f660d
resolve merge conflicts of 70172d7 to stage-aosp-master
...
Change-Id: I7626b57f9c8fd722708862ff1ae09c4fc0def51c
2016-11-08 10:49:47 -08:00
Tianjie Xu
5d8b53b248
Move recovery_test.cpp out of unit test
...
Move recovery-refresh/persist tests out because these tests need special
steps to run. Also switch the constants to std::string.
Test: recovery_manual_test passed on an A/B device
Change-Id: I60b3ec6f094044945c3aafc1fae540896a6ddea6
2016-11-08 10:42:51 -08:00
Tao Bao
70172d76ef
Merge "otautil: Clean up SysUtil.cpp."
2016-11-08 18:29:37 +00:00
Tianjie Xu
d75003d24c
Make make_parent() to take const argument
...
Switch to use const std::string; and add corresponding tests.
Bug: 32649858
Test: Component tests pass
Change-Id: I640f3ec81f1481fa91aa310f8d4d96dac9649cb9
2016-11-08 10:11:03 -08:00
Tao Bao
9c05a820f2
otautil: Clean up SysUtil.cpp.
...
Add unit testcases for sysMapFile().
Test: recovery_unit_test passes.
Test: Build and use the new recovery image to sideload a package.
Test: Build and use the new recovery image to install an update.
Change-Id: I77d8f1ea151ab513865d992c256ba93a1fcb51a4
(cherry picked from commit c3292f3fcb )
2016-11-07 15:33:34 -08:00
Tao Bao
c3292f3fcb
otautil: Clean up SysUtil.cpp.
...
Add unit testcases for sysMapFile().
Test: recovery_unit_test passes.
Test: Build and use the new recovery image to sideload a package.
Test: Build and use the new recovery image to install an update.
Change-Id: I77d8f1ea151ab513865d992c256ba93a1fcb51a4
2016-11-07 13:00:38 -08:00
Tao Bao
042bd117c9
Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 am: a99c6eab22
...
am: d447124c00
Change-Id: I9d7520a555e50dd756a53a5dbec38ed8bd91873f
2016-11-07 19:30:08 +00:00
Tao Bao
d447124c00
Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4
...
am: a99c6eab22
Change-Id: Ib4204eb664a918f333f1603dd3789d9ef0478a60
2016-11-07 19:25:07 +00:00
Tao Bao
a99c6eab22
Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4
...
am: f46041a7d4
Change-Id: Ib53eeab18ca2f3e2c1032846e99c96c4f0fd5017
2016-11-07 19:20:07 +00:00
Tao Bao
f46041a7d4
Merge "tests: Fix unit/zip_test.cpp."
...
am: ba41fba9e4
Change-Id: Ie756b132205a3602cdec4062fc84a725b9086479
2016-11-07 19:14:36 +00:00
Tao Bao
ba41fba9e4
Merge "tests: Fix unit/zip_test.cpp."
2016-11-07 19:07:44 +00:00
Tao Bao
0dfb7536bb
tests: Fix unit/zip_test.cpp.
...
It's accidentally broken when refactoring the testdata path. Also clean
up the testcase a bit by simplying the file reading.
Test: recovery_unit_test passes.
Change-Id: I592a1cf5a4eb9a7a5f4eecbc6426baeedeb02781
2016-11-04 15:20:52 -07:00
Tao Bao
88ee9f61bf
Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e am: 8269eb0d1f
...
am: 63ae92ded4
Change-Id: Ia4558618507770ff9324883c917b8cc8d09792dd
2016-11-04 21:15:12 +00:00
Tao Bao
63ae92ded4
Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e
...
am: 8269eb0d1f
Change-Id: I6d8211ab3825c34e8945a249fb2151a01a3ac371
2016-11-04 21:11:41 +00:00
Tao Bao
8269eb0d1f
Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df
...
am: 05a801ca8e
Change-Id: Ib6e162dd08ecb4f97a06beb54c26c5348a6782d1
2016-11-04 21:07:42 +00:00
Tao Bao
05a801ca8e
Merge "updater: Add a testcase for RenameFn()."
...
am: d0daf7f7df
Change-Id: I606b95f3d164063a271cd8faac8c5bfe42e2ef60
2016-11-04 21:04:12 +00:00
Tao Bao
d0daf7f7df
Merge "updater: Add a testcase for RenameFn()."
2016-11-04 21:01:11 +00:00
Tianjie Xu
a4d0c0ab87
Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 am: 92097726ef
...
am: 7770c6f93e
Change-Id: I384dc5295997963cc88231adad7a533f1ee9ef98
2016-11-04 18:24:31 +00:00
Tianjie Xu
7770c6f93e
Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67
...
am: 92097726ef
Change-Id: I714039a80d738392c6c1d967ae4e17c0fadce8bd
2016-11-04 18:21:01 +00:00
Tianjie Xu
92097726ef
Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658
...
am: 99adda9d67
Change-Id: I66a74981f5e7432aaa49ae74a38fc87e17acc02f
2016-11-04 18:17:31 +00:00
Tianjie Xu
99adda9d67
Merge "Cleanup the duplicates of logs rotation functions"
...
am: e2d05c5658
Change-Id: Ia63785d846ab05eca45ec1e548f7265d7feffdbb
2016-11-04 18:14:01 +00:00
Tianjie Xu
e2d05c5658
Merge "Cleanup the duplicates of logs rotation functions"
2016-11-04 18:07:08 +00:00
Tao Bao
af03617d81
Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9 am: 786b083b8e
...
am: afd1d3af5a
Change-Id: I91d664cdbe14b4b7d70090ba5aebab5a46b57c1c
2016-11-04 16:19:24 +00:00
Tao Bao
5587cc195d
Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac am: b9c3411de7
...
am: 48745fbc41
Change-Id: I14e485e0125a8473d580fb58510761f2a2337fb5
2016-11-04 16:18:57 +00:00
Tao Bao
afd1d3af5a
Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9
...
am: 786b083b8e
Change-Id: I835b4c749747b705cb78441b8e405b21a2198f56
2016-11-04 16:15:52 +00:00
Tao Bao
48745fbc41
Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac
...
am: b9c3411de7
Change-Id: I630bea739f6f5e49b57a007b69e0bfed5ca4a7ae
2016-11-04 16:15:25 +00:00
Tao Bao
786b083b8e
Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0
...
am: 4f91ca78b9
Change-Id: I00c70a6343e6cb8e62e27b4a0a3ee6da3934fc9c
2016-11-04 16:12:22 +00:00
Tao Bao
b9c3411de7
Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944
...
am: cb3cbaffac
Change-Id: I2536156317b0bcb4a272ce13db251af791bd67be
2016-11-04 16:11:56 +00:00
Tao Bao
4f91ca78b9
Merge "updater: Fix a bug in DeleteFn()."
...
am: 529032f4a0
Change-Id: I77054ec63705d4e8f72ce7232db5f394f7de420e
2016-11-04 16:08:55 +00:00
Tao Bao
cb3cbaffac
Merge "Revert "Revert "Some cleanups to recovery."""
...
am: a7a8262944
Change-Id: Iab6de4788c4dbecd33d076144f8324fde53b4024
2016-11-04 16:08:26 +00:00
Tao Bao
529032f4a0
Merge "updater: Fix a bug in DeleteFn()."
2016-11-04 16:04:58 +00:00
Tao Bao
a7a8262944
Merge "Revert "Revert "Some cleanups to recovery."""
2016-11-04 16:04:20 +00:00
Tao Bao
a659d79b92
updater: Add a testcase for RenameFn().
...
Test: recovery_component_test passes.
Change-Id: Iba5a0fdf6c79e2bed6b30b8fc19a306c1ab29d8a
2016-11-03 23:35:42 -07:00
Tao Bao
0831d0b592
updater: Fix a bug in DeleteFn().
...
Also add a testcase for delete() function.
Test: recovery_component_test passes.
Change-Id: I064d1ad4693c3ed339d0a69eabadd08a61a2ea86
2016-11-03 23:28:36 -07:00
Tao Bao
3e8666172b
Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f am: 4098285e8c
...
am: 00c7b6112a
Change-Id: Id05ce102be21b9a045a3dac5fa9967914a7e6377
2016-11-04 04:47:15 +00:00
Tao Bao
00c7b6112a
Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f
...
am: 4098285e8c
Change-Id: I0fa36336948867b75dc8226244ee25ba8e6987e0
2016-11-04 04:43:45 +00:00
Tao Bao
4098285e8c
Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0
...
am: 917be35f0f
Change-Id: I5b26c0bf7f7b156e91f66cffde0b64a5708b7eee
2016-11-04 04:39:44 +00:00