diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-03-20 22:16:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:16:50 +0000 |
| commit | 9e156dbaf63f0c01d5ffd3f7c503976b1c7ca3a5 (patch) | |
| tree | 4931668379bab741a78bc86c5a3601ccae56e812 | |
| parent | 654f070478a652eebbf6560f593e8e7c97388e80 (diff) | |
| parent | 61b5fbb9f660cfec957cb6d2b17b71370c694db0 (diff) | |
| download | sdk-9e156dbaf63f0c01d5ffd3f7c503976b1c7ca3a5.zip sdk-9e156dbaf63f0c01d5ffd3f7c503976b1c7ca3a5.tar.gz sdk-9e156dbaf63f0c01d5ffd3f7c503976b1c7ca3a5.tar.bz2 | |
am 61b5fbb9: am ad755794: Merge "73313: NullPointerException Lint error on adt 23.0.2" into idea133 automerge: 5366132
* commit '61b5fbb9f660cfec957cb6d2b17b71370c694db0':
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; |