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

4 files changed, 12 insertions, 8 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
index dc19287..768a835 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
@@ -16,6 +16,7 @@
 
 package com.android.sdklib.internal.avd;
 
+import com.android.annotations.Nullable;
 import com.android.io.FileWrapper;
 import com.android.prefs.AndroidLocation;
 import com.android.prefs.AndroidLocation.AndroidLocationException;
@@ -1404,14 +1405,14 @@ public class AvdManager {
                     Wait.WAIT_FOR_READERS,
                     new IProcessOutput() {
                         @Override
-                        public void out(String line) {
+                        public void out(@Nullable String line) {
                             if (line != null) {
                                 stdOutput.add(line);
                             }
                         }
 
                         @Override
-                        public void err(String line) {
+                        public void err(@Nullable String line) {
                             if (line != null) {
                                 errorOutput.add(line);
                             }
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/KeystoreHelper.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/KeystoreHelper.java
index af5b401..ba4ce8c 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/KeystoreHelper.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/build/KeystoreHelper.java
@@ -16,6 +16,7 @@
 
 package com.android.sdklib.internal.build;
 
+import com.android.annotations.Nullable;
 import com.android.sdklib.internal.build.DebugKeyProvider.IKeyGenOutput;
 import com.android.sdklib.internal.build.DebugKeyProvider.KeytoolException;
 import com.android.sdklib.util.GrabProcessOutput;
@@ -111,7 +112,7 @@ public final class KeystoreHelper {
                     Wait.WAIT_FOR_READERS,
                     new IProcessOutput() {
                         @Override
-                        public void out(String line) {
+                        public void out(@Nullable String line) {
                             if (line != null) {
                                 if (output != null) {
                                     output.out(line);
@@ -122,7 +123,7 @@ public final class KeystoreHelper {
                         }
 
                         @Override
-                        public void err(String line) {
+                        public void err(@Nullable String line) {
                             if (line != null) {
                                 if (output != null) {
                                     output.err(line);
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java
index 3addb31..c2e11cd 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/archives/ArchiveInstaller.java
@@ -16,6 +16,7 @@
 

 package com.android.sdklib.internal.repository.archives;

 

+import com.android.annotations.Nullable;

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

 import com.android.sdklib.SdkConstants;

@@ -609,14 +610,14 @@ public class ArchiveInstaller {
                         Wait.WAIT_FOR_READERS,

                         new IProcessOutput() {

                             @Override

-                            public void out(String line) {

+                            public void out(@Nullable String line) {

                                 if (line != null) {

                                     result.append(line).append("\n");

                                 }

                             }

 

                             @Override

-                            public void err(String line) {

+                            public void err(@Nullable String line) {

                                 if (line != null) {

                                     monitor.logError("[find_lock] Error: %1$s", line);

                                 }

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ToolPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ToolPackage.java
index 8ae469e..e2052c4 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ToolPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/ToolPackage.java
@@ -16,6 +16,7 @@
 

 package com.android.sdklib.internal.repository.packages;

 

+import com.android.annotations.Nullable;

 import com.android.annotations.VisibleForTesting;

 import com.android.annotations.VisibleForTesting.Visibility;

 import com.android.sdklib.SdkConstants;

@@ -315,14 +316,14 @@ public class ToolPackage extends FullRevisionPackage implements IMinPlatformTool
                     Wait.WAIT_FOR_PROCESS,

                     new IProcessOutput() {

                         @Override

-                        public void out(String line) {

+                        public void out(@Nullable String line) {

                             if (line != null) {

                                 monitor.log("[%1$s] %2$s", tag, line);

                             }

                         }

 

                         @Override

-                        public void err(String line) {

+                        public void err(@Nullable String line) {

                             if (line != null) {

                                 monitor.logError("[%1$s] Error: %2$s", tag, line);

                             }