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

3330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao a326b35633 Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f am: c43acc9938 
am: d065686007

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

Change-Id: I8d99f72d4d9a7bbed80537ced27f3481ad69ceff
 2016-11-17 20:31:08 +00:00
Connor O'Brien 8c2e9524df Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s ours am: 97f6af8d34 -s ours 
am: 80d0044fb0  -s ours

Change-Id: I732c25cfc0d477223745765fdc8453d393149434
 2016-11-17 20:30:51 +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
Connor O'Brien 80d0044fb0 Merge "Convert update_verifier to boot HIDL HAL" am: 5b171d30ab -s ours am: b9d1cd7713 -s ours 
am: 97f6af8d34  -s ours

Change-Id: I6f7657c8cde63cff8859e8ef3e07891751571849
 2016-11-17 20:22:24 +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
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 12038a2022 Convert update_verifier to boot HIDL HAL am: 86199a47e1 
am: e1a0adc2b5

Change-Id: I37baa1675ac98398419319f302d773034ac23476
 2016-11-17 03:15:05 +00:00
Connor O'Brien e1a0adc2b5 Convert update_verifier to boot HIDL HAL 
am: 86199a47e1

Change-Id: Iac542175e8662a1795aa50e9e67b9acf301b760b
 2016-11-17 02:58:36 +00: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
Rahul Chaudhry eca28fb8c0 Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee am: 6a6e54da04 
am: 8ef4c38abe

Change-Id: I795ab2874d6fc8c6087c89df72e7a2341e97e387
 2016-11-16 21:59:56 +00:00
Rahul Chaudhry 8ef4c38abe Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee 
am: 6a6e54da04

Change-Id: Ia0783f4d936d844284cf488481318e8b96133066
 2016-11-16 21:52:26 +00: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
Connor O'Brien a5f8c5dd59 Merge "Convert update_verifier to boot HIDL HAL" 2016-11-16 21:34:22 +00:00
Treehugger Robot c470dc8681 Merge "Remove unnecessary uses of reinterpret_cast." 2016-11-16 21:27:32 +00:00
Connor O'Brien 13716c29c9 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 11:15:47 -08: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 86b51006ad Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad am: b8c4ae9f80 
am: 120076ea51  -s ours

Change-Id: Ie0824192d770e7dbc97e3e6918b2e2a1cb2b5f5e
 2016-11-16 18:39:40 +00:00
Tao Bao 120076ea51 Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad 
am: b8c4ae9f80

Change-Id: I14dcce3a6b967fdbe33854f325a89f7a4963a630
 2016-11-16 18:32:35 +00: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 cc9e05691d resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 am: 7563bad2ac 
am: 3972ce8ab3

Change-Id: I6eeab248bdeb83e5672a8861ce82743f92780f37
 2016-11-16 08:17:38 +00:00
Tao Bao 3972ce8ab3 resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 
am: 7563bad2ac

Change-Id: Ief61d93f6e448da66a61052a180e650e15210e3e
 2016-11-16 08:10:06 +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 dcc716336d Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 am: 2e55280df2 
am: 7e612db065

Change-Id: Ifd99004890da01f89c4012645bb42a06f0cbb28a
 2016-11-16 07:24:13 +00:00
Damien Bargiacchi b37a03785a Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15b am: 9c29567c67 
am: 1b6584340e

Change-Id: I0b437d2dca6c926fe8daf2ac0c07d0c93577fa2e
 2016-11-16 07:24:07 +00:00
Tao Bao 7e612db065 Merge changes from topic 'minui-cherrypick' am: d6137a2ae0 am: 38236d0f35 
am: 2e55280df2

Change-Id: I293fcb31472db3d2aaa91df7ec17b0e5e8f6e461
 2016-11-16 07:16:10 +00:00
Damien Bargiacchi 1b6584340e Have gr_init_font alloc memory for the font am: 97eda9db70 am: c2f6ebf15b 
am: 9c29567c67

Change-Id: I43d4ab1e219db77061c496734f3241542e42a7a9
 2016-11-16 07:16:07 +00:00
Tao Bao 4cf9de3663 resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 am: 7f0a56dbf1 
am: 821d5d2397

Change-Id: Iba601cb5be9f10ceea003e620c7b319da3f04788
 2016-11-16 07:16:04 +00: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 821d5d2397 resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 
am: 7f0a56dbf1

Change-Id: Ic484035e3e1f020d0e96dca64bd0d9339d27d398
 2016-11-16 07:08:33 +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 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