LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 26490 into eclair

Browse Source 
* changes:
  Fix possible NPE in DDMS plugin init.
This commit is contained in:
Android (Google) Code Review
2009-09-23 13:33:35 -04:00
parent d582592ea5 c29e58952e
commit 68cc2b0084
1 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tools/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
View File

@@ -226,7 +226,7 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL
// read the adb location from the prefs to attempt to start it properly without // read the adb location from the prefs to attempt to start it properly without
// having to wait for ADT to start // having to wait for ADT to start
setAdbLocation(eclipseStore.getString(ADB_LOCATION)); final boolean adbValid = setAdbLocation(eclipseStore.getString(ADB_LOCATION));
// start it in a thread to return from start() asap. // start it in a thread to return from start() asap.
new Thread() { new Thread() {
@@ -236,7 +236,9 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL
getDefault().initDdmlib(); getDefault().initDdmlib();
// create and start the first bridge // create and start the first bridge
AndroidDebugBridge.createBridge(sAdbLocation, true /* forceNewBridge */); if (adbValid) {
AndroidDebugBridge.createBridge(sAdbLocation, true /* forceNewBridge */);
}
} }
}.start(); }.start();
} }
@@ -295,18 +297,27 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL
return sHprofConverter; return sHprofConverter;
} }
private static void setAdbLocation(String adbLocation) { /**
sAdbLocation = adbLocation; * Stores the adb location. This returns true if the location is an existing file.
*/
private static boolean setAdbLocation(String adbLocation) {
File adb = new File(adbLocation);
if (adb.isFile()) {
sAdbLocation = adbLocation;
File adb = new File(sAdbLocation); File toolsFolder = adb.getParentFile();
File toolsFolder = adb.getParentFile(); sToolsFolder = toolsFolder.getAbsolutePath();
sToolsFolder = toolsFolder.getAbsolutePath();
File hprofConverter = new File(toolsFolder, DdmConstants.FN_HPROF_CONVERTER); File hprofConverter = new File(toolsFolder, DdmConstants.FN_HPROF_CONVERTER);
sHprofConverter = hprofConverter.getAbsolutePath(); sHprofConverter = hprofConverter.getAbsolutePath();
File traceview = new File(toolsFolder, DdmConstants.FN_TRACEVIEW); File traceview = new File(toolsFolder, DdmConstants.FN_TRACEVIEW);
DdmUiPreferences.setTraceviewLocation(traceview.getAbsolutePath()); DdmUiPreferences.setTraceviewLocation(traceview.getAbsolutePath());
return true;
}
return false;
} }
/** /**
@@ -315,23 +326,26 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL
* @param startAdb flag to start adb * @param startAdb flag to start adb
*/ */
public static void setAdb(String adb, boolean startAdb) { public static void setAdb(String adb, boolean startAdb) {
setAdbLocation(adb); if (adb != null) {
if (setAdbLocation(adb)) {
// store the location for future ddms only start.
sPlugin.getPreferenceStore().setValue(ADB_LOCATION, sAdbLocation);
// store the location for future ddms only start. // starts the server in a thread in case this is blocking.
sPlugin.getPreferenceStore().setValue(ADB_LOCATION, sAdbLocation); if (startAdb) {
new Thread() {
@Override
public void run() {
// init ddmlib if needed
getDefault().initDdmlib();
// starts the server in a thread in case this is blocking. // create and start the bridge
if (startAdb) { AndroidDebugBridge.createBridge(sAdbLocation,
new Thread() { false /* forceNewBridge */);
@Override }
public void run() { }.start();
// init ddmlib if needed
getDefault().initDdmlib();
// create and start the bridge
AndroidDebugBridge.createBridge(sAdbLocation, false /* forceNewBridge */);
} }
}.start(); }
} }
} }