diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-09-17 14:42:52 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-17 14:42:53 -0700 |
| commit | 0502801c8450f5263316792ed782fb58fe684768 (patch) | |
| tree | 0dd75f1568f7ca7bd277d060249e72002928fa1a /sdkmanager | |
| parent | 0f86143e55290c4851e51b9a46ff21e198a35acc (diff) | |
| parent | fe51dba2aa25e559786e5da315d4db714ffe7559 (diff) | |
| download | sdk-0502801c8450f5263316792ed782fb58fe684768.zip sdk-0502801c8450f5263316792ed782fb58fe684768.tar.gz sdk-0502801c8450f5263316792ed782fb58fe684768.tar.bz2 | |
Merge "Support separate layout editors for a single layout resource"
Diffstat (limited to 'sdkmanager')
3 files changed, 13 insertions, 4 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Device.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Device.java index dcd82a2..cb712f0 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Device.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/Device.java @@ -287,4 +287,9 @@ public final class Device { hash = 31 * hash + mDefaultState.hashCode(); return hash; } + + @Override + public String toString() { + return mName; + } } 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 d5297d3..3662c26 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java @@ -246,8 +246,10 @@ public class DeviceManager { try { userDevicesFile = new File(AndroidLocation.getFolder(), SdkConstants.FN_DEVICES_XML); - mUserDevices.addAll(DeviceParser.parse(userDevicesFile)); - notifyListeners(); + if (userDevicesFile.exists()) { + mUserDevices.addAll(DeviceParser.parse(userDevicesFile)); + notifyListeners(); + } } catch (AndroidLocationException e) { mLog.warning("Couldn't load user devices: %1$s", e.getMessage()); } catch (SAXException e) { @@ -263,8 +265,6 @@ public class DeviceManager { userDevicesFile.getAbsolutePath(), renamedConfig.getAbsolutePath()); userDevicesFile.renameTo(renamedConfig); } - } catch (FileNotFoundException e) { - mLog.warning("No user devices found"); } catch (ParserConfigurationException e) { mLog.error(null, "Error parsing %1$s", userDevicesFile == null ? "(null)" : userDevicesFile.getAbsolutePath()); diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/State.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/State.java index 1dc6961..27e5448 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/State.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/State.java @@ -138,4 +138,8 @@ public class State { return hash; } + @Override + public String toString() { + return mName; + } } |