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

3007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao ca64fa7bb9 update_verifier: Sync Android.mk with aosp-master. 
am: 5422d80961

Change-Id: Iac281a5f7a1a771282cdbf4503fe7e0991073624
 2016-11-20 05:09:48 +00:00
Tao Bao 52b4d869b0 bootloader_message: Remove the no-op blank line. 
am: fbde508ace

Change-Id: Ia3f298ef61fbeed0a80b8d85366ee27358a3320f
 2016-11-19 18:15:08 +00:00
Tao Bao fbde508ace bootloader_message: Remove the no-op blank line. 
This single blank line was introduced by some cherry-pick, which is
causing merge conflicts.

Test: N/A
Change-Id: Ida527b76fca7cc916499c5f888476c8e51ba3eaa
 2016-11-18 16:00:23 -08:00
Tao Bao 5422d80961 update_verifier: Sync Android.mk with aosp-master. 
It's out of sync due to the cherry-pick in commit
d007cf2da2.

Test: mmma bootable/recovery
Change-Id: I286fe89c4c7d09de3a06d09f9a2b0cdecef326f5
 2016-11-18 15:10:01 -08:00
Connor O'Brien 692e95aa87 Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp 2016-11-18 20:48:09 +00:00
Connor O'Brien b5cf492040 Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours 
am: 6fd51ffdaa

Change-Id: I5db9f43be5c7fb6375dc8f0b1964796112a7eef1
 2016-11-18 20:42:41 +00:00
Connor O'Brien 6fd51ffdaa Merge "Revert "Convert update_verifier to boot HIDL HAL"" 
am: fc6e8cae9c  -s ours

Change-Id: I767f58a16ec318d760c64782a2215e0bac60a283
 2016-11-18 20:39:42 +00:00
Connor O'Brien fc6e8cae9c Merge "Revert "Convert update_verifier to boot HIDL HAL"" 2016-11-18 20:24:58 +00:00
Connor O'Brien 7206ec7a1d Revert "Convert update_verifier to boot HIDL HAL" 
This reverts commit 86199a47e1.

Bug: 32973182
Change-Id: If3eab18cc2e810446da447fadfd0fb44c02b771b
 2016-11-18 20:18:27 +00:00
Connor O'Brien 30628db65c Revert "Convert update_verifier to boot HIDL HAL" 
This reverts commit f50593c447.

Bug: 32973182
Change-Id: I5b14a812671ea02575cb452242ff1a6f05edb9c1
 2016-11-18 20:16:53 +00:00
Tao Bao 9b1a791e3c Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e 
am: d109c788ad

Change-Id: Ia682f518ef8f2a651d0ecbef37a87b52d40a0f35
 2016-11-18 17:49:00 +00:00
Tao Bao d109c788ad Merge "updater: Add testcase for package_extract_dir()." 
am: 23e785935e

Change-Id: I9827d196b8cccd138e244a1aad64202baa1dd600
 2016-11-18 17:45:58 +00:00
Tao Bao 23e785935e Merge "updater: Add testcase for package_extract_dir()." 2016-11-18 17:40:40 +00:00
Tao Bao 1036d36542 updater: Add testcase for package_extract_dir(). 
Test: recovery_component_test passes.
Change-Id: I3af4707bc42c7331ca961be8b967a53de82ea25b
 2016-11-17 23:02:13 -08:00
Tao Bao 776ea9b464 Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc 
am: d2cd8b4d30

Change-Id: I57228be65dfc37f853c3902ad8c5f65c0e3f1018
 2016-11-18 02:12:43 +00:00
Tao Bao d2cd8b4d30 Merge "applypatch: Use unique_fd to avoid leaking FDs." 
am: 2e5cf3c0bc

Change-Id: I4e4cabf7b58a691236ea193f5b11962b2bb740bd
 2016-11-18 02:10:12 +00:00
Tao Bao 2e5cf3c0bc Merge "applypatch: Use unique_fd to avoid leaking FDs." 2016-11-18 02:02:43 +00:00
Tao Bao 29dc892c07 Merge "updater: Add "write_value()" function." am: d00046b691 
am: 100dba35f9

Change-Id: I00b0dfd4856e0b20fae778389cfd6e4e220d4d0d
 2016-11-18 00:57:14 +00:00
Tao Bao 100dba35f9 Merge "updater: Add "write_value()" function." 
am: d00046b691

Change-Id: I016c1e2fda1fd0d2e85d07c79f36c27f3c8a8a22
 2016-11-18 00:42:42 +00:00
Tao Bao d00046b691 Merge "updater: Add "write_value()" function." 2016-11-18 00:16:41 +00:00
Tao Bao c43acc9938 Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df 
am: 9e4ba70b7f

Change-Id: I18284f42cda54ef23dee4f2615083733c50fe493
 2016-11-17 20:22:39 +00:00
Tao Bao 9e4ba70b7f Merge "applypatch: Clean up LoadPartitionContents()." 
am: c6ee8cf8df

Change-Id: I2c20eb8b2c8f5bba40e71f6b267152f3bfab0316
 2016-11-17 20:14:40 +00:00
Connor O'Brien 97f6af8d34 Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours 
am: b9d1cd7713  -s ours

Change-Id: Ibce6da9d3d3cbf74d4754a629f2f6fe832fc2982
 2016-11-17 20:14:21 +00:00
Tao Bao c6ee8cf8df Merge "applypatch: Clean up LoadPartitionContents()." 2016-11-17 20:06:57 +00:00
Connor O'Brien b9d1cd7713 Merge "Convert update_verifier to boot HIDL HAL" 
am: 5b171d30ab  -s ours

Change-Id: I30f99aae371bf51c161c482e53c3032d321fb53a
 2016-11-17 20:05:51 +00:00
Tao Bao 6e02ea92ec applypatch: Use unique_fd to avoid leaking FDs. 
Add unique_fd that calls ota_close() instead of the default closer.

Test: recovery_component_test passes.
Test: Apply a package that calls apply_patch().

Change-Id: I0c19921731757934f76cf7d5215916673a8f2777
 2016-11-17 12:01:44 -08:00
Connor O'Brien 5b171d30ab Merge "Convert update_verifier to boot HIDL HAL" 2016-11-17 19:07:21 +00:00
Tao Bao 8fce75a069 applypatch: Clean up LoadPartitionContents(). 
We don't need three vectors to sort the (size, SHA-1) pairs.

Test: recovery_component_test passes.
Test: Apply a package that calls apply_patch_check() to patch EMMC
      partitions.
Change-Id: I4a6620630a6711f490822cf30f1e7fe5cea6ce49
 2016-11-17 00:02:52 -08:00
Connor O'Brien 86199a47e1 Convert update_verifier to boot HIDL HAL 
Test: Flashed device and confirmed update_verifier runs successfully
Change-Id: I5bce4ece1e3ba98f57299c9cf469a5e2a5226ff2
Signed-off-by: Connor O'Brien <connoro@google.com>
 2016-11-16 16:43:32 -08:00
Tao Bao d0f3088aa9 updater: Add "write_value()" function. 
write_value(value, filename) writes 'value' to 'filename'. It can be
used to tune device settings when applying an OTA package. For example,
write_value("960000", "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq").

Bug: 32463933
Test: recovery_component_test passes.
Test: Apply an OTA package that contains a call to write_value(), and
      check the result.

Change-Id: Ib009ecb8a45a94353f10c59e2383fe1f49796e35
 2016-11-16 15:51:53 -08:00
Rahul Chaudhry 6a6e54da04 Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 
am: 849a911dee

Change-Id: Ia7ef00388123d70cc01cfcb499120096cf103983
 2016-11-16 21:45:03 +00:00
Rahul Chaudhry 849a911dee Merge "Remove unnecessary uses of reinterpret_cast." 
am: c470dc8681

Change-Id: I44081a387bfc60ce9f9cacf5b8db0b9248c84c4d
 2016-11-16 21:37:25 +00:00
Treehugger Robot c470dc8681 Merge "Remove unnecessary uses of reinterpret_cast." 2016-11-16 21:27:32 +00:00
Connor O'Brien f50593c447 Convert update_verifier to boot HIDL HAL 
Test: Flashed device and confirmed update_verifier runs successfully
Change-Id: I5bce4ece1e3ba98f57299c9cf469a5e2a5226ff2
Merged-In: I5bce4ece1e3ba98f57299c9cf469a5e2a5226ff2
Signed-off-by: Connor O'Brien <connoro@google.com>
 2016-11-16 11:07:24 -08:00
Tao Bao b8c4ae9f80 Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c 
am: 0c15140dad

Change-Id: I916ad0504f5ceacfe4634a3cd518eddb91cebf64
 2016-11-16 18:25:16 +00:00
Tao Bao 0c15140dad Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." 
am: 0bedc8e14c

Change-Id: I5bd86a0ee1a87d75c99d2c9e88412f8c1fbd82d1
 2016-11-16 18:17:37 +00:00
Tao Bao 0bedc8e14c Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." 2016-11-16 18:10:54 +00:00
Tao Bao 7563bad2ac resolve merge conflicts of 4f86f26 to stage-aosp-master 
am: f83101a911

Change-Id: Icf9b616752ae66802823599ffe9f9d700d47fa04
 2016-11-16 08:02:06 +00:00
Rahul Chaudhry 1cf93f5f74 Remove unnecessary uses of reinterpret_cast. 
Discovered while looking at compiler warnings (b/26936282).

Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mma
Change-Id: I66f8f6026ed732a504504ade93ff196dc8b727ca
 2016-11-15 23:25:57 -08:00
Rahul Chaudhry b29f23f7e7 Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap. 
static_cast is preferable to reinterpret_cast when casting from void*
pointers returned by malloc/calloc/realloc/mmap calls.

Discovered while looking at compiler warnings (b/26936282).

Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mma
Change-Id: Iaffd537784aa857108f6981fdfd82d0496eb5592
Merged-In: I151642d5a60c94f312d0611576ad0143c249ba3d
 2016-11-15 23:24:54 -08:00
Tao Bao f83101a911 resolve merge conflicts of 4f86f26 to stage-aosp-master 
Change-Id: I3ee609df70c60e16a610913b2c95892c9d74cb3e
 2016-11-15 23:13:24 -08:00
Tao Bao 2e55280df2 Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 
am: 38236d0f35

Change-Id: Ie197bb6e5ef67732be162c9cd2edb696576530d1
 2016-11-16 07:08:39 +00:00
Damien Bargiacchi 9c29567c67 Have gr_init_font alloc memory for the font am: 97eda9db70 
am: c2f6ebf15b

Change-Id: I9764325fff6520bbe5ba6697b39a070aa1280cef
 2016-11-16 07:08:36 +00:00
Tao Bao 38236d0f35 Merge changes from topic 'minui-cherrypick' 
am: d6137a2ae0

Change-Id: Ieac34e2de3334f66b99e50b88e1d51adbb649603
 2016-11-16 07:00:48 +00:00
Damien Bargiacchi c2f6ebf15b Have gr_init_font alloc memory for the font 
am: 97eda9db70

Change-Id: Id4a82973e13383f450fe908776024e8329b930f2
 2016-11-16 07:00:39 +00:00
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 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