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

3858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gitbuildkicker e6f2acfeb4 merge in oc-release history after reset to master 2017-01-25 00:30:46 -08:00
Connor O'Brien e3a55e2b31 Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 am: 445f24f712 
am: b6684d327f

Change-Id: I02ff6a6d8c01360cedbb14e62e78b73cc885005f
 2017-01-25 04:28:09 +00:00
Connor O'Brien b6684d327f Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2 
am: 445f24f712

Change-Id: I97379a407b4c146f07c2bc44951dd903a0e4e4cc
 2017-01-25 04:25:14 +00:00
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 a7915380bb Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 am: 19856bcb2e 
am: 6b26798b3a

Change-Id: I8fb3757de81e2d15e72df61951590653752df20c
 2017-01-25 00:59:04 +00:00
Tao Bao 6b26798b3a Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 
am: 19856bcb2e

Change-Id: Ifed7e368ce476adac7361b2480091693e2446898
 2017-01-25 00:57:33 +00: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 fe47b3ee24 Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 am: b30b8cf436 
am: 8567eb4b11

Change-Id: I57242d4fb939be8055aa62ce3e4ad7480dc97724
 2017-01-24 23:55:51 +00:00
Tao Bao 8567eb4b11 Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 
am: b30b8cf436

Change-Id: I58a2b01da656fab324e31cbc4d8c655346bf3c1d
 2017-01-24 23:50:51 +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
gitbuildkicker 0989970e63 merge in oc-release history after reset to master 2017-01-24 00:30:49 -08:00
Tao Bao 64b91ee9c2 Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d am: 14be4eb8ce 
am: 64768cef87

Change-Id: I5afd90b6e26e3eeae05f5a04c8cd2b985f53c2c9
 2017-01-24 05:09:29 +00:00
Tao Bao 64768cef87 Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d 
am: 14be4eb8ce

Change-Id: If8832fd8ea2b0dc80c82d40c384adbabb2edd926
 2017-01-24 05:02:58 +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 028f77e24e Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e am: 58eace4a96 
am: e218ca21d5  -s ours

Change-Id: Ifbb2ff93fe76fd71ee4f1d80eeaf48225b7335f5
 2017-01-23 21:15:29 +00:00
Tianjie Xu 29a89a73c5 Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e am: f1a371b1b0 
am: 281fa9fd30

Change-Id: I109593352d526941895eafea41f87a49561f8fd7
 2017-01-23 21:15:15 +00:00
Chris Phoenix e218ca21d5 Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e 
am: 58eace4a96

Change-Id: I8b50cce19ece3b5082676c2ebb84164b78542544
 2017-01-23 21:12:22 +00:00
Tianjie Xu 281fa9fd30 Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e 
am: f1a371b1b0

Change-Id: I9de47dbda98fab48b82f99ebecee2d01f70526c5
 2017-01-23 21:12:07 +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
Chris Phoenix 4410c0348c Merge "bootctrl HAL uses "default" service name" 2017-01-23 20:27:50 +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
gitbuildkicker 331ca99a6a merge in oc-release history after reset to master 2017-01-22 00:07:14 -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 0f93a11c9a 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

Bug: 33844934

Change-Id: I86c44aaaaf663e774c631a469ebf2b81619f89c4
 2017-01-21 02:34:11 +00: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 f21b6c0d1d Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 am: 6a82bc228a 
am: 8157166107

Change-Id: I122904cb52fa214dba468e43afb17e55aafd0039
 2017-01-20 20:27:43 +00:00
Tao Bao 8157166107 Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 
am: 6a82bc228a

Change-Id: I8e1687131deca82302246fd4f05d0f6e48c5301f
 2017-01-20 20:24:43 +00: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 3735bb6d38 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: e4dcbd1c9e 
am: 9af09c0505  -s ours

Change-Id: I4701616a9c3d5e7237e23942ffdf05d696b61d6e
 2017-01-20 05:41:38 +00:00
Tianjie Xu 3337819ff2 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 
am: 85bb15a4e5  -s ours

Change-Id: I40db1874f3ec2176b39350a04d95a6fa4018882d
 2017-01-20 05:41:26 +00:00
Tianjie Xu 9af09c0505 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: e4dcbd1c9e

Change-Id: Ib2b4830318c7d6d1303d5ee5efdc49caaaba8836
 2017-01-20 04:25:42 +00:00