Skip to content

Commit 1c9d854

Browse files
mdmowerjumoog
mdmower
authored and
jumoog
committed
Remove HTC Dumlock
I've never met anyone who uses this. Flash your boot image through fastboot or go S-OFF. Change-Id: I0e9f0a43183d7e36d0599450d0eb01246ce831d7 Finish HTC Dumlock removal Change-Id: I8df6f4a06cc8bd0486d3754413332250757de44f
1 parent 07ea9ac commit 1c9d854

13 files changed

Lines changed: 1 addition & 787 deletions

File tree

‎Android.mk‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,7 @@ endif
214214
ifneq ($(RECOVERY_SDCARD_ON_DATA),)
215215
LOCAL_CFLAGS += -DRECOVERY_SDCARD_ON_DATA
216216
endif
217-
ifneq ($(TW_INCLUDE_DUMLOCK),)
218-
LOCAL_CFLAGS += -DTW_INCLUDE_DUMLOCK
219-
endif
217+
220218
ifneq ($(TW_INTERNAL_STORAGE_PATH),)
221219
LOCAL_CFLAGS += -DTW_INTERNAL_STORAGE_PATH=$(TW_INTERNAL_STORAGE_PATH)
222220
endif
@@ -428,11 +426,6 @@ endif
428426
ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true)
429427
LOCAL_ADDITIONAL_DEPENDENCIES += openaes openaes_license
430428
endif
431-
ifeq ($(TW_INCLUDE_DUMLOCK), true)
432-
LOCAL_ADDITIONAL_DEPENDENCIES += \
433-
htcdumlock htcdumlocksys flash_imagesys dump_imagesys libbmlutils.so \
434-
libflashutils.so libmmcutils.so libmtdutils.so HTCDumlock.apk
435-
endif
436429
ifeq ($(TW_INCLUDE_FB2PNG), true)
437430
LOCAL_ADDITIONAL_DEPENDENCIES += fb2png
438431
endif
@@ -704,7 +697,6 @@ endif
704697

705698
#includes for TWRP
706699
include $(commands_recovery_local_path)/injecttwrp/Android.mk \
707-
$(commands_recovery_local_path)/htcdumlock/Android.mk \
708700
$(commands_recovery_local_path)/gui/Android.mk \
709701
$(commands_recovery_local_path)/mmcutils/Android.mk \
710702
$(commands_recovery_local_path)/bmlutils/Android.mk \

‎data.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -551,13 +551,6 @@ void DataManager::SetDefaultValues()
551551
mConst.SetValue(TW_ALLOW_PARTITION_SDCARD, "1");
552552
#endif
553553

554-
#ifdef TW_INCLUDE_DUMLOCK
555-
printf("TW_INCLUDE_DUMLOCK := true\n");
556-
mConst.SetValue(TW_SHOW_DUMLOCK, "1");
557-
#else
558-
mConst.SetValue(TW_SHOW_DUMLOCK, "0");
559-
#endif
560-
561554
str = GetCurrentStoragePath();
562555
mPersist.SetValue(TW_ZIP_LOCATION_VAR, str);
563556
str += "/TWRP/BACKUPS/";

‎gui/action.cpp‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,6 @@ GUIAction::GUIAction(xml_node<>* node)
211211
ADD_ACTION(fixpermissions);
212212
ADD_ACTION(dd);
213213
ADD_ACTION(partitionsd);
214-
ADD_ACTION(installhtcdumlock);
215-
ADD_ACTION(htcdumlockrestoreboot);
216-
ADD_ACTION(htcdumlockreflashrecovery);
217214
ADD_ACTION(cmd);
218215
ADD_ACTION(terminalcommand);
219216
ADD_ACTION(reinjecttwrp);
@@ -1307,42 +1304,6 @@ int GUIAction::partitionsd(std::string arg __unused)
13071304

13081305
}
13091306

1310-
int GUIAction::installhtcdumlock(std::string arg __unused)
1311-
{
1312-
operation_start("Install HTC Dumlock");
1313-
if (simulate) {
1314-
simulate_progress_bar();
1315-
} else
1316-
TWFunc::install_htc_dumlock();
1317-
1318-
operation_end(0);
1319-
return 0;
1320-
}
1321-
1322-
int GUIAction::htcdumlockrestoreboot(std::string arg __unused)
1323-
{
1324-
operation_start("HTC Dumlock Restore Boot");
1325-
if (simulate) {
1326-
simulate_progress_bar();
1327-
} else
1328-
TWFunc::htc_dumlock_restore_original_boot();
1329-
1330-
operation_end(0);
1331-
return 0;
1332-
}
1333-
1334-
int GUIAction::htcdumlockreflashrecovery(std::string arg __unused)
1335-
{
1336-
operation_start("HTC Dumlock Reflash Recovery");
1337-
if (simulate) {
1338-
simulate_progress_bar();
1339-
} else
1340-
TWFunc::htc_dumlock_reflash_recovery_to_boot();
1341-
1342-
operation_end(0);
1343-
return 0;
1344-
}
1345-
13461307
int GUIAction::cmd(std::string arg)
13471308
{
13481309
int op_status = 0;

‎gui/objects.hpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,6 @@ class GUIAction : public GUIObject, public ActionObject
337337
int fixpermissions(std::string arg);
338338
int dd(std::string arg);
339339
int partitionsd(std::string arg);
340-
int installhtcdumlock(std::string arg);
341-
int htcdumlockrestoreboot(std::string arg);
342-
int htcdumlockreflashrecovery(std::string arg);
343340
int cmd(std::string arg);
344341
int terminalcommand(std::string arg);
345342
int killterminal(std::string arg);

‎gui/theme/common/landscape.xml‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3235,13 +3235,6 @@
32353235
<action function="page">sideload</action>
32363236
</button>
32373237

3238-
<button style="main_button">
3239-
<condition var1="tw_show_dumlock" var2="1"/>
3240-
<placement x="%center_x%" y="%row15a_y%"/>
3241-
<text>{@dumlock_btn=HTC Dumlock}</text>
3242-
<action function="page">htcdumlock</action>
3243-
</button>
3244-
32453238
<button style="main_button">
32463239
<condition var1="tw_has_injecttwrp" var2="1"/>
32473240
<placement x="%center_x%" y="%row15a_y%"/>
@@ -3448,72 +3441,6 @@
34483441
</action>
34493442
</page>
34503443

3451-
<page name="htcdumlock">
3452-
<template name="page"/>
3453-
3454-
<text style="text_l">
3455-
<placement x="%col1_x_header%" y="%row3_header_y%"/>
3456-
<text>{@advanced_hdr=Advanced}</text>
3457-
</text>
3458-
3459-
<text style="text_m">
3460-
<placement x="%col1_x_header%" y="%row4_header_y%"/>
3461-
<text>{@dumlock_hdr=HTC Dumlock}</text>
3462-
</text>
3463-
3464-
<button style="main_button_m">
3465-
<placement x="%col2_x_left%" y="%row2_y%"/>
3466-
<text>{@dumlock_restore_btn=Restore Original Boot}</text>
3467-
<actions>
3468-
<action function="set">tw_back=htcdumlock</action>
3469-
<action function="set">tw_action=htcdumlockrestoreboot</action>
3470-
<action function="set">tw_text1={@dumlock_restore_confirm=Restore original boot image?}</action>
3471-
<action function="set">tw_action_text1={@dumlock_restoring=Restoring Original Boot...}</action>
3472-
<action function="set">tw_complete_text1={@dumlock_restore_complete=Restore Original Boot Complete}</action>
3473-
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
3474-
<action function="page">confirm_action</action>
3475-
</actions>
3476-
</button>
3477-
3478-
<button style="main_button_m">
3479-
<placement x="%col2_x_left%" y="%row6a_y%"/>
3480-
<text>{@dumlock_reflash_btn=Reflash Recovery}</text>
3481-
<actions>
3482-
<action function="set">tw_back=htcdumlock</action>
3483-
<action function="set">tw_action=htcdumlockreflashrecovery</action>
3484-
<action function="set">tw_text1={@dumlock_reflash_confirm=Reflash recovery to boot?}</action>
3485-
<action function="set">tw_action_text1={@dumlock_reflashing=Flashing recovery to boot...}</action>
3486-
<action function="set">tw_complete_text1={@dumlock_reflash_complete=Recovery Flash to Boot Complete}</action>
3487-
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
3488-
<action function="page">confirm_action</action>
3489-
</actions>
3490-
</button>
3491-
3492-
<button style="main_button_m">
3493-
<placement x="%col2_x_left%" y="%row11_y%"/>
3494-
<text>{@dumlock_install_btn=Install HTC Dumlock}</text>
3495-
<actions>
3496-
<action function="set">tw_back=htcdumlock</action>
3497-
<action function="set">tw_action=installhtcdumlock</action>
3498-
<action function="set">tw_text1={@dumlock_install_confirm=Install HTC dumlock files to ROM?}</action>
3499-
<action function="set">tw_action_text1={@dumlock_installing=Installing HTC Dumlock...}</action>
3500-
<action function="set">tw_complete_text1={@dumlock_install_complete=HTC Dumlock Install Complete}</action>
3501-
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
3502-
<action function="page">confirm_action</action>
3503-
</actions>
3504-
</button>
3505-
3506-
<action>
3507-
<touch key="home"/>
3508-
<action function="page">main</action>
3509-
</action>
3510-
3511-
<action>
3512-
<touch key="back"/>
3513-
<action function="page">advanced</action>
3514-
</action>
3515-
</page>
3516-
35173444
<page name="lock">
35183445
<background color="%semi_transparent%"/>
35193446

‎gui/theme/common/portrait.xml‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3395,13 +3395,6 @@
33953395
<action function="page">sideload</action>
33963396
</button>
33973397

3398-
<button style="main_button">
3399-
<condition var1="tw_show_dumlock" var2="1"/>
3400-
<placement x="%center_x%" y="%row19_y%"/>
3401-
<text>{@dumlock_btn=HTC Dumlock}</text>
3402-
<action function="page">htcdumlock</action>
3403-
</button>
3404-
34053398
<button style="main_button">
34063399
<condition var1="tw_has_injecttwrp" var2="1"/>
34073400
<placement x="%center_x%" y="%row19_y%"/>
@@ -3611,72 +3604,6 @@
36113604
</action>
36123605
</page>
36133606

3614-
<page name="htcdumlock">
3615-
<template name="page"/>
3616-
3617-
<text style="text_l">
3618-
<placement x="%col1_x_header%" y="%row3_header_y%"/>
3619-
<text>{@advanced_hdr=Advanced}</text>
3620-
</text>
3621-
3622-
<text style="text_m">
3623-
<placement x="%col1_x_header%" y="%row4_header_y%"/>
3624-
<text>{@dumlock_hdr=HTC Dumlock}</text>
3625-
</text>
3626-
3627-
<button style="main_button_half_height_full_width">
3628-
<placement x="%indent%" y="%row15a_y%"/>
3629-
<text>{@dumlock_restore_btn=Restore Original Boot}</text>
3630-
<actions>
3631-
<action function="set">tw_back=htcdumlock</action>
3632-
<action function="set">tw_action=htcdumlockrestoreboot</action>
3633-
<action function="set">tw_text1={@dumlock_restore_confirm=Restore original boot image?}</action>
3634-
<action function="set">tw_action_text1={@dumlock_restoring=Restoring Original Boot...}</action>
3635-
<action function="set">tw_complete_text1={@dumlock_restore_complete=Restore Original Boot Complete}</action>
3636-
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
3637-
<action function="page">confirm_action</action>
3638-
</actions>
3639-
</button>
3640-
3641-
<button style="main_button_half_height_full_width">
3642-
<placement x="%indent%" y="%row18a_y%"/>
3643-
<text>{@dumlock_reflash_btn=Reflash Recovery}</text>
3644-
<actions>
3645-
<action function="set">tw_back=htcdumlock</action>
3646-
<action function="set">tw_action=htcdumlockreflashrecovery</action>
3647-
<action function="set">tw_text1={@dumlock_reflash_confirm=Reflash recovery to boot?}</action>
3648-
<action function="set">tw_action_text1={@dumlock_reflashing=Flashing recovery to boot...}</action>
3649-
<action function="set">tw_complete_text1={@dumlock_reflash_complete=Recovery Flash to Boot Complete}</action>
3650-
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
3651-
<action function="page">confirm_action</action>
3652-
</actions>
3653-
</button>
3654-
3655-
<button style="main_button_half_height_full_width">
3656-
<placement x="%indent%" y="%row21a_y%"/>
3657-
<text>{@dumlock_install_btn=Install HTC Dumlock}</text>
3658-
<actions>
3659-
<action function="set">tw_back=htcdumlock</action>
3660-
<action function="set">tw_action=installhtcdumlock</action>
3661-
<action function="set">tw_text1={@dumlock_install_confirm=Install HTC dumlock files to ROM?}</action>
3662-
<action function="set">tw_action_text1={@dumlock_installing=Installing HTC Dumlock...}</action>
3663-
<action function="set">tw_complete_text1={@dumlock_install_complete=HTC Dumlock Install Complete}</action>
3664-
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
3665-
<action function="page">confirm_action</action>
3666-
</actions>
3667-
</button>
3668-
3669-
<action>
3670-
<touch key="home"/>
3671-
<action function="page">main</action>
3672-
</action>
3673-
3674-
<action>
3675-
<touch key="back"/>
3676-
<action function="page">advanced</action>
3677-
</action>
3678-
</page>
3679-
36803607
<page name="lock">
36813608
<background color="%semi_transparent%"/>
36823609

‎gui/theme/common/watch.xml‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -4003,13 +4003,6 @@
40034003
</actions>
40044004
</button>
40054005

4006-
<button style="main_button">
4007-
<condition var1="tw_show_dumlock" var2="1"/>
4008-
<placement x="%col1_x_left%" y="%row11_y%"/>
4009-
<text>{@dumlock_btn=HTC Dumlock}</text>
4010-
<action function="page">htcdumlock</action>
4011-
</button>
4012-
40134006
<button style="main_button">
40144007
<condition var1="tw_has_injecttwrp" var2="1"/>
40154008
<placement x="%col1_x_right%" y="%row11_y%"/>
@@ -4359,69 +4352,6 @@
43594352
</action>
43604353
</page>
43614354

4362-
<page name="htcdumlock">
4363-
<template name="page"/>
4364-
4365-
<template name="statusbar"/>
4366-
4367-
<text style="text_m">
4368-
<placement x="%col1_x_left%" y="%row1_header_y%"/>
4369-
<text>{@advanced_hdr=Advanced} &gt; {@dumlock_hdr=HTC Dumlock}</text>
4370-
</text>
4371-
4372-
<button style="main_button_full_width">
4373-
<placement x="%indent%" y="%row1_y%"/>
4374-
<text>{@dumlock_restore_btn=Restore Original Boot}</text>
4375-
<actions>
4376-
<action function="set">tw_back=htcdumlock</action>
4377-
<action function="set">tw_action=htcdumlockrestoreboot</action>
4378-
<action function="set">tw_text1={@dumlock_restore_confirm=Restore original boot image?}</action>
4379-
<action function="set">tw_action_text1={@dumlock_restoring=Restoring Original Boot...}</action>
4380-
<action function="set">tw_complete_text1={@dumlock_restore_complete=Restore Original Boot Complete}</action>
4381-
<action function="set">tw_slider_text={@swipe_confirm= Confirm}</action>
4382-
<action function="page">confirm_action</action>
4383-
</actions>
4384-
</button>
4385-
4386-
<button style="main_button_full_width">
4387-
<placement x="%indent%" y="%row6_y%"/>
4388-
<text>{@dumlock_reflash_btn=Reflash Recovery}</text>
4389-
<actions>
4390-
<action function="set">tw_back=htcdumlock</action>
4391-
<action function="set">tw_action=htcdumlockreflashrecovery</action>
4392-
<action function="set">tw_text1={@dumlock_reflash_confirm=Reflash recovery to boot?}</action>
4393-
<action function="set">tw_action_text1={@dumlock_reflashing=Flashing recovery to boot...}</action>
4394-
<action function="set">tw_complete_text1={@dumlock_reflash_complete=Recovery Flash to Boot Complete}</action>
4395-
<action function="set">tw_slider_text={@swipe_confirm= Confirm}</action>
4396-
<action function="page">confirm_action</action>
4397-
</actions>
4398-
</button>
4399-
4400-
<button style="main_button_full_width">
4401-
<placement x="%indent%" y="%row11_y%"/>
4402-
<text>{@dumlock_install_btn=Install HTC Dumlock}</text>
4403-
<actions>
4404-
<action function="set">tw_back=htcdumlock</action>
4405-
<action function="set">tw_action=installhtcdumlock</action>
4406-
<action function="set">tw_action_text1={@dumlock_installing=Installing HTC Dumlock...}</action>
4407-
<action function="set">tw_complete_text1={@dumlock_install_complete=HTC Dumlock Install Complete}</action>
4408-
<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
4409-
<action function="set">tw_slider_text={@swipe_confirm= Confirm}</action>
4410-
<action function="page">confirm_action</action>
4411-
</actions>
4412-
</button>
4413-
4414-
<action>
4415-
<touch key="home"/>
4416-
<action function="page">main</action>
4417-
</action>
4418-
4419-
<action>
4420-
<touch key="back"/>
4421-
<action function="page">advanced</action>
4422-
</action>
4423-
</page>
4424-
44254355
<page name="lock">
44264356
<background color="%semi_transparent%"/>
44274357

‎htcdumlock/Android.mk‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)