PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,585 Commits 1 Branch 0 Tags
82fdd14a5a9271c48102d5353fe79fc323bd76dc
Commit Graph

6585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build-team Robot 82fdd14a5a Snap for 4894319 from 399efe5806 to qt-release 
Change-Id: Iffd0a413077b2985631f2d9cda8129c4f2caceb1
 2018-07-15 03:10:43 +00:00
Tao Bao 399efe5806 Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." am: 624b6b6cd5 am: 603b7ed470 
am: efe9100fb1

Change-Id: I9db9b5bcd72078909fd775b11ddd93352855bbe7
 2018-07-13 13:05:21 -07:00
Tao Bao efe9100fb1 Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." am: 624b6b6cd5 
am: 603b7ed470

Change-Id: I437b19505ba82d5c4cc3cc9849bd2514ad6d846d
 2018-07-13 12:52:54 -07:00
Tao Bao 603b7ed470 Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." 
am: 624b6b6cd5

Change-Id: I16278b00abcdcc532928b534462ff0762c64c1a2
 2018-07-13 12:48:45 -07:00
Tao Bao 624b6b6cd5 Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." 2018-07-13 19:29:27 +00:00
Tao Bao c63af4f9b2 Merge "tests: Clean up the temporary dirs post-run." am: b46e565fd8 am: d8e96f4b4d 
am: 0d8323c4c8

Change-Id: I7ff12d00a9fe10a0aa1edd985e758e69010178fc
 2018-07-13 10:57:05 -07:00
Tao Bao 0d8323c4c8 Merge "tests: Clean up the temporary dirs post-run." am: b46e565fd8 
am: d8e96f4b4d

Change-Id: I2ea09f37b88a9eb9740b0185c54f841b6fd0e8fe
 2018-07-13 10:39:54 -07:00
Tao Bao d8e96f4b4d Merge "tests: Clean up the temporary dirs post-run." 
am: b46e565fd8

Change-Id: I949ea123cd789f68411de97a9b73581dc916b409
 2018-07-13 10:16:43 -07:00
Tao Bao 5ee25666cc applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache(). 
They are doing exactly the same thing, except for the slightly different
error return value (1 vs -1).

int CacheSizeCheck(size_t bytes);
int MakeFreeSpaceOnCache(size_t bytes_needed);

This CL consolidates the two functions and uses bool as its return type.

// Checks whether /cache partition has at least 'bytes'-byte free space. Returns true immediately
// if so. Otherwise, it will try to free some space by removing older logs, checks again and
// returns the checking result.
bool CheckAndFreeSpaceOnCache(size_t bytes);

Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: I94a96934d2b18713f8f39ad5aa96a02c98d87963
 2018-07-13 09:42:19 -07:00
Tao Bao b46e565fd8 Merge "tests: Clean up the temporary dirs post-run." 2018-07-13 16:40:39 +00:00
Tao Bao 97612458a1 Merge "applypatch: Fix the return type of FreeSpaceForFile()." am: 90c9e4f55c am: c9f676bc64 
am: 22c5aed89e

Change-Id: Ibdf05b7f50a5a04b5a6994fded638d0d39414a5d
 2018-07-12 21:07:18 -07:00
Tao Bao 22c5aed89e Merge "applypatch: Fix the return type of FreeSpaceForFile()." am: 90c9e4f55c 
am: c9f676bc64

Change-Id: I669d213a9c2351183ebf28e2d7861d8e85daf649
 2018-07-12 17:14:44 -07:00
Tao Bao c9f676bc64 Merge "applypatch: Fix the return type of FreeSpaceForFile()." 
am: 90c9e4f55c

Change-Id: Ia14468f77220b5e98a0d228b097bbf61401fbe30
 2018-07-12 16:52:53 -07:00
Tao Bao 90c9e4f55c Merge "applypatch: Fix the return type of FreeSpaceForFile()." 2018-07-12 23:07:31 +00:00
Tao Bao b1c5b62557 tests: Clean up the temporary dirs post-run. 
TemporaryDir only deletes empty dirs (not done by its dtor because it
tries to keep the temporary files available on error exit).

Also change FreeCacheTest::MockFreeSpaceChecker to be static.

Test: Run recovery_unit_test on marlin. Check /data/local/tmp post-run.
Change-Id: I1bd54eb840e3094b4f22ee84c059eec2998773bf
 2018-07-12 12:54:15 -07:00
Tao Bao 45adeb07d0 Merge "applypatch: Switch freecache.cpp to libbase logging." am: a0b2aad0f8 am: cea180895c 
am: 50b99abc6d

Change-Id: Icf9bd29b2f2473b5eaa5c4b4bd7008746ad3f91d
 2018-07-12 11:10:19 -07:00
Tao Bao 50b99abc6d Merge "applypatch: Switch freecache.cpp to libbase logging." am: a0b2aad0f8 
am: cea180895c

Change-Id: I3043937d6688ec6c178a8f10166bb5994048ca1f
 2018-07-12 11:01:08 -07:00
Tao Bao cea180895c Merge "applypatch: Switch freecache.cpp to libbase logging." 
am: a0b2aad0f8

Change-Id: If1944fc2488864e77025551ed6c9d29d9e33a425
 2018-07-12 10:55:19 -07:00
Tao Bao 49750f15ed applypatch: Fix the return type of FreeSpaceForFile(). 
Prior to this CL, FreeSpaceForFile() was returning `size_t`, which may
overflow on ILP32 when called on a partition with 4GiB+ free space.
Additionally, it was returning static_cast<size_t>(-1) on error, but the
caller in freecache.cpp didn't check for that.

This CL changes its return type to `int64_t`, and moves the function
into freecache.cpp since there's no external caller.

Test: Run recovery_unit_test on marlin.
Test: Code search shows no external user of FreeSpaceForFile().
Change-Id: I00f501a057726e1f1ab69f367c46c77b30f2d774
 2018-07-12 10:42:00 -07:00
Tao Bao a0b2aad0f8 Merge "applypatch: Switch freecache.cpp to libbase logging." 2018-07-12 17:33:53 +00:00
Tao Bao bd0fb2309b applypatch: Switch freecache.cpp to libbase logging. 
Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin.
Change-Id: Iaa326cd26211d527071cc64a928e59a96271b111
 2018-07-11 23:39:27 -07:00
android-build-team Robot 125ee95e36 Snap for 4887897 from ad7beb410d to qt-release 
Change-Id: Ib32efd724395117bfab8596b0004168d16375a94
 2018-07-12 03:11:37 +00:00
Tao Bao ad7beb410d Merge "Remove the debug code for bspatch flakiness" am: a9f9acca91 am: 04a6af06fb 
am: 8997247a5e

Change-Id: I9ad7a6a204dc7b416369bdb08a06370164e3aae8
 2018-07-11 16:39:49 -07:00
Tao Bao 8997247a5e Merge "Remove the debug code for bspatch flakiness" am: a9f9acca91 
am: 04a6af06fb

Change-Id: Ia350bfeca1b8d32a4d30efcae78eaac5ea8c93a1
 2018-07-11 15:39:23 -07:00
Tao Bao 04a6af06fb Merge "Remove the debug code for bspatch flakiness" 
am: a9f9acca91

Change-Id: Ie87a889077d7ce7ec43b45422617f8f8bab6c367
 2018-07-11 15:30:20 -07:00
Tao Bao a9f9acca91 Merge "Remove the debug code for bspatch flakiness" 2018-07-11 22:13:35 +00:00
Tianjie Xu 7326892c7d Remove the debug code for bspatch flakiness 
We already know the flakiness happens in bspatch, and the issue is
tracked in b/80193170.

Bug: 67849209
Test: unit tests pass
Change-Id: Ib4772b8f2f0225125096fe7407d083b5bb542cfb
 2018-07-11 11:51:43 -07:00
android-build-team Robot ffcf69e00a Snap for 4885240 from 76b289022d to qt-release 
Change-Id: I595e6c19ac074349dd51d372a4e7b57cff3406a3
 2018-07-11 03:17:42 +00:00
Tao Bao 76b289022d Merge "updater: Let read_file() return Value::Type::STRING." am: ac234b4493 am: e089c1a149 
am: ee1246e2bf

Change-Id: Ibbb6f028fedefcc95e2f8f633baf5825a23b69d5
 2018-07-10 12:45:26 -07:00
Tao Bao ee1246e2bf Merge "updater: Let read_file() return Value::Type::STRING." am: ac234b4493 
am: e089c1a149

Change-Id: I88b14c9abc0e9fdcd357811261156b97fb09890b
 2018-07-10 12:41:24 -07:00
Tao Bao e089c1a149 Merge "updater: Let read_file() return Value::Type::STRING." 
am: ac234b4493

Change-Id: Ia5cc991c7b1d8800aa211349eeb3f8676a056191
 2018-07-10 12:38:22 -07:00
Tao Bao ac234b4493 Merge "updater: Let read_file() return Value::Type::STRING." 2018-07-10 19:25:46 +00:00
Tao Bao bafd6c7afb updater: Let read_file() return Value::Type::STRING. 
It used to return a Value blob to be consumed by sha1_check() (which has
been deprecated). Currently there's no other generic updater function
that works with BLOB Values. This CL changes read_file() to return a
string Value to make it more useful (e.g. allowing equality check).

Test: Run recovery_component_test and recovery_unit_test on marlin.
Change-Id: Iba986ba649030112babefe898f26aa9ffe69eeb7
 2018-07-10 10:38:47 -07:00
Tao Bao 0a2916b96a Merge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706e am: 17cda674f3 
am: edaf0dad55

Change-Id: If78f707596f24de6f6de622ebd1d7434e19b5822
 2018-07-10 10:12:09 -07:00
Tao Bao 6f60263d5e Merge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043 am: d8a2c2682a 
am: 676b939680

Change-Id: I66ba4eb1ec3d634e378aaad081f4d690a625e356
 2018-07-10 10:05:39 -07:00
Tao Bao edaf0dad55 Merge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706e 
am: 17cda674f3

Change-Id: Ifc341348415c461cdb76e67900bb097520158551
 2018-07-10 09:56:44 -07:00
Tao Bao 676b939680 Merge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043 
am: d8a2c2682a

Change-Id: I4501ecddfad05ac9ab06c3c6d3bf0fe3c230f7f2
 2018-07-10 09:55:31 -07:00
Tao Bao 17cda674f3 Merge "edify: Rename parse_string to ParseString and let it take std::string." 
am: 6b18eb706e

Change-Id: I39aad0a1b39cb89adc405bcd8abd9ccc305ee855
 2018-07-10 09:52:45 -07:00
Tao Bao d8a2c2682a Merge "edify: Remove VAL_INVALID and move ValueType into Value class." 
am: 503ff38043

Change-Id: I0a99b445b643892f147cde48ae312e87674ba96d
 2018-07-10 09:50:33 -07:00
Tao Bao 6b18eb706e Merge "edify: Rename parse_string to ParseString and let it take std::string." 2018-07-10 16:38:08 +00:00
Tao Bao 503ff38043 Merge "edify: Remove VAL_INVALID and move ValueType into Value class." 2018-07-10 16:34:56 +00:00
Tao Bao ca16ae1b04 Merge "applypatch: Restrict applypatch_check to eMMC targets." am: e02cbaaa62 am: 254d43a3b9 
am: 9f404742d4

Change-Id: I6cbc6cdcb66ddb5f6d0558119e751b63701e52d3
 2018-07-09 23:35:39 -07:00
Tao Bao 9f404742d4 Merge "applypatch: Restrict applypatch_check to eMMC targets." am: e02cbaaa62 
am: 254d43a3b9

Change-Id: Ic036ffe5fafa8ed07db6d0ce5cb56a40eb6e7f51
 2018-07-09 23:32:38 -07:00
Tao Bao 254d43a3b9 Merge "applypatch: Restrict applypatch_check to eMMC targets." 
am: e02cbaaa62

Change-Id: I931bee4ccdf675cc5c7ead82cae011e0c53555de
 2018-07-09 23:28:35 -07:00
Tao Bao d8d514fa33 edify: Rename parse_string to ParseString and let it take std::string. 
Also simplify the helper function expect() in {edify,updater}_test.cpp.

Test: Run recovery_component_test on marlin.
Change-Id: If54febba4b5013f6d71546318a1ca6b635204ac8
 2018-07-10 06:27:50 +00:00
Tao Bao 511d759627 edify: Remove VAL_INVALID and move ValueType into Value class. 
Test: mmma -j bootable/recovery
Test: Run recovery_component_test and recovery_unit_test on marlin.
Change-Id: I4b240e3e771c387b9694be9c0f2f74e0265ab4cb
 2018-07-09 23:20:30 -07:00
Tao Bao e02cbaaa62 Merge "applypatch: Restrict applypatch_check to eMMC targets." 2018-07-10 06:19:19 +00:00
Tao Bao 876fcbe84a Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58c am: 471053ba87 
am: b5c13bc7eb

Change-Id: Ie4d39fd1585c874e18a01ca0cea6e3c3fe9d77f5
 2018-07-09 23:04:17 -07:00
Tao Bao b5c13bc7eb Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58c 
am: 471053ba87

Change-Id: I5a0558926bdfae52bb867e3b6d3321fbc4e3b61b
 2018-07-09 22:56:13 -07:00
Tao Bao 471053ba87 Merge "applypatch: Fix a potential nullptr dereferencing." 
am: b9b50cd58c

Change-Id: I69b6aedc536ec5391ba3e175b312b8c04453993e
 2018-07-09 22:51:10 -07:00