diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-21 16:23:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-07-21 16:23:12 +0000 |
| commit | ad755794a937bc91031371759c852648bd5dc9ae (patch) | |
| tree | 6411e355871f29c1fb6adb2e31cb34d6f6825b9f | |
| parent | c245592b0d472437ade15a22076c2193441f0eea (diff) | |
| parent | 536613233c5007d1743eb1d0cee3795de0099518 (diff) | |
| download | sdk-ad755794a937bc91031371759c852648bd5dc9ae.zip sdk-ad755794a937bc91031371759c852648bd5dc9ae.tar.gz sdk-ad755794a937bc91031371759c852648bd5dc9ae.tar.bz2 | |
Merge "73313: NullPointerException Lint error on adt 23.0.2" into idea133
automerge: 5366132
* commit '536613233c5007d1743eb1d0cee3795de0099518':
73313: NullPointerException Lint error on adt 23.0.2
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java index fd8125e..54222e3 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java @@ -913,7 +913,12 @@ public class EclipseLintClient extends LintClient { @Override @NonNull public IAndroidTarget[] getTargets() { - return Sdk.getCurrent().getTargets(); + Sdk sdk = Sdk.getCurrent(); + if (sdk != null) { + return sdk.getTargets(); + } else { + return new IAndroidTarget[0]; + } } private boolean mSearchForSuperClasses; |