commit 6b0c759c3c90a9849ffa69dcddcbae4c971b60bf
author The Android Automerger <android-build@android.com> Thu Mar 15 08:56:32 2012 -0700
committer The Android Automerger <android-build@android.com> Thu Mar 15 08:56:32 2012 -0700
tree c220fdab87bbfdbec73d836138cf39626f871e58
parent a89252fb1e98161e9c5d4c1506eddda7dc93e6f8
parent f91458ab702894c7aeefaf1a67feb60f2a40eac3

merge in jb-release history after reset to master

android/avd/info.c

diff --git a/android/avd/info.c b/android/avd/info.c
index 7fd8cc4..f850f5b 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -1207,3 +1207,12 @@
 {
     return path_getAdbdCommunicationMode(i->androidOut);
 }
+
+int avdInfo_getSnapshotPresent(AvdInfo* i)
+{
+    if (i->configIni == NULL) {
+        return 0;
+    } else {
+        return iniFile_getBoolean(i->configIni, "snapshot.present", "no");
+    }
+}

android/avd/info.h

diff --git a/android/avd/info.h b/android/avd/info.h
index 74a9b01..11f4897 100644
--- a/android/avd/info.h
+++ b/android/avd/info.h
@@ -252,6 +252,15 @@
  */
 int          avdInfo_getAdbdCommunicationMode( AvdInfo* i );
 
+/* Returns config.ini snapshot presense status.
+ * This routine checks if snapshots are enabled in AVD config.ini file.
+ * Return:
+ *  1 - Snapshots are enabled in AVD config.ini file.
+ *  0 - Snapshots are disabled in AVD config.ini file, of config.ini file is not
+ *      found.
+*/
+int          avdInfo_getSnapshotPresent(AvdInfo* i);
+
 /* */
 
 #endif /* ANDROID_AVD_INFO_H */

android/main.c

diff --git a/android/main.c b/android/main.c
index d3e7e8f..bd5a2fc 100644
--- a/android/main.c
+++ b/android/main.c
@@ -853,7 +853,7 @@
     }
     else
     {
-        if (!opts->snapstorage) {
+        if (!opts->snapstorage && avdInfo_getSnapshotPresent(avd)) {
             opts->snapstorage = avdInfo_getSnapStoragePath(avd);
             if (opts->snapstorage != NULL) {
                 D("autoconfig: -snapstorage %s", opts->snapstorage);