Merge "Add nullness annotations on overridden methods"

4 files changed, 10 insertions, 6 deletions

diff --git a/anttasks/src/com/android/ant/ManifestMergerTask.java b/anttasks/src/com/android/ant/ManifestMergerTask.java
index 00939dc..7339a08 100644
--- a/anttasks/src/com/android/ant/ManifestMergerTask.java
+++ b/anttasks/src/com/android/ant/ManifestMergerTask.java
@@ -16,6 +16,7 @@
 
 package com.android.ant;
 
+import com.android.annotations.NonNull;
 import com.android.manifmerger.ICallback;
 import com.android.manifmerger.ManifestMerger;
 import com.android.manifmerger.MergerLog;
@@ -132,7 +133,7 @@ public class ManifestMergerTask extends SingleDependencyTask {
                     new ICallback() {
                         SdkManager mManager;
                         @Override
-                        public int queryCodenameApiLevel(String codename) {
+                        public int queryCodenameApiLevel(@NonNull String codename) {
                             if (mManager == null) {
                                 File sdkDir = TaskHelper.getSdkLocation(getProject());
                                 mManager = SdkManager.createManager(sdkDir.getPath(),
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtManifestMergeCallback.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtManifestMergeCallback.java
index 265552b..df0c873 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtManifestMergeCallback.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtManifestMergeCallback.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.adt.internal.sdk;
 
+import com.android.annotations.NonNull;
 import com.android.manifmerger.ICallback;
 import com.android.manifmerger.ManifestMerger;
 import com.android.sdklib.IAndroidTarget;
@@ -26,7 +27,7 @@ import com.android.sdklib.IAndroidTarget;
  */
 public class AdtManifestMergeCallback implements ICallback {
     @Override
-    public int queryCodenameApiLevel(String codename) {
+    public int queryCodenameApiLevel(@NonNull String codename) {
         Sdk sdk = Sdk.getCurrent();
         if (sdk != null) {
             IAndroidTarget t = sdk.getTargetFromHashString(
diff --git a/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java b/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java
index 8e854f9..8fca091 100755
--- a/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java
+++ b/manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java
@@ -379,7 +379,7 @@ abstract class ManifestMergerTestCase extends TestCase {
         IMergerLog mergerLog = MergerLog.wrapSdkLog(log);
         ManifestMerger merger = new ManifestMerger(mergerLog, new ICallback() {
             @Override
-            public int queryCodenameApiLevel(String codename) {
+            public int queryCodenameApiLevel(@NonNull String codename) {
                 if ("ApiCodename1".equals(codename)) {
                     return 1;
                 } else if ("ApiCodename10".equals(codename)) {
diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockDownloadCache.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockDownloadCache.java
index 4adb9e2..04f2b04 100755
--- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockDownloadCache.java
+++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockDownloadCache.java
@@ -16,6 +16,8 @@
 
 package com.android.sdkuilib.internal.repository;
 
+import com.android.annotations.NonNull;
+import com.android.annotations.Nullable;
 import com.android.sdklib.internal.repository.CanceledByUserException;
 import com.android.sdklib.internal.repository.DownloadCache;
 import com.android.sdklib.internal.repository.ITaskMonitor;
@@ -156,9 +158,9 @@ public class MockDownloadCache extends DownloadCache {
      */
     @Override
     public Pair<InputStream, HttpResponse> openDirectUrl(
-            String urlString,
-            Header[] headers,
-            ITaskMonitor monitor) throws IOException, CanceledByUserException {
+            @NonNull String urlString,
+            @Nullable Header[] headers,
+            @NonNull ITaskMonitor monitor) throws IOException, CanceledByUserException {
 
         synchronized (mDirectHits) {
             Integer count = mDirectHits.get(urlString);