diff options
| author | Michael Wright <michaelwr@google.com> | 2012-08-07 12:03:13 -0700 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2012-08-07 14:12:00 -0700 |
| commit | 91ebf4f36f73eb9c4330c294dd98ff54df773c0c (patch) | |
| tree | 6159f624b8943035a831c4d7b5a3b38be91dadd2 | |
| parent | abf9f02ce38116f0c8a48916aa961378df0896db (diff) | |
| download | sdk-91ebf4f36f73eb9c4330c294dd98ff54df773c0c.zip sdk-91ebf4f36f73eb9c4330c294dd98ff54df773c0c.tar.gz sdk-91ebf4f36f73eb9c4330c294dd98ff54df773c0c.tar.bz2 | |
Make missing devices.xml a warning rather than an error
Since most users probably won't have custom devices, but instead use the
ones we provide, it doesn't make sense to have the absence of a custom,
user-specific devices.xml be an error instead of a warning.
Change-Id: I9754be29e88377b8c2e594f1d790310da35897fc
| -rw-r--r-- | sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java | 2 |
1 files changed, 2 insertions, 0 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 d46ca5f..9cf0378 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java @@ -203,6 +203,8 @@ public class DeviceManager { mLog.error(null, "Error parsing %1$s, backing up to %2$s", 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.getAbsolutePath()); } catch (IOException e) { |