Fix nullness annotations

Eclipse 4.2 includes analysis support for @Nullable and @NonNull
annotations.  However, it requires these annotations to be *repeated*
on every single method implementing or overriding a superclass or
interface method (!).

This changeset basically applies the quickfixes to inline these
annotations.  It also changes the retention of our nullness
annotations from source to class, since without this Eclipse believes
that a @NonNull annotation downstream is a redefinition of a @Nullable
annotation.

Finally, the null analysis revealed a dozen or so places where the
nullness annotation was either wrong, or some null checking on
parameters or return values needed to be done.

Change-Id: I43b4e56e2d025a8a4c92a8873f55c13cdbc4c1cb

1 files changed, 3 insertions, 2 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
index daacf10..5d24a07 100644
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
@@ -16,6 +16,7 @@
 
 package com.android.sdkuilib.internal.widgets;
 
+import com.android.annotations.Nullable;
 import com.android.prefs.AndroidLocation.AndroidLocationException;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.ISdkLog;
@@ -1112,14 +1113,14 @@ public final class AvdSelector {
                                 Wait.ASYNC,
                                 new IProcessOutput() {
                                     @Override
-                                    public void out(String line) {
+                                    public void out(@Nullable String line) {
                                         if (line != null) {
                                             filterStdOut(line);
                                         }
                                     }
 
                                     @Override
-                                    public void err(String line) {
+                                    public void err(@Nullable String line) {
                                         if (line != null) {
                                             filterStdErr(line);
                                         }