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

am 48d160dd: Merge change 3228 into donut

Browse Source 
Merge commit '48d160dd89a009bfbc30ba3751850a8c4dd96cf6'

* commit '48d160dd89a009bfbc30ba3751850a8c4dd96cf6':
  ADT: make sure to log exceptions that might happen when
This commit is contained in:
Android (Google) Code Review
2009-06-05 00:29:57 -07:00
committed by The Android Open Source Project
parent 9aa9fcf0c1 48d160dd89
commit 00df6beced
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
View File

@@ -987,9 +987,9 @@ public class AdtPlugin extends AbstractUIPlugin {
return Status.OK_STATUS; return Status.OK_STATUS;
} catch (Throwable t) { } catch (Throwable t) {
log(t, "pingUsageServer failed"); //$NON-NLS-1$ log(t, "pingUsageServer failed"); //$NON-NLS-1$
return new Status(IStatus.ERROR, PLUGIN_ID, return new Status(IStatus.ERROR, PLUGIN_ID,
"pingUsageServer failed", t); "pingUsageServer failed", t); //$NON-NLS-1$
} }
} }
}; };
@@ -1096,6 +1096,11 @@ public class AdtPlugin extends AbstractUIPlugin {
} }
} }
}); });
} catch (Throwable t) {
log(t, "Unknown exception in parseSdkContent."); //$NON-NLS-1$
return new Status(IStatus.ERROR, PLUGIN_ID,
"parseSdkContent failed", t); //$NON-NLS-1$
} finally { } finally {
mSdkIsLoading = false; mSdkIsLoading = false;
if (monitor != null) { if (monitor != null) {