Google Music stores their music cache /sdcard/Android...

Can't back this up unless we start selectively excluding apps, which is gross.

Most apps only store interstitial files here, so it is not a huge deal.
Apps need to be able to work properly without an SD card. (Oops ROM Manager).

Revert "backup and restore of /sdcard/Android (see getExternalFilesDir)"

This reverts commit 50732e3c67.

Conflicts:

	Android.mk

Change-Id: I3978c5521b4f29c4d709c3bb6a8fa7e53678a79e
This commit is contained in:
Koushik Dutta 2011-07-13 10:34:23 -07:00
parent e87f9e695e
commit 94a4babac7
4 changed files with 2 additions and 20 deletions

View File

@ -26,7 +26,7 @@ LOCAL_MODULE := recovery
LOCAL_FORCE_STATIC_EXECUTABLE := true
RECOVERY_VERSION := ClockworkMod Recovery v4.0.0.9
RECOVERY_VERSION := ClockworkMod Recovery v4.0.1.0
LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
RECOVERY_API_VERSION := 2
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)

View File

@ -145,10 +145,6 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) {
free(path);
return StringValue(strdup(""));
}
if (0 != format_volume("/sdcard/Android")) {
free(path);
return StringValue(strdup(""));
}
}
done:

View File

@ -277,16 +277,6 @@ int nandroid_backup(const char* backup_path)
return ret;
}
if (0 != stat("/sdcard/Android", &s))
{
ui_print("No /sdcard/Android found. Skipping backup of application files on external storage.\n");
}
else
{
if (0 != (ret = nandroid_backup_partition_extended(backup_path, "/sdcard/Android", 0)))
return ret;
}
if (0 != (ret = nandroid_backup_partition_extended(backup_path, "/cache", 0)))
return ret;
@ -524,9 +514,6 @@ int nandroid_restore(const char* backup_path, int restore_boot, int restore_syst
if (restore_data && 0 != (ret = nandroid_restore_partition_extended(backup_path, "/sdcard/.android_secure", 0)))
return ret;
if (restore_data && 0 != (ret = nandroid_restore_partition_extended(backup_path, "/sdcard/Android", 0)))
return ret;
if (restore_cache && 0 != (ret = nandroid_restore_partition_extended(backup_path, "/cache", 0)))
return ret;

View File

@ -686,7 +686,6 @@ wipe_data(int confirm) {
}
erase_volume("/sd-ext");
erase_volume("/sdcard/.android_secure");
erase_volume("/sdcard/Android");
ui_print("Data wipe complete.\n");
}
@ -827,7 +826,7 @@ main(int argc, char **argv) {
case 'p': previous_runs = atoi(optarg); break;
case 's': send_intent = optarg; break;
case 'u': update_package = optarg; break;
case 'w':
case 'w':
#ifndef BOARD_RECOVERY_ALWAYS_WIPES
wipe_data = wipe_cache = 1;
#endif