Adjust AVD create dialog to match sdcard size limits.

Change mksdcard to a minimum of 9 MiB, which is what
we enforce in the UI (I believe the 8 MiB min was obsoleted
by the 9 MiB one.)
Also warn the user about the min/max sdcard size properly
directly in the creation dialog, instead of relying on
mksdcard to fail later.

Change-Id: I30bc425ed6b75d8a00965e9e2e25890bd9bd8b39

1 files changed, 2 insertions, 2 deletions

diff --git a/emulator/mksdcard/mksdcard.c b/emulator/mksdcard/mksdcard.c
index a1e339a..c9a3eeb 100644
--- a/emulator/mksdcard/mksdcard.c
+++ b/emulator/mksdcard/mksdcard.c
@@ -212,7 +212,7 @@ static void usage (void)
     fprintf(stderr, "  if <size> is an integer followed by 'K', it specifies a size in KiB\n" );
     fprintf(stderr, "  if <size> is an integer followed by 'M', it specifies a size in MiB\n" );
     fprintf(stderr, "  if <size> is an integer followed by 'G', it specifies a size in GiB\n" );
-    fprintf(stderr, "\nMinimum size is 8M. The Android emulator cannot use smaller images.\n" );
+    fprintf(stderr, "\nMinimum size is 9M. The Android emulator cannot use smaller images.\n" );
     fprintf(stderr, "Maximum size is %lld bytes, %lldK, %lldM or %lldG\n",
             MAX_DISK_SIZE, MAX_DISK_SIZE >> 10, MAX_DISK_SIZE >> 20, MAX_DISK_SIZE >> 30);
     exit(1);
@@ -265,7 +265,7 @@ int  main( int argc, char**  argv )
     else if (*end == 'G')
         disk_size *= 1024*1024*1024;
 
-    if (disk_size < 8*1024*1024) {
+    if (disk_size < 9*1024*1024) {
         fprintf(stderr, "Invalid argument: size '%s' is too small.\n\n", argv[1]);
         usage();
     } else if (disk_size > MAX_DISK_SIZE) {