am c87bab10: add the functions for multi-stage packages to updater (d327c63a) · Commits · e / tools / etwrp

bootloader.h

+14 −1

Original line number	Diff line number	Diff line
		@@ -38,11 +38,24 @@ extern "C" {
		* The recovery field is only written by linux and used
		* for the system to send a message to recovery or the
		* other way around.
		*
		* The stage field is written by packages which restart themselves
		* multiple times, so that the UI can reflect which invocation of the
		* package it is. If the value is of the format "#/#" (eg, "1/3"),
		* the UI will add a simple indicator of that status.
		*/
		struct bootloader_message {
		char command[32];
		char status[32];
		char recovery[1024];
		char recovery[768];

		// The 'recovery' field used to be 1024 bytes. It has only ever
		// been used to store the recovery command line, so 768 bytes
		// should be plenty. We carve off the last 256 bytes to store the
		// stage string (for multistage packages) and possible future
		// expansion.
		char stage[32];
		char reserved[224];
		};

		/* Read and write the bootloader command from the "misc" partition.

recovery.cpp

+18 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ static const struct option OPTIONS[] = {
		{ "show_text", no_argument, NULL, 't' },
		{ "just_exit", no_argument, NULL, 'x' },
		{ "locale", required_argument, NULL, 'l' },
		{ "stages", required_argument, NULL, 'g' },
		{ NULL, 0, NULL, 0 },
		};

		@@ -76,6 +77,7 @@ static const char *SIDELOAD_TEMP_DIR = "/tmp/sideload";
		RecoveryUI* ui = NULL;
		char* locale = NULL;
		char recovery_version[PROPERTY_VALUE_MAX+1];
		char* stage = NULL;

		/*
		* The recovery tool communicates with the main system through /cache files.
		@@ -172,6 +174,7 @@ get_args(int argc, char **argv) {
		struct bootloader_message boot;
		memset(&boot, 0, sizeof(boot));
		get_bootloader_message(&boot); // this may fail, leaving a zeroed structure
		stage = strndup(boot.stage, sizeof(boot.stage));

		if (boot.command[0] != 0 && boot.command[0] != 255) {
		LOGI("Boot command: %.*s\n", sizeof(boot.command), boot.command);
		@@ -959,6 +962,14 @@ main(int argc, char **argv) {
		case 't': show_text = 1; break;
		case 'x': just_exit = true; break;
		case 'l': locale = optarg; break;
		case 'g': {
		if (stage == NULL \|\| *stage == '\0') {
		char buffer[20] = "1/";
		strncat(buffer, optarg, sizeof(buffer)-3);
		stage = strdup(buffer);
		}
		break;
		}
		case '?':
		LOGE("Invalid command argument\n");
		continue;
		@@ -969,12 +980,19 @@ main(int argc, char **argv) {
		load_locale_from_cache();
		}
		printf("locale is [%s]\n", locale);
		printf("stage is [%s]\n", stage, stage);

		Device* device = make_device();
		ui = device->GetUI();
		gCurrentUI = ui;

		ui->Init();

		int st_cur, st_max;
		if (stage != NULL && sscanf(stage, "%d/%d", &st_cur, &st_max) == 2) {
		ui->SetStage(st_cur, st_max);
		}

		ui->SetLocale(locale);
		ui->SetBackground(RecoveryUI::NONE);
		if (show_text) ui->ShowText(true);

res/images/stage_empty.png

0 → 100644

+322 B

Loading image diff...

res/images/stage_fill.png

0 → 100644

+258 B

Loading image diff...

screen_ui.cpp

+32 −4

Original line number	Diff line number	Diff line
		@@ -81,7 +81,9 @@ ScreenRecoveryUI::ScreenRecoveryUI() :
		install_overlay_offset_x(13),
		install_overlay_offset_y(190),
		overlay_offset_x(-1),
		overlay_offset_y(-1) {
		overlay_offset_y(-1),
		stage(-1),
		max_stage(-1) {

		for (int i = 0; i < 5; i++)
		backgroundIcon[i] = NULL;
		@@ -120,14 +122,28 @@ void ScreenRecoveryUI::draw_background_locked(Icon icon)
		int iconHeight = gr_get_height(surface);
		int textWidth = gr_get_width(text_surface);
		int textHeight = gr_get_height(text_surface);
		int stageHeight = gr_get_height(stageMarkerEmpty);

		int sh = (max_stage >= 0) ? stageHeight : 0;

		int iconX = (gr_fb_width() - iconWidth) / 2;
		int iconY = (gr_fb_height() - (iconHeight+textHeight+40)) / 2;
		int iconY = (gr_fb_height() - (iconHeight+textHeight+40+sh)) / 2;

		int textX = (gr_fb_width() - textWidth) / 2;
		int textY = ((gr_fb_height() - (iconHeight+textHeight+40)) / 2) + iconHeight + 40;
		int textY = ((gr_fb_height() - (iconHeight+textHeight+40+sh)) / 2) + iconHeight + 40;

		gr_blit(surface, 0, 0, iconWidth, iconHeight, iconX, iconY);
		if (stageHeight > 0) {
		int sw = gr_get_width(stageMarkerEmpty);
		int x = (gr_fb_width() - max_stage * gr_get_width(stageMarkerEmpty)) / 2;
		int y = iconY + iconHeight + 20;
		for (int i = 0; i < max_stage; ++i) {
		gr_blit((i < stage) ? stageMarkerFill : stageMarkerEmpty,
		0, 0, sw, stageHeight, x, y);
		x += sw;
		}
		}

		if (icon == INSTALLING_UPDATE \|\| icon == ERASING) {
		draw_install_overlay_locked(installingFrame);
		}
		@@ -383,6 +399,8 @@ void ScreenRecoveryUI::Init()

		LoadBitmap("progress_empty", &progressBarEmpty);
		LoadBitmap("progress_fill", &progressBarFill);
		LoadBitmap("stage_empty", &stageMarkerEmpty);
		LoadBitmap("stage_fill", &stageMarkerFill);

		LoadLocalizedBitmap("installing_text", &backgroundText[INSTALLING_UPDATE]);
		LoadLocalizedBitmap("erasing_text", &backgroundText[ERASING]);
		@@ -453,7 +471,10 @@ void ScreenRecoveryUI::SetBackground(Icon icon)
		gr_surface text = backgroundText[icon];
		overlay_offset_x = install_overlay_offset_x + (gr_fb_width() - gr_get_width(bg)) / 2;
		overlay_offset_y = install_overlay_offset_y +
		(gr_fb_height() - (gr_get_height(bg) + gr_get_height(text) + 40)) / 2;
		(gr_fb_height() - (gr_get_height(bg) +
		gr_get_height(text) +
		40 +
		((max_stage >= 0) ? gr_get_height(stageMarkerEmpty) : 0))) / 2;
		}

		currentIcon = icon;
		@@ -505,6 +526,13 @@ void ScreenRecoveryUI::SetProgress(float fraction)
		pthread_mutex_unlock(&updateMutex);
		}

		void ScreenRecoveryUI::SetStage(int current, int max) {
		pthread_mutex_lock(&updateMutex);
		stage = current;
		max_stage = max;
		pthread_mutex_unlock(&updateMutex);
		}

		void ScreenRecoveryUI::Print(const char *fmt, ...)
		{
		char buf[256];