PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,437 Commits 1 Branch 0 Tags
d514b61b31ca2b4e2d69d72d4399d37f8ada25c4
Commit Graph

3437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao 7f0a56dbf1 resolve merge conflicts of d5d34d7 to stage-aosp-master 
am: 03eb766a56

Change-Id: Iabf3c81f0ad98143cfac56ecfa00a93008a31318
 2016-11-16 07:00:33 +00:00
Tao Bao 4f86f26a3d Merge "updater: Fix the wrong return value for package_extract_file()." 2016-11-16 06:54:08 +00:00
Tao Bao 03eb766a56 resolve merge conflicts of d5d34d7 to stage-aosp-master 
Change-Id: I2871dafbd293dbbbb538da84fa857dd8972e2eb8
 2016-11-15 22:14:14 -08:00
Tao Bao d6137a2ae0 Merge changes from topic 'minui-cherrypick' 
* changes:
  Have gr_init_font alloc memory for the font
  Support use of custom fonts in miniui
 2016-11-16 05:52:18 +00:00
Tao Bao 9abee8d22d updater: Fix the wrong return value for package_extract_file(). am: 2274e57f67 
am: 7e3d156b86

Change-Id: Id550cd00fd2fa60f8882c45d0e830f514718c71f
 2016-11-16 05:34:57 +00:00
Tao Bao 7e3d156b86 updater: Fix the wrong return value for package_extract_file(). 
am: 2274e57f67

Change-Id: I137c7d4e4194e8b334e85c57dddbdbc28d445146
 2016-11-16 05:27:27 +00:00
Tao Bao 2274e57f67 updater: Fix the wrong return value for package_extract_file(). 
'bool success = ExtractEntryToFile()' gives opposite result. Fix the
issue and add testcases.

Change the one-argument version of package_extract_file() to explicitly
abort for non-existent zip entry. Note that this is NOT changing the
behavior. Prior to this CL, it aborts from Evaluate() function, by
giving a general cause code. Now it returns kPackageExtractFileFailure.

BUg: 32903624
Test: recovery_component_test works.

Change-Id: I7a273e9c0d9aaaf8c472b2c778f7b8d90362c24f
(cherry picked from commit ef0eb3b01b)
 2016-11-15 16:55:37 -08:00
Damien Bargiacchi 97eda9db70 Have gr_init_font alloc memory for the font 
Change-Id: I8ccf369d52011bc5d07d8e041fe558ce734a78fc
(cherry picked from commit d00f5eb63a)
 2016-11-15 16:40:32 -08:00
Damien Bargiacchi d5d34d70a5 Support use of custom fonts in miniui 
Bug: 29547343
Change-Id: I398160c85daac90ffab2fa9bb2e96795b9e9885a
(cherry picked from commit 35fff61b1c)
 2016-11-15 14:24:06 -08:00
Tao Bao ef0eb3b01b updater: Fix the wrong return value for package_extract_file(). 
'bool success = ExtractEntryToFile()' gives opposite result. Fix the
issue and add testcases.

Change the one-argument version of package_extract_file() to explicitly
abort for non-existent zip entry. Note that this is NOT changing the
behavior. Prior to this CL, it aborts from Evaluate() function, by
giving a general cause code. Now it returns kPackageExtractFileFailure.

BUg: 32903624
Test: recovery_component_test works.

Change-Id: I7a273e9c0d9aaaf8c472b2c778f7b8d90362c24f
 2016-11-15 13:17:52 -08:00
Tao Bao 90a9fc5bed Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea am: db50f8863a 
am: 656501323a

Change-Id: I93ec723cf57169026f3a5ebefcb95140daab32e5
 2016-11-14 18:50:11 +00:00
Tao Bao b99b9099e8 Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493 am: 0f81984970 
am: c6bed0ab3f

Change-Id: I95702aa4777ac1a8b85b8458c7ab4d1f3a1d365d
 2016-11-14 18:49:55 +00:00
Tao Bao 656501323a Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea 
am: db50f8863a

Change-Id: Ie27fd48f1a0b815e902e689bb79a4d65fab08bf6
 2016-11-14 18:43:06 +00:00
Tao Bao c6bed0ab3f Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 am: 08c4130493 
am: 0f81984970

Change-Id: I1a5b82fc1c48237b0100cf57f3e2fdd49fe30b23
 2016-11-14 18:42:54 +00:00
Tao Bao db50f8863a Merge "Add .clang-format style file." am: b76960c984 
am: 1f0af0c2ea

Change-Id: I836abea8c0319cfe0b45c29fb6856195fe4b0f1e
 2016-11-14 18:36:09 +00:00
Tao Bao 0f81984970 Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649 
am: 08c4130493

Change-Id: I27e56f2771c2f618c81b31bf8f36ccd5dc859a27
 2016-11-14 18:35:54 +00:00
Tao Bao 1f0af0c2ea Merge "Add .clang-format style file." 
am: b76960c984

Change-Id: I38d670b4d2fb799e12e70f10d6cd7a0e3914369e
 2016-11-14 18:28:32 +00:00
Tao Bao 08c4130493 Merge "Fix "ordered comparison between pointer and zero"." 
am: a844bc9649

Change-Id: If12e825a23c17730a35a2875c14d1d25d9d41038
 2016-11-14 18:28:18 +00:00
Tao Bao b76960c984 Merge "Add .clang-format style file." 2016-11-14 18:20:14 +00:00
Tao Bao a844bc9649 Merge "Fix "ordered comparison between pointer and zero"." 2016-11-14 18:18:39 +00:00
Tianjie Xu 0d4c31a995 Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 am: 91f736fe1a 
am: 0b2be22f01  -s ours

Change-Id: Idc136f347d98f852f6c0bf0cedb7071f7209338c
 2016-11-12 02:11:07 +00:00
Tianjie Xu 0b2be22f01 Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 
am: 91f736fe1a

Change-Id: I43824dc487e506423d3b54638665bd51edf870ed
 2016-11-12 01:17:03 +00:00
Tianjie Xu 91f736fe1a Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 
am: f2574b8206

Change-Id: I81b174662c620a4af2f7992f37ffd402e92657e7
 2016-11-12 01:09:34 +00:00
Tianjie Xu f2574b8206 Merge "Allow uncrypt to work without socket communication" 
am: 4c1f3eda98

Change-Id: I8e86d4201d2fac0293e70df54e0816c96e85a9b7
 2016-11-12 01:02:33 +00:00
Tianjie Xu 4c1f3eda98 Merge "Allow uncrypt to work without socket communication" 2016-11-12 00:49:16 +00:00
Tianjie Xu 7ceff3e003 Allow uncrypt to work without socket communication 
It was inconvenient to uncrypt a update package under adb shell
because the uncrypt executable required a socket to start its job.
Add a workaround to allow uncrypt executes without socket
communication.

Test: run uncrypt under adb shell, and the block map generates successfully
Bug: 29906218

Change-Id: Ibc328b31636d925dc429ede8dcec7392a721dd53
(cherry picked from commit 28c1e5d3aa)
 2016-11-11 13:51:15 -08:00
MinSeong Kim 126cf8cda8 Fix "ordered comparison between pointer and zero". 
From Clang 4.x releases, DR583 and DR1512 will be addressed.
This patch, in advance, fixes the error(s).

Test: `mmma bootable/recovery`
Change-Id: I29dc85ae681307c322ab3a698c3f3bbad1c784ee
Signed-off-by: MinSeong Kim <minseong.kim@linaro.org>
 2016-11-11 07:00:57 +00:00
Vineela Tummalapalli f6361d8722 Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe am: 62aaba5a3f 
am: 9128e5f85a

Change-Id: I8bb780f90c5f90219d4e4d6c72dd67dce40040c7
 2016-11-10 03:10:49 +00:00
Vineela Tummalapalli 9128e5f85a Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe 
am: 62aaba5a3f

Change-Id: Iff0eca5ba1522c3e51afc439d8008c7ad781b871
 2016-11-10 03:04:19 +00:00
Vineela Tummalapalli 62aaba5a3f Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 
am: 118e814bfe

Change-Id: I2b57d683afce0cb40925187f8a4369a300129a8c
 2016-11-10 02:58:17 +00:00
Vineela Tummalapalli 118e814bfe Merge "Add 'reboot bootloader' to bootloader_message." 
am: a5538b87e8

Change-Id: I432f48453d2627e165fda7cda1945157ff0e83ae
 2016-11-10 02:52:18 +00:00
Treehugger Robot a5538b87e8 Merge "Add 'reboot bootloader' to bootloader_message." 2016-11-10 02:43:08 +00:00
Vineela Tummalapalli cba7fa88d8 Add 'reboot bootloader' to bootloader_message. 
Add 'reboot bootloader' capability to the bootloader_message.

BUG: https://issuetracker.google.com/issues/32474515

Change-Id: I01e8b2fad978bf7c8fc96ff6b08ad3e52533f504
Author: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Reviewed-on: https://android.intel.com/548519
 2016-11-09 17:24:57 -08:00
TreeHugger Robot f78a6cb506 Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." 2016-11-10 01:12:43 +00:00
Tianjie Xu 17cebda6a5 Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 am: b86af2577c 
am: e10ff54e90

Change-Id: I8750814a16e8c3cb98c8c722b2211798b3a7e439
 2016-11-10 00:29:38 +00:00
Tianjie Xu e10ff54e90 Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 
am: b86af2577c

Change-Id: I21b7f6df6facfcdb547e2aef3d4d8e19492c8e2d
 2016-11-10 00:23:07 +00:00
Tianjie Xu b86af2577c Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours 
am: 96c3c32b66

Change-Id: I94c50d0c24b1d0d2331b1c5fd117c06542c85533
 2016-11-10 00:17:07 +00:00
Tianjie Xu 96c3c32b66 Merge "Touch blocks in care_map in update_verifier" 
am: 3605a072bc  -s ours

Change-Id: Ie19a8ebf3f575599a5ed9ddcd80ab99e06f6cf77
 2016-11-10 00:11:40 +00:00
Tianjie Xu 3605a072bc Merge "Touch blocks in care_map in update_verifier" 2016-11-09 23:52:52 +00:00
Tianjie Xu d007cf2da2 Touch blocks in care_map in update_verifier 
Read all blocks in system and vendor partition during boot time
so that dm-verity could verify this partition is properly flashed.

Bug: 27175949
Change-Id: I38ff7b18ee4f2733e639b89633d36f5ed551c989
Test: mma
(cherry picked from commit 03ca853a1c)
(cherry picked from commit 4bbe0c93c8)
(Fix a typo when comparing the verity mode)
(cherry picked from commit da654af606)
(Skip update verification if care_map is not found)
 2016-11-09 20:10:27 +00:00
Tao Bao 7fbc9d39f3 Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c am: 7da0c7e439 
am: 7e62f22d78

Change-Id: Ic5668c046cc51f0a16e98cdb12f3e264d9d8bc39
 2016-11-09 19:31:18 +00:00
Tao Bao 7e62f22d78 Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c 
am: 7da0c7e439

Change-Id: I2e106e5f804be4e7f69d2642cb88249ec0bffaca
 2016-11-09 19:25:14 +00:00
Tao Bao 7da0c7e439 Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 
am: 2c175c302c

Change-Id: I0e739c4585088ac2b88809924c16ea1bf18e8794
 2016-11-09 19:20:45 +00:00
Tao Bao 2c175c302c Merge "updater: Add more testcase for symlink()." 
am: 1b74e8cea8

Change-Id: I67f19e5992d755f08109ccad4feed2ac3f9dffde
 2016-11-09 19:13:43 +00:00
Tao Bao 1b74e8cea8 Merge "updater: Add more testcase for symlink()." 2016-11-09 19:05:01 +00:00
Tao Bao 9003067b31 Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 am: d9d435cd83 
am: 4917a8cf62

Change-Id: Ieb092da172224dc669191943886957adc87dfd65
 2016-11-09 05:56:51 +00:00
Tao Bao 4917a8cf62 Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 
am: d9d435cd83

Change-Id: I5b1882758ae438cc6dd6a4926d20a04ece594032
 2016-11-09 05:51:21 +00:00
Tao Bao d9d435cd83 Merge "otautil: Clean up obsolete includes." am: b80d136dca 
am: b50fa1fc23

Change-Id: I297e91af6b5cdcf9bec524764e5dbe6a879fd4a7
 2016-11-09 05:45:50 +00:00
Tao Bao b50fa1fc23 Merge "otautil: Clean up obsolete includes." 
am: b80d136dca

Change-Id: I374d678fe6636284d6ab9238418266fac355e14e
 2016-11-09 05:39:20 +00:00
Tao Bao b80d136dca Merge "otautil: Clean up obsolete includes." 2016-11-09 05:32:06 +00:00