diff options
| -rw-r--r-- | sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java | 25 | ||||
| -rwxr-xr-x | sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/DeviceManagerPage.java | 1 |
2 files changed, 20 insertions, 6 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java index 3662c26..37b6876 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java @@ -321,15 +321,28 @@ public class DeviceManager { * {@link AndroidLocation#getFolder()}. */ public void saveUserDevices() { + if (mUserDevices == null) { + return; + } + + File userDevicesFile = null; + try { + userDevicesFile = new File(AndroidLocation.getFolder(), + SdkConstants.FN_DEVICES_XML); + } catch (AndroidLocationException e) { + mLog.warning("Couldn't find user directory: %1$s", e.getMessage()); + return; + } + + if (mUserDevices.size() == 0) { + userDevicesFile.delete(); + return; + } + synchronized (sLock) { - if (mUserDevices != null && mUserDevices.size() != 0) { - File userDevicesFile; + if (mUserDevices.size() > 0) { try { - userDevicesFile = new File(AndroidLocation.getFolder(), - SdkConstants.FN_DEVICES_XML); DeviceWriter.writeToXml(new FileOutputStream(userDevicesFile), mUserDevices); - } catch (AndroidLocationException e) { - mLog.warning("Couldn't find user directory: %1$s", e.getMessage()); } catch (FileNotFoundException e) { mLog.warning("Couldn't open file: %1$s", e.getMessage()); } catch (ParserConfigurationException e) { diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/DeviceManagerPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/DeviceManagerPage.java index e5d94fb..6bac1ba 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/DeviceManagerPage.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/DeviceManagerPage.java @@ -713,6 +713,7 @@ public class DeviceManagerPage extends Composite if (result.get()) { mDeviceManager.removeUserDevice(ci.mDevice); + mDeviceManager.saveUserDevices(); onRefresh(); } } |