aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-07-15 01:07:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-07-15 00:03:29 +0000
commit536613233c5007d1743eb1d0cee3795de0099518 (patch)
tree046cf8f40bdd2fbe3dd0ad40900520053592174d
parent4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc (diff)
parent4bb46a7fc06226b75eb242ee3c300487f6f42f82 (diff)
downloadsdk-536613233c5007d1743eb1d0cee3795de0099518.zip
sdk-536613233c5007d1743eb1d0cee3795de0099518.tar.gz
sdk-536613233c5007d1743eb1d0cee3795de0099518.tar.bz2
Merge "73313: NullPointerException Lint error on adt 23.0.2" into idea133
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java7
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;