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

3301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Connor O'Brien 445f24f712 Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 
am: a78bbda4e2

Change-Id: Ia6a0eca88a49dc53d9cff27fb4f34c912530bc21
 2017-01-25 04:22:13 +00:00
Connor O'Brien a78bbda4e2 Merge "Use flash erase & logical block size for userdata wipe" 
am: c8f7b5bad7

Change-Id: Ie9ad2ca457ecb6bf68a57120bcc504faaabc0871
 2017-01-25 04:16:19 +00:00
Treehugger Robot c8f7b5bad7 Merge "Use flash erase & logical block size for userdata wipe" 2017-01-25 04:14:00 +00:00
Connor O'Brien 98a658bb54 Use flash erase & logical block size for userdata wipe 
If flash erase and logical block size are available, then pass them
to libext4_utils when rebuilding userdata.

Test: Factory reset marlin in recovery, confirmed params passed correctly
Bug: 33243520
Change-Id: I6bed976a73e7a64a80eaac50f48fbacb6d812517
Signed-off-by: Connor O'Brien <connoro@google.com>
 2017-01-24 18:04:02 -08:00
Tao Bao 19856bcb2e Merge "minui: Move callback functions to std::function." am: a476312714 
am: 343987b2a1

Change-Id: Ib2d10bf8844591fd75b5b86e3f16fc3daaa5d6d6
 2017-01-25 00:56:00 +00:00
Tao Bao 343987b2a1 Merge "minui: Move callback functions to std::function." 
am: a476312714

Change-Id: I31bcb78f9f145fb97df82b6065d0e026c57c1d56
 2017-01-25 00:53:33 +00:00
Tao Bao a476312714 Merge "minui: Move callback functions to std::function." 2017-01-25 00:49:48 +00:00
Tao Bao b30b8cf436 Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 
am: 8e01ded271

Change-Id: I8a71998ae2df2111a834ca375420961b283aab2b
 2017-01-24 23:46:22 +00:00
Tao Bao 8e01ded271 Merge "update_verifier: Move property_get() to android::base::GetProperty()." 
am: 42906e06b3

Change-Id: I3acda7030997b014801f691f2d8c87a82664938f
 2017-01-24 23:41:51 +00:00
Tao Bao 42906e06b3 Merge "update_verifier: Move property_get() to android::base::GetProperty()." 2017-01-24 23:37:22 +00:00
Tao Bao 14be4eb8ce Merge "Print with newline for ui_print." am: 90deaf9ab7 
am: 1313a9636d

Change-Id: I1cc5523b0ae213f5091caa6793c549e08dc148dc
 2017-01-24 05:00:27 +00:00
Tao Bao 1313a9636d Merge "Print with newline for ui_print." 
am: 90deaf9ab7

Change-Id: Idfeb698aec25a5fe1a577dd3baf36afed8107c8a
 2017-01-24 04:58:27 +00:00
Tao Bao 90deaf9ab7 Merge "Print with newline for ui_print." 2017-01-24 04:54:52 +00:00
Chris Phoenix 58eace4a96 Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 
am: ee3030ad4e

Change-Id: I58625313d404e8f7e947d324441ae9a51c4d0931
 2017-01-23 20:58:20 +00:00
Tianjie Xu f1a371b1b0 Merge "Restore the max width for recovery background texts" am: c1df344381 
am: b037cff12e

Change-Id: I177c4d5edcf8e0ee9874bd1627d0ae12a43ae506
 2017-01-23 20:58:06 +00:00
Chris Phoenix ee3030ad4e Merge "bootctrl HAL uses "default" service name" 
am: cf1af460d5

Change-Id: Iae6ad548a1f3d10864daf95c05db05e5277f52ab
 2017-01-23 20:53:23 +00:00
Tianjie Xu b037cff12e Merge "Restore the max width for recovery background texts" 
am: c1df344381

Change-Id: I0a5900cba2e650082e9d9443c111f1682bb393e8
 2017-01-23 20:53:06 +00:00
Chris Phoenix cf1af460d5 Merge "bootctrl HAL uses "default" service name" 2017-01-23 20:48:32 +00:00
Tianjie Xu c1df344381 Merge "Restore the max width for recovery background texts" 2017-01-23 20:37:12 +00:00
Tao Bao 0b1118d6b9 minui: Move callback functions to std::function. 
Also make minor clean up to the header includes.

Test: mmma bootable/recovery system/core/healthd system/extra/slideshow
Change-Id: I3bfcf2c0e203c26a98ee08f1f8036c68356a69fd
 2017-01-23 16:59:56 +00:00
Tianjie Xu 0f7031e295 Restore the max width for recovery background texts 
Restore the max width to 900px for xxhdpi and 1200px for xxxhdpi

Bug: 34541299
Test: Checked width and images passed recovery_manual_test
Change-Id: If0fd51f93cfb3f965d4e9e69be5626eba89eb857
 2017-01-22 18:46:04 -08:00
Tao Bao f013642477 Print with newline for ui_print. 
Currently the ui_print command between the recovery and updater doesn't
append newline. Updater has to send an extra "ui_print" command without
any argument to get the line break. This looks unnecessary. And not all
the callers (including the ones in bootable/recovery) are following this
protocol when sending the ui_print command.

This CL simplifies the protocol to always print with a newline for
ui_print command. When updating from an old recovery with the new
updater, all the ui_print'd strings would appear in one line as a side
effect. But a) it would only affect the text-mode UI, which won't be
shown to users; b) log files won't be affected.

Bug: 32305035
Test: Apply an update with the new updater on top of an old and new
      recovery image respectively.
Change-Id: I305a0ffc6f180daf60919cf99d24d1495d68749b
 2017-01-21 20:43:45 -08:00
Chris Phoenix 0157c78674 bootctrl HAL uses "default" service name 
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

In support of b/33844934

Change-Id: I5ce988128b0471384e1472298a0ae383df2b7c3e
Merged-In: I86c44aaaaf663e774c631a469ebf2b81619f89c4
 2017-01-20 14:17:10 -08:00
Tao Bao 6a82bc228a Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 
am: ca261d3b48

Change-Id: I0278ded6acb4c003c65cb6b71b7b52a7824fe2fc
 2017-01-20 20:22:13 +00:00
Tao Bao ca261d3b48 Merge "imgpatch: Compile with ZLIB_CONST defined." 
am: e78ca37656

Change-Id: I636cfadd456cb6e256049a23f70e3a7a71c70d78
 2017-01-20 20:19:44 +00:00
Tao Bao 4f8d217971 update_verifier: Move property_get() to android::base::GetProperty(). 
Also make minor changes to android::base::ParseUint(), which accepts
std::string now.

Test: Flash an A/B device and make sure update_verifier works (by
      marking the active slot as successfully booted).

Change-Id: Id6e578671cb3c87160c2b6ca717ee618ecf2342a
 2017-01-20 12:19:23 -08:00
Tao Bao e78ca37656 Merge "imgpatch: Compile with ZLIB_CONST defined." 2017-01-20 20:15:57 +00:00
Tao Bao 087bc0c7d3 imgpatch: Compile with ZLIB_CONST defined. 
So z_stream.next_in takes pointer to const data.

Test: mmma bootable/recovery/applypatch
Change-Id: If269b766a7c84fa2f67424ee61ba5afab0159261
 2017-01-20 12:13:28 -08: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 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 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
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 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