From bbc75f34e6b43c8310fb1deff02b0508acdf9659 Mon Sep 17 00:00:00 2001
From: Tor Norbye <tnorbye@google.com>
Date: Tue, 17 Dec 2013 08:41:25 -0800
Subject: [PATCH] Hide NonNull and Nullable.

These should not be used in app code; instead, we will add
class-file retention versions of these to the support
library.

Change-Id: I13275bd28529f5da04d923688655be35c77dbb1c
---
 api/current.txt                            | 6 ------
 core/java/android/annotation/NonNull.java  | 2 ++
 core/java/android/annotation/Nullable.java | 2 ++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 5642b152b9806..dcfa4b3db680f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2676,12 +2676,6 @@ package android.animation {
 
 package android.annotation {
 
-  public abstract class NonNull implements java.lang.annotation.Annotation {
-  }
-
-  public abstract class Nullable implements java.lang.annotation.Annotation {
-  }
-
   public abstract class SuppressLint implements java.lang.annotation.Annotation {
   }
 
diff --git a/core/java/android/annotation/NonNull.java b/core/java/android/annotation/NonNull.java
index 8e604f0a5967c..3ca9eea59ff31 100644
--- a/core/java/android/annotation/NonNull.java
+++ b/core/java/android/annotation/NonNull.java
@@ -27,6 +27,8 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * Denotes that a parameter, field or method return value can never be null.
  * <p>
  * This is a marker annotation and it has no specific attributes.
+ *
+ * @hide
  */
 @Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})
diff --git a/core/java/android/annotation/Nullable.java b/core/java/android/annotation/Nullable.java
index cdba2f6287bdf..43f42fa21f7f1 100644
--- a/core/java/android/annotation/Nullable.java
+++ b/core/java/android/annotation/Nullable.java
@@ -34,6 +34,8 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
  * null.
  * <p>
  * This is a marker annotation and it has no specific attributes.
+ *
+ * @hide
  */
 @Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})