meizu-m86/multirom_m86
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[t20] Remove "boot primary ROM" button from trapoline_encmnt

Browse Source 
* We can't do that, MultiROM has to run rom_quirks on the primary
  ROM, because otherwise it can bork all secondary ROMs with
  restorecon_recursive /data.
This commit is contained in:
Vojtech Bocek
2015-03-08 14:18:32 +01:00
parent 7b120f0fec
commit 2a81cc38c7
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trampoline_encmnt/pw_ui.c
View File

@@ -64,7 +64,6 @@ static pthread_mutex_t exit_code_mutex = PTHREAD_MUTEX_INITIALIZER;
static int exit_code = ENCMNT_UIRES_ERROR;
static void *pwui_type_data = NULL;
static fb_text *invalid_pass_text = NULL;
static button *boot_primary_btn = NULL;
static void boot_internal_clicked(void *data)
{
@@ -393,18 +392,6 @@ static void init_ui(int pwtype)
invalid_pass_text = fb_add_text(0, 0, 0xFFFF0000, SIZE_BIG, "");
center_text(invalid_pass_text, -1, HEADER_HEIGHT, -1, 200*DPI_MUL);
if(!mrom_is_second_boot())
{
boot_primary_btn = mzalloc(sizeof(button));
boot_primary_btn->w = fb_width*0.30;
boot_primary_btn->h = HEADER_HEIGHT;
boot_primary_btn->x = fb_width - boot_primary_btn->w;
boot_primary_btn->y = 0;
boot_primary_btn->level_off = 101;
boot_primary_btn->clicked = &boot_internal_clicked;
button_init_ui(boot_primary_btn, "BOOT PRIMARY ROM", SIZE_SMALL);
}
switch(pwtype)
{
case CRYPT_TYPE_PASSWORD:
@@ -433,9 +420,6 @@ static void destroy_ui(int pwtype)
type_pattern_destroy();
break;
}
if(boot_primary_btn)
button_destroy(boot_primary_btn);
}
static int pw_ui_shutdown_counter_touch_handler(touch_event *ev, void *data)

4
version.h
View File

@@ -18,8 +18,8 @@
#ifndef VERSION_H
#define VERSION_H
#define VERSION_MULTIROM 31
#define VERSION_TRAMPOLINE 19
#define VERSION_TRAMPOLINE 20
// For device-specific fixes. Use letters, the version will then be like "12a"
#define VERSION_DEV_FIX "u"
#define VERSION_DEV_FIX "v"
#endif