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

am f5af7ce2: Make ADT use new sdklib API

Browse Source 
Merge commit 'f5af7ce21399f9a56167cadaa8196c0b15cfadce'

* commit 'f5af7ce21399f9a56167cadaa8196c0b15cfadce':
  Make ADT use new sdklib API
This commit is contained in:
Xavier Ducrohet
2009-07-02 14:25:16 -07:00
committed by The Android Open Source Project
parent 17fb58ccd4 f5af7ce213
commit 832b2c05fd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java
View File

@@ -36,6 +36,7 @@ import com.android.ide.eclipse.adt.internal.sdk.Sdk;
import com.android.ide.eclipse.adt.internal.wizards.actions.AvdManagerAction; import com.android.ide.eclipse.adt.internal.wizards.actions.AvdManagerAction;
import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.prefs.AndroidLocation.AndroidLocationException;
import com.android.sdklib.IAndroidTarget; import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.NullSdkLog;
import com.android.sdklib.SdkManager; import com.android.sdklib.SdkManager;
import com.android.sdklib.internal.avd.AvdManager; import com.android.sdklib.internal.avd.AvdManager;
import com.android.sdklib.internal.avd.AvdManager.AvdInfo; import com.android.sdklib.internal.avd.AvdManager.AvdInfo;
@@ -301,7 +302,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener
// reload the AVDs to make sure we are up to date // reload the AVDs to make sure we are up to date
try { try {
avdManager.reloadAvds(); avdManager.reloadAvds(NullSdkLog.getLogger());
} catch (AndroidLocationException e1) { } catch (AndroidLocationException e1) {
// this happens if the AVD Manager failed to find the folder in which the AVDs are // this happens if the AVD Manager failed to find the folder in which the AVDs are
// stored. This is unlikely to happen, but if it does, we should force to go manual // stored. This is unlikely to happen, but if it does, we should force to go manual

3
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java
View File

@@ -23,6 +23,7 @@ import com.android.ide.eclipse.adt.internal.sdk.Sdk;
import com.android.ide.eclipse.ddms.DdmsPlugin; import com.android.ide.eclipse.ddms.DdmsPlugin;
import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.prefs.AndroidLocation.AndroidLocationException;
import com.android.sdklib.IAndroidTarget; import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.NullSdkLog;
import com.android.sdklib.internal.avd.AvdManager; import com.android.sdklib.internal.avd.AvdManager;
import com.android.sdklib.internal.avd.AvdManager.AvdInfo; import com.android.sdklib.internal.avd.AvdManager.AvdInfo;
import com.android.sdkuilib.internal.widgets.AvdSelector; import com.android.sdkuilib.internal.widgets.AvdSelector;
@@ -133,7 +134,7 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
// reload the AVDs to make sure we are up to date // reload the AVDs to make sure we are up to date
try { try {
Sdk.getCurrent().getAvdManager().reloadAvds(); Sdk.getCurrent().getAvdManager().reloadAvds(NullSdkLog.getLogger());
} catch (AndroidLocationException e1) { } catch (AndroidLocationException e1) {
// this happens if the AVD Manager failed to find the folder in which the AVDs are // this happens if the AVD Manager failed to find the folder in which the AVDs are
// stored. There isn't much we can do at this point. // stored. There isn't much we can do at this point.