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

3391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu 85bb15a4e5 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 
am: 87f49b83ca

Change-Id: Ib02c4fddda47bae1c082df0502e94ad7cd3b0417
 2017-01-20 04:18:28 +00:00
Tianjie Xu 87f49b83ca DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc 
am: 99e38bf254

Change-Id: Id8c4d672f5edbe5b12efa8350588ae088bbe595b
 2017-01-20 04:08:42 +00:00
Tianjie Xu 99e38bf254 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 
am: 8e267878cc

Change-Id: I5cff676ac1b93c413cd8b339d7cf62ca7fbc650f
 2017-01-20 04:05:42 +00:00
Tianjie Xu 8e267878cc DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 
am: 3d1f19c733

Change-Id: I4c3c665cb6aac08125817f26d788f9fb82b3ca92
 2017-01-20 04:02:10 +00:00
Tianjie Xu 3d1f19c733 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours 
am: 510b13acd8

Change-Id: I4b0f915faac915a11917ebc8291de0ba782dd76b
 2017-01-20 03:53:17 +00:00
Tianjie Xu 510b13acd8 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 
am: 0a627e5a5f  -s ours

Change-Id: I503597404e665b723337ee56a46c719890a547a1
 2017-01-20 03:38:14 +00:00
Tianjie Xu 0a627e5a5f DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 
am: 9930b28456

Change-Id: Ib4853ac0b4f56534130a6b40fbe4ea1a95131cca
 2017-01-20 03:23:12 +00:00
Tianjie Xu 9930b28456 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c 
am: d1c3bdd8c2

Change-Id: I8dbfd452ad4bae3374efa7395b8189db00cdfbe1
 2017-01-20 03:08:41 +00:00
Tianjie Xu d1c3bdd8c2 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours 
am: 457ad2dc3c

Change-Id: Ic6e056e6a50066eb6d123b150e928533633f96e0
 2017-01-20 02:55:39 +00:00
Tianjie Xu 457ad2dc3c DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a 
am: 0d750f900b  -s ours

Change-Id: Iaab9c0e9d8e5a5198bcad373d229915c6bc62c79
 2017-01-20 02:43:07 +00:00
Tianjie Xu 0d750f900b DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours 
am: 8bdb13dd9a

Change-Id: Ieb6efb9b8efec556f401325fb8449e56b2f9d4bc
 2017-01-20 02:35:07 +00:00
Tianjie Xu 8bdb13dd9a DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours 
am: 3591cb48f5  -s ours

Change-Id: I173c8f1c1f68b57b3046f91525c5ac3d3acf184d
 2017-01-20 02:26:06 +00:00
Tianjie Xu 3591cb48f5 DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev 
am: 4eb997d52b  -s ours

Change-Id: If5c4537e910fffddd757be2a80ca9c949e93ed93
 2017-01-20 02:19:36 +00:00
Tianjie Xu 4eb997d52b DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev 
Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15
 2017-01-19 16:18:31 -08:00
Sen Jiang a727d151d4 Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6 
am: f859652e5f

Change-Id: I67af664a5da8d4ceea827542d5b82e30e08c4984
 2017-01-19 20:55:43 +00:00
Sen Jiang f859652e5f Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 
am: 9bb0819ef6

Change-Id: I913d4350db0003aba9d995ef01340d6fba417c6b
 2017-01-19 20:52:43 +00:00
Sen Jiang 9bb0819ef6 Merge "imgdiff: cache bsdiff suffix array in zip mode." 
am: 37bda6a004

Change-Id: I444a0b2245ed72cd874f734a354feb2eb51e4b5a
 2017-01-19 20:50:13 +00:00
Sen Jiang 37bda6a004 Merge "imgdiff: cache bsdiff suffix array in zip mode." 2017-01-19 20:45:27 +00:00
Tianjie Xu 98cf72d3aa Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb 
am: 18098b7de3

Change-Id: I640596adfbe3a345c0780d56b62ea6f9eb2b17f2
 2017-01-19 19:26:06 +00:00
Tianjie Xu 18098b7de3 Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 
am: a38224eadb

Change-Id: I76d7bafedec04bbbb4f5473f61c69333e2a6d25a
 2017-01-19 19:23:36 +00:00
Tianjie Xu a38224eadb Merge "Add checkers and tests for empty locale in PNG file" 
am: 69e73ab7a9

Change-Id: Ie7f4dd37a6dbe08ced5c8735fb03af4601bc8f88
 2017-01-19 19:20:36 +00:00
Tianjie Xu 69e73ab7a9 Merge "Add checkers and tests for empty locale in PNG file" 2017-01-19 19:17:18 +00:00
Android Build Merger (Role) 8a6139a9e8 Merge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aosp 2017-01-19 19:07:42 +00:00
Tianjie Xu 0058ef2cec DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 
am: de530474e9

Change-Id: I9d78ead6684f04b84cfaba81f2e8a7b09ed35f3f
 2017-01-19 19:07:35 +00:00
Tianjie Xu 5403bdced4 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 
am: 4aa56ad477

Change-Id: Ife96e05de25d6feba52958f7c927285cea411ca6
 2017-01-19 19:07:35 +00:00
Tianjie Xu de530474e9 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 
am: d0bfa33c66

Change-Id: I65685b89b6e1c3d7adae8c24a554d680aa026408
 2017-01-19 19:05:05 +00:00
Tianjie Xu 4aa56ad477 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 
am: d0bfa33c66

Change-Id: I73459eeb26653773edcf10209531f397e40d2c03
 2017-01-19 19:05:05 +00:00
Tianjie Xu d0bfa33c66 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 
am: 8953f919e4

Change-Id: Ibe82fdacb0c2ee8214e3d9038ef9751f8d1315ad
 2017-01-19 19:02:35 +00:00
Tianjie Xu 8953f919e4 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 
am: 8f9e3c9bd9

Change-Id: I83fa019edb9771cf799e691c9b6637aec75a4cc4
 2017-01-19 19:00:11 +00:00
Tianjie Xu 8f9e3c9bd9 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours 
am: 67b69c05c6

Change-Id: I32c16f13987f4b1b1c46af948c1a724d8225c0cc
 2017-01-19 18:57:35 +00:00
Tianjie Xu 67b69c05c6 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 
am: 8a51334062  -s ours

Change-Id: I7f2969a4bd8192f2c700945a493d2c32af91af70
 2017-01-19 18:55:04 +00:00
Tianjie Xu 8a51334062 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a 
am: b21b92b386

Change-Id: I30cc5605866bc087fc6afdad2b2d7e033cd2f25e
 2017-01-19 18:52:33 +00:00
Tianjie Xu b21b92b386 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 
am: ddca75fb0a

Change-Id: I8010afacf2d0299715cb3b11b81f31d6baca1083
 2017-01-19 18:50:33 +00:00
Tianjie Xu ddca75fb0a DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours 
am: 37a5941440

Change-Id: I87b102e92e9ee2bc49af6b7c8ec4d0a48894f732
 2017-01-19 18:48:03 +00:00
Tianjie Xu 37a5941440 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 
am: 2b1bcab427  -s ours

Change-Id: I74119e64e0d5fe813c18191a201fadbf9870c400
 2017-01-19 18:45:32 +00:00
Tianjie Xu 2b1bcab427 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours 
am: 94c8b5e5a6

Change-Id: I42132e10d5ba4cdf77232dadb88100e6c29acf80
 2017-01-19 18:43:02 +00:00
Tianjie Xu 94c8b5e5a6 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours 
am: 051dfa7ec3  -s ours

Change-Id: I88ff80ef082f32825f4ed860af9b9d67d282e11a
 2017-01-19 18:41:01 +00:00
Tianjie Xu 051dfa7ec3 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours 
am: a41cc29447  -s ours

Change-Id: Ib3a827173380145bf7a3fcd7e4f8386571228699
 2017-01-19 18:39:02 +00:00
Tianjie Xu a41cc29447 DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 
am: 5346da0220  -s ours

Change-Id: I2952d0746c6cc00837c90370d09a30049d462df3
 2017-01-19 18:36:01 +00:00
Tianjie Xu d17a688525 Add checkers and tests for empty locale in PNG file 
match_locale() will return false for empty locale string in the PNG
file. Also add a manual test to validate if a PNG file is qualified to
use under recovery.

Bug: 34054052
Test: recovery_manual_test catches invalid PNG files successfully & Locale_test passed

Change-Id: Id7e2136e1d8abf20da15825aa7901effbced8b03
 2017-01-18 19:37:06 -08:00
Sen Jiang 930edb6661 imgdiff: cache bsdiff suffix array in zip mode. 
In zip mode, if a chunk is not deflate or its filename can't be found
in source chunks, the entire source file is used as old data for bsdiff,
To avoid repeatedly construct the suffix array used by bsdiff, we cache
the suffix array of the entire source file.

Bug: 34281147
Test: =time -v imgdiff -z Chrome-ORF74B.apk Chrome-ORF76B.apk Chrome.imgdiff
Change-Id: Ifd957ccecf7226fcb44dbf28c58969a06ef74f4b
 2017-01-18 17:26:42 -08:00
Tianjie Xu 977adba098 resolve build error when merging 0f7f7e21 
am: 97ea844aca

Change-Id: I9c7eaa3b9e25be3b36e74b71003a1911c14a305b
 2017-01-18 23:24:20 +00:00
Tianjie Xu 97ea844aca resolve build error when merging 0f7f7e21 
Test: mma
Change-Id: Ibdcf7b47e54d3739fb922f66996365763d2acfef
 2017-01-18 15:15:17 -08:00
Android Build Merger (Role) 344646e6d3 Merge "Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab am: f127896675" into nyc-mr2-dev-plus-aosp 2017-01-18 22:43:55 +00:00
Tianjie Xu db20859dcc Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab 
am: f127896675

Change-Id: I08b867c83803ad28cf524af3f81eec7dd8b9a121
 2017-01-18 22:43:49 +00:00
Tianjie Xu 0f7f7e21a4 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 am: e0d3b0ceab 
am: 8a45adb243

Change-Id: Iaccdc00a1151f637300f516cb362404c020de7d7
 2017-01-18 22:43:48 +00:00
Tianjie Xu 8a45adb243 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 
am: e0d3b0ceab

Change-Id: I4fe8bdd81f8250b862b0018f0a52a76d37ee9d88
 2017-01-18 22:42:19 +00:00
Tianjie Xu f127896675 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045 
am: e0d3b0ceab

Change-Id: I2b483f4cd082ef6cc0d9839c576a05161d980728
 2017-01-18 22:42:18 +00:00
Tianjie Xu e0d3b0ceab Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 
am: e4ec60e045

Change-Id: If13ea5ee5c963357e73f82c677782d569c745acd
 2017-01-18 22:40:19 +00:00
Tianjie Xu e4ec60e045 Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a 
am: 64f0de7a13

Change-Id: I3b67824479c820d06e84e6611e4aff87265dab11
 2017-01-18 22:37:48 +00:00