From fb3bd71038a3795aed603146b55effc38cf41cee Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 16 Jun 2011 14:13:02 -0700 Subject: [PATCH 1/2] fix crash bug. Change-Id: I1afbc75815ffc72508942b73e40f67307f330ddf --- extendedcommands.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extendedcommands.c b/extendedcommands.c index 64c4e3d..c2a0e18 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -423,8 +423,7 @@ int format_unknown_device(const char *device, const char* path, const char *fs_t { LOGI("Formatting unknown device.\n"); - // device may simply be a name, like "system" - if (get_flash_type(fs_type) != UNSUPPORTED) + if (fs_type != NULL && get_flash_type(fs_type) != UNSUPPORTED) return erase_raw_partition(fs_type, device); // if this is SDEXT:, don't worry about it if it does not exist. From 11cff33332752e4a26b2090618f15eed89c3f03f Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 16 Jun 2011 17:05:34 -0700 Subject: [PATCH 2/2] bug fixes Change-Id: Iadce53c6fbd4fe07d899e18c94198ec2e3a60f0d --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 2fe241a..9ec1301 100644 --- a/Android.mk +++ b/Android.mk @@ -26,7 +26,7 @@ LOCAL_MODULE := recovery LOCAL_FORCE_STATIC_EXECUTABLE := true -RECOVERY_VERSION := ClockworkMod Recovery v4.0.0.4 +RECOVERY_VERSION := ClockworkMod Recovery v4.0.0.5 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) @@ -88,7 +88,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_SYMLINKS) # Now let's do recovery symlinks BUSYBOX_LINKS := $(shell cat external/busybox/busybox-minimal.links) ifndef BOARD_HAS_SMALL_RECOVERY -exclude := tune2fs +exclude := tune2fs mke2fs endif RECOVERY_BUSYBOX_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS)))) $(RECOVERY_BUSYBOX_SYMLINKS): BUSYBOX_BINARY := busybox