Skip to content
Permalink
Browse files

[FIXED JENKINS-10422] Don't prevent snapshots from being used manually.

Now users can use the "adb snapshot" commands, even if the emulator is
configured such that the plugin does not manage the usage of snapshots.
  • Loading branch information
orrc committed Jul 26, 2011
1 parent 1577255 commit 030e4bff9d27d2c59ee41244cf92a08eb457abb7
Showing with 5 additions and 7 deletions.
  1. +5 −7 src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java
@@ -273,16 +273,14 @@ public String getCommandArguments(SnapshotState snapshotState, boolean sdkSuppor
sb.append(getAvdName());

// Snapshots
if (snapshotState == SnapshotState.INITIALISE) {
// For the first boot, do not load from any snapshots that may exist
sb.append(" -no-snapshot-load");
sb.append(" -no-snapshot-save");
} else if (snapshotState == SnapshotState.BOOT) {
// For subsequent boots, start from the "jenkins" snapshot
if (snapshotState == SnapshotState.BOOT) {
// For builds after initial snapshot setup, start directly from the "jenkins" snapshot
sb.append(" -snapshot "+ Constants.SNAPSHOT_NAME);
sb.append(" -no-snapshot-save");
} else if (sdkSupportsSnapshots) {
sb.append(" -no-snapstorage");
// For the first boot, or snapshot-free builds, do not load any snapshots that may exist
sb.append(" -no-snapshot-load");
sb.append(" -no-snapshot-save");
}

// Options

0 comments on commit 030e4bf

Please sign in to comment.
You can’t perform that action at this time.