Tao Bao
a6b3c540ad
am 3f640620: am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."
...
* commit '3f6406204c9886ee59209a98e1bb8b64ae615656':
updater: libapplypatch needs libbase now.
2015-07-24 20:33:21 +00:00
Tao Bao
990c308ab5
resolved conflicts for merge of 49a24460 to master
2015-07-24 13:29:09 -07:00
Tao Bao
82a4aa7f93
am 052796ea: am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."
...
* commit '052796ea09bcf33f7031aa8218628bf1c9ced02a':
recovery: Switch fuse_* to C++.
2015-07-24 20:06:54 +00:00
Tao Bao
ef37ee0457
am 0d4e0026: recovery: Switch fuse_* to C++.
...
* commit '0d4e002670064157aa34ba8c391184151b7d402a':
recovery: Switch fuse_* to C++.
2015-07-24 18:58:41 +00:00
Tao Bao
3b753ad5da
am dd738c11: Merge "applypatch: Support flash mode."
...
* commit 'dd738c11a49d594183dde9f0e46f56c7a575900a':
applypatch: Support flash mode.
2015-07-24 18:33:57 +00:00
Tao Bao
e657f0fb8e
am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."
...
* commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a':
uncrypt: Support file level encryption.
2015-07-24 18:33:22 +00:00
Tao Bao
3f6406204c
am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."
...
* commit '87f2c673dfbc310d1a80ea1c3b00d9e1adb1947f':
updater: libapplypatch needs libbase now.
2015-07-24 18:33:21 +00:00
Tao Bao
49a24460a4
am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."
...
* commit '1dc71bec8d3dc3c1eb7eb40aed2eeb04b47f75ce':
applypatch: Refactor strtok().
2015-07-24 18:33:20 +00:00
Tao Bao
052796ea09
am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."
...
* commit 'b91e700544e0fca378a7fb5f8c807842bb284986':
recovery: Switch fuse_* to C++.
2015-07-24 18:33:19 +00:00
Tao Bao
0d4e002670
recovery: Switch fuse_* to C++.
...
Change-Id: Id50c3e6febd0ab61f10a654b9b265cf21a2d1701
(cherry picked from commit 71dc365f25 )
2015-07-24 11:22:05 -07:00
Tao Bao
c69095d8cd
am afb8f320: Merge "uncrypt: Support file level encryption."
...
* commit 'afb8f320bf244630035e011f7840f90120ec4f8f':
uncrypt: Support file level encryption.
2015-07-24 18:18:42 +00:00
Tao Bao
87f2c673df
am cc3c3414: Merge "updater: libapplypatch needs libbase now."
...
* commit 'cc3c34145e4816a84fe597ce273b016ae9587530':
updater: libapplypatch needs libbase now.
2015-07-24 18:18:41 +00:00
Tao Bao
1dc71bec8d
am cfd9d9c7: Merge "applypatch: Refactor strtok()."
...
* commit 'cfd9d9c7ce03b847946977a98efcbfca2f067fd3':
applypatch: Refactor strtok().
2015-07-24 18:18:39 +00:00
Tao Bao
dd738c11a4
Merge "applypatch: Support flash mode."
2015-07-24 18:17:49 +00:00
Tao Bao
abba55b4c5
applypatch: Support flash mode.
...
We may carry a full copy of recovery image in the /system, and use
/system/bin/install-recovery.sh to install the recovery. This CL adds
support to flash the recovery partition with the given image.
Bug: 22641135
Change-Id: I7a275b62fdd1bf41f97f6aab62d0200f7dae5aa1
(cherry picked from commit 68c5a67967 )
2015-07-24 11:15:19 -07:00
Tao Bao
afb8f320bf
Merge "uncrypt: Support file level encryption."
2015-07-24 18:13:58 +00:00
Tao Bao
7cf50c60b5
uncrypt: Support file level encryption.
...
Bug: 22534003
Change-Id: I2bc22418c416491da573875dce78daed24f2c046
(cherry picked from commit 6e9dda70cb )
2015-07-24 11:13:25 -07:00
Tao Bao
cc3c34145e
Merge "updater: libapplypatch needs libbase now."
2015-07-24 18:10:21 +00:00
Tao Bao
ba8a6789f7
updater: libapplypatch needs libbase now.
...
Change-Id: I18da9e6da64fccab495dc5a96e3efd95cc6d88bf
(cherry picked from commit 1b1ea17d55 )
2015-07-24 11:09:36 -07:00
Tao Bao
cfd9d9c7ce
Merge "applypatch: Refactor strtok()."
2015-07-24 18:08:50 +00:00
Tao Bao
aca8e89603
applypatch: Refactor strtok().
...
We have android::base::Split() for the work.
Change-Id: I0fb562feb203c9b15e2f431d8e84355fd682376a
(cherry picked from commit 0a47ce27de )
2015-07-24 11:08:14 -07:00
Ethan Yonker
ffc9174145
Really fix background color on 480x800 theme
...
Change-Id: I70324ae3e4fffe88bc2b5a02becb7d1f4f0ceab0
2015-07-22 08:22:33 -05:00
Tao Bao
68c5a67967
applypatch: Support flash mode.
...
We may carry a full copy of recovery image in the /system, and use
/system/bin/install-recovery.sh to install the recovery. This CL adds
support to flash the recovery partition with the given image.
Bug: 22641135
Change-Id: I345eaaee269f6443527f45a9be7e4ee47f6b2b39
2015-07-21 17:43:42 -07:00
Tao Bao
b91e700544
am 85090d0c: Merge "recovery: Switch fuse_* to C++."
...
* commit '85090d0c98f1684147fc180a8b2adea93e4af642':
recovery: Switch fuse_* to C++.
2015-07-20 19:16:45 +00:00
Tao Bao
85090d0c98
Merge "recovery: Switch fuse_* to C++."
2015-07-20 19:00:11 +00:00
Tao Bao
71dc365f25
recovery: Switch fuse_* to C++.
...
Change-Id: I68770ad1a9e99caee292f8010cfd37dfea3acc64
2015-07-20 11:57:40 -07:00
Tao Bao
ee4efc4d3e
Merge "updater: libapplypatch needs libbase now."
2015-07-17 20:45:32 +00:00
Tao Bao
1b1ea17d55
updater: libapplypatch needs libbase now.
...
Change-Id: Ibe3173edd6274b61bd9ca5ec394d7f6b4a403639
2015-07-17 13:39:52 -07:00
Tao Bao
0a47ce27de
applypatch: Refactor strtok().
...
We have android::base::Split() for the work.
Change-Id: Ic529db42090f700e6455d465c8b84b7f52d34d63
2015-07-17 13:06:08 -07:00
Tao Bao
c31f8a1167
am f2c4e4ce: am 6e9dda70: uncrypt: Support file level encryption.
...
* commit 'f2c4e4ce767103603cdc6137339f013af3dc1ad1':
uncrypt: Support file level encryption.
2015-07-17 05:50:07 +00:00
Tao Bao
a51708dfbe
am ac780c90: am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."
...
* commit 'ac780c904670f61083f6831bb2d09bc0a15a0bd6':
Clean up LOG functions.
2015-07-17 05:50:07 +00:00
Tao Bao
f2c4e4ce76
am 6e9dda70: uncrypt: Support file level encryption.
...
* commit '6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332':
uncrypt: Support file level encryption.
2015-07-17 05:43:35 +00:00
Tao Bao
0e7368a505
am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."
...
* commit '328cb8cb5a434ba9d897443a408d11e8ee8c64a0':
Clean up LOG functions.
2015-07-17 05:37:49 +00:00
Tao Bao
ac780c9046
am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."
...
* commit '328cb8cb5a434ba9d897443a408d11e8ee8c64a0':
Clean up LOG functions.
2015-07-17 05:37:34 +00:00
Tao Bao
328cb8cb5a
am 025c0e79: Merge "Clean up LOG functions."
...
* commit '025c0e79c3e05babd4df0bab8249466b489c0870':
Clean up LOG functions.
2015-07-17 05:23:59 +00:00
Tao Bao
025c0e79c3
Merge "Clean up LOG functions."
2015-07-17 05:13:44 +00:00
Tao Bao
dd4d9818a8
Clean up LOG functions.
...
For fatal errors, use LOGE to show messages.
Bug: 22236461
Change-Id: I2b7d761576894ac37fcbadcba690ae14affe8f07
(cherry picked from commit d7d0f75034 )
2015-07-16 22:12:32 -07:00
Tao Bao
6e9dda70cb
uncrypt: Support file level encryption.
...
Bug: 22534003
Change-Id: Iaf42a6e5b40cfef904de66e212ae8b77b2953ef7
2015-07-16 20:04:39 -07:00
Tao Bao
d7d0f75034
Clean up LOG functions.
...
For fatal errors, use LOGE to show messages.
Bug: 22236461
Change-Id: Ie2ce7ec769f4502d732fbb53fb7b303c0cf9ed68
2015-07-16 13:43:46 -07:00
maxwen
44d59eaf16
minui: add BOARD_USE_CUSTOM_RECOVERY_FONT
...
we want to use it in charger
Change-Id: I3e0288b074bd7203214d218aaee69cb4798e9531
2015-07-16 02:36:38 +02:00
Tao Bao
3231c7ca7f
am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."
...
* commit '307eecfdc7dc73ce8f53f742e3c468e63b42f0e2':
recovery: Switch applypatch/ and updater/ to cpp.
2015-07-14 22:52:24 +00:00
Tao Bao
22f5b98ee6
am 48248273: am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."
...
* commit '4824827340cc76927f8b24d000638624b15021ac':
recovery: Switch applypatch/ and updater/ to cpp.
2015-07-14 20:41:39 +00:00
Tao Bao
4824827340
am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."
...
* commit '307eecfdc7dc73ce8f53f742e3c468e63b42f0e2':
recovery: Switch applypatch/ and updater/ to cpp.
2015-07-14 20:26:45 +00:00
Ethan Yonker
b81d905165
Add ntfs-3g support
...
Add support for mounting ntfs via ntfs-3g and support for wiping
and repairing ntfs partitions.
Change-Id: I82dc4626f459bb93b86eb9ebba64ad3a6560781b
2015-07-14 16:54:04 +02:00
Ethan Yonker
961d20e09c
Make system read only show no matter what on first TWRP boot
...
Initial value for tw_mount_system_ro is now 2. If the value of
tw_mount_system_ro is 2 during boot, then we will show the system
read only prompt and ignore the value from the lifetime writes
check.
Note: Changed the value of FILE_VERSION which will trigger the
data manager to throw out previous settings and start with default
values so that existing TWRP users will get the prompt at least
once.
Change-Id: I447767b64617f855156a19a5dc15c4ece6dff7b8
2015-07-14 16:53:43 +02:00
Matt Mower
ec009e8cd4
Allow devices to override USB init
...
This enables devices to provide their own USB configuration. The
contents of init.recovery.usb.rc can most simply be modified and
included in a device's init.recovery.${ro.hardware}.rc.
Use option:
TW_EXCLUDE_DEFAULT_USB_INIT := true
Rationale: Some devices handle USB pid switching in the kernel. In this
case, USB init provides switching functions which differ from the
standard on property:sys.usb.config=xyz. Other devices should not see
USB attempt mtp,adb mode when TW_EXCLUDE_MTP is set.
Cherry-picked from android-5.0
Change-Id: Ief0fcaf46a1782102166fc1b733a34b1a1ba0802
2015-07-14 16:48:43 +02:00
Captain Throwback
7fe1b3987a
Update path for libcryptfs_hw to proper variable
...
Change-Id: Ie91d161f4e439a870534639f44a03df22f4fe39a
2015-07-14 16:38:50 +02:00
that
c01391c123
gui: allow listbox to be used as menu and as read-only list
...
Also enable string insertion for list items.
Example how to make a menu item:
<listitem name="Lights on!">
<action>
<action function="setbrightness">255</action>
</action>
</listitem>
If no <data> element and no actions on any items exist, the list is
read only and no item selection is possible.
Change-Id: Ib2668a982df2514484d44faa0396dd17550f39f3
2015-07-14 16:07:11 +02:00
that
f6b2066ff3
gui: keyboard: support longpress label offset, code cleanup
...
To position the longpress label:
<longpress font="..." textcolor="..." x="5" y="0"/>
x and y is the distance from the upper right corner.
- extract method GUIKeyboard::DrawKey
- clean up handling of currently pressed key
- integrate key highlighting into main key drawing loops
Change-Id: I80ccf2975d30cffa2a48627a74ab3693c84e4fa4
2015-07-14 16:00:35 +02:00
Tao Bao
485b63702c
recovery: Switch applypatch/ and updater/ to cpp.
...
Mostly trivial changes to make cpp compiler happy.
Change-Id: I1b0481465c67c3bbca35a839d0764190d84ff34e
(cherry picked from commit ba9a42aa7e )
2015-07-13 23:25:46 -07:00