343987b2a1
Merge "minui: Move callback functions to std::function."
...
am: a476312714
2017-01-25 00:53:33 +00:00
a476312714
Merge "minui: Move callback functions to std::function."
2017-01-25 00:49:48 +00:00
fe47b3ee24
Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271 am: b30b8cf436
...
am: 8567eb4b11
2017-01-24 23:55:51 +00:00
8567eb4b11
Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3 am: 8e01ded271
...
am: b30b8cf436
2017-01-24 23:50:51 +00:00
b30b8cf436
Merge "update_verifier: Move property_get() to android::base::GetProperty()." am: 42906e06b3
...
am: 8e01ded271
2017-01-24 23:46:22 +00:00
8e01ded271
Merge "update_verifier: Move property_get() to android::base::GetProperty()."
...
am: 42906e06b3
2017-01-24 23:41:51 +00:00
42906e06b3
Merge "update_verifier: Move property_get() to android::base::GetProperty()."
2017-01-24 23:37:22 +00:00
e7c8856555
recovery: adjust mkfs.f2fs location
...
middle finger ahead
Change-Id: I14a036a5a79121056e6185f367fc6d61bcec46d2
2017-01-24 16:18:58 +01:00
0989970e63
merge in oc-release history after reset to master
2017-01-24 00:30:49 -08:00
64b91ee9c2
Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d am: 14be4eb8ce
...
am: 64768cef87
2017-01-24 05:09:29 +00:00
64768cef87
Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d
...
am: 14be4eb8ce
2017-01-24 05:02:58 +00:00
14be4eb8ce
Merge "Print with newline for ui_print." am: 90deaf9ab7
...
am: 1313a9636d
2017-01-24 05:00:27 +00:00
1313a9636d
Merge "Print with newline for ui_print."
...
am: 90deaf9ab7
2017-01-24 04:58:27 +00:00
90deaf9ab7
Merge "Print with newline for ui_print."
2017-01-24 04:54:52 +00:00
7c5dbd6751
Remove '_static' suffix from libext2* references.
...
Bug: 34220783
Test: make checkbuild
Change-Id: Iceea20e440a4bb6a3b254486a65a86401a2241ef
2017-01-23 15:18:29 -08:00
028f77e24e
Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e am: 58eace4a96
...
am: e218ca21d5
2017-01-23 21:15:29 +00:00
29a89a73c5
Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e am: f1a371b1b0
...
am: 281fa9fd30
2017-01-23 21:15:15 +00:00
e218ca21d5
Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e
...
am: 58eace4a96
2017-01-23 21:12:22 +00:00
281fa9fd30
Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e
...
am: f1a371b1b0
2017-01-23 21:12:07 +00:00
58eace4a96
Merge "bootctrl HAL uses "default" service name" am: cf1af460d5
...
am: ee3030ad4e
2017-01-23 20:58:20 +00:00
f1a371b1b0
Merge "Restore the max width for recovery background texts" am: c1df344381
...
am: b037cff12e
2017-01-23 20:58:06 +00:00
ee3030ad4e
Merge "bootctrl HAL uses "default" service name"
...
am: cf1af460d5
2017-01-23 20:53:23 +00:00
b037cff12e
Merge "Restore the max width for recovery background texts"
...
am: c1df344381
2017-01-23 20:53:06 +00:00
cf1af460d5
Merge "bootctrl HAL uses "default" service name"
2017-01-23 20:48:32 +00:00
c1df344381
Merge "Restore the max width for recovery background texts"
2017-01-23 20:37:12 +00:00
4410c0348c
Merge "bootctrl HAL uses "default" service name"
2017-01-23 20:27:50 +00:00
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
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
331ca99a6a
merge in oc-release history after reset to master
2017-01-22 00:07:14 -08:00
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
6b9ad62b6c
orscmd: add minimal getcap and setcap tools
...
These are mostly intended for debugging and for emergency repairs.
Optimized for minimal code size and dependencies, not for usability.
Change-Id: I671850a03151dd716c715f953f0b2bc8dbacffe7
2017-01-21 15:48:00 +01:00
0c347d597a
Support power key on slideout
...
Change-Id: Ic1cba57b6d0fbefee2391d06d140da9e4e3dbb32
2017-01-21 15:31:24 +01:00
3267662c54
Whitespace cleanup in Themes
...
Commit 'Copy Kernel Logs' did not adhere to tab spacing.
Change-Id: Ie036aa6b973e01f992199787c64b54a6ccb73a7e
2017-01-21 15:31:01 +01:00
16159166af
Disable relocations on orscmd to fix compile error in Omni 7.1
...
ERROR: Missing or empty .rel.dyn or .rela.dyn section
ERROR: Failed to load as ELF
This change fixes the compile error by disabling relocations. Thanks to
mdmower for pointing out the best fix.
Change-Id: I60e637158c324295c42c480139d6d38157ba0d31
2017-01-21 15:24:43 +01:00
b386f71078
ifdef overlay graphics
...
Change-Id: If3173ddbfaccb95cc48636240ee3a918dac1e23f
2017-01-21 08:23:09 -06:00
c51bd35040
Try mounting different filesystems during decryption
...
Based on Dees_Troy's approach.
Change-Id: Id9aafb6d0c64ab43e2711720a26e30ac86b90235
2017-01-21 00:31:36 -05:00
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
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
f21b6c0d1d
Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 am: 6a82bc228a
...
am: 8157166107
2017-01-20 20:27:43 +00:00
8157166107
Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48
...
am: 6a82bc228a
2017-01-20 20:24:43 +00:00
6a82bc228a
Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656
...
am: ca261d3b48
2017-01-20 20:22:13 +00:00
ca261d3b48
Merge "imgpatch: Compile with ZLIB_CONST defined."
...
am: e78ca37656
2017-01-20 20:19:44 +00:00
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
e78ca37656
Merge "imgpatch: Compile with ZLIB_CONST defined."
2017-01-20 20:15:57 +00:00
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
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
2017-01-20 05:41:38 +00:00
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
2017-01-20 05:41:26 +00:00
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
2017-01-20 04:25:42 +00:00
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
2017-01-20 04:18:28 +00:00
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
2017-01-20 04:08:42 +00:00
Tao Bao
maxwen
gitbuildkicker
Alex Deymo
Chris Phoenix
Tianjie Xu
that
Matt Mower
Ethan Yonker
James Christopher Adduono