eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-02 21:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to start with a clean adb environment, and to leave it clean at exit.

Browse Source
This commit is contained in:
jdf
2010-02-28 01:43:08 +00:00
parent ec2c792dc6
commit 3697fee5e9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/tool/src/processing/app/tools/android/AndroidEnvironment.java
View File

@@ -27,7 +27,7 @@ import java.util.concurrent.FutureTask;
* @author Jonathan Feinberg <jdf@pobox.com>
*
*/
public class AndroidEnvironment implements AndroidEnvironmentProperties {
class AndroidEnvironment implements AndroidEnvironmentProperties {
private static final AndroidEnvironment INSTANCE = new AndroidEnvironment();
public static AndroidEnvironment getInstance() {
@@ -39,17 +39,18 @@ public class AndroidEnvironment implements AndroidEnvironmentProperties {
.newSingleThreadExecutor();
public static void killAdbServer() {
System.err.println("Killing server");
System.err.println("Attempting to shut down existing adb server...");
try {
new ProcessHelper("adb", "kill-server").execute();
System.err.println("Dead");
System.err.println("...it's dead, or at least not at all well.");
} catch (final Exception e) {
e.printStackTrace(System.err);
}
}
private AndroidEnvironment() {
System.err.println("Startup AndroidEnvironment");
System.err.println("Starting up AndroidEnvironment");
killAdbServer();
try {
new ProcessHelper("adb", "start-server").execute();
} catch (final Exception e) {
@@ -64,12 +65,13 @@ public class AndroidEnvironment implements AndroidEnvironmentProperties {
});
}
protected void shutdown() {
private void shutdown() {
System.err.println("Shutting down AndroidEnvironment");
for (final AndroidDevice device : new ArrayList<AndroidDevice>(devices
.values())) {
device.shutdown();
}
killAdbServer();
}
public Future<AndroidDevice> getEmulator() {
@@ -188,7 +190,7 @@ public class AndroidEnvironment implements AndroidEnvironmentProperties {
}
}
static final String ADB_DEVICES_ERROR = "Received unfamiliar output from “adb devices”.\n"
private static final String ADB_DEVICES_ERROR = "Received unfamiliar output from “adb devices”.\n"
+ "The device list may have errors.";
/**