From d60596cfca2926f851881be871117c7772e7096c Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 10 Oct 2023 03:00:17 -0700
Subject: [PATCH] Use package-level `@OptIn` for demo apps

This demonstrates that `@OptIn` can now be used at the package-level
(since [`androidx.annotation:annotation-experimental:1.3.0`](https://developer.android.com/jetpack/androidx/releases/annotation#annotation-experimental-1.3.0)).

PiperOrigin-RevId: 572187729
---
 .../main/java/androidx/media3/demo/cast/package-info.java | 3 +++
 .../main/java/androidx/media3/demo/gl/package-info.java   | 3 +++
 .../java/androidx/media3/demo/surface/package-info.java   | 3 +++
 .../androidx/media3/demo/transformer/package-info.java    | 3 +++
 lint.xml                                                  | 8 --------
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/demos/cast/src/main/java/androidx/media3/demo/cast/package-info.java b/demos/cast/src/main/java/androidx/media3/demo/cast/package-info.java
index abd0359226..b2977f6849 100644
--- a/demos/cast/src/main/java/androidx/media3/demo/cast/package-info.java
+++ b/demos/cast/src/main/java/androidx/media3/demo/cast/package-info.java
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 @NonNullApi
+@OptIn(markerClass = UnstableApi.class)
 package androidx.media3.demo.cast;
 
+import androidx.annotation.OptIn;
 import androidx.media3.common.util.NonNullApi;
+import androidx.media3.common.util.UnstableApi;
diff --git a/demos/gl/src/main/java/androidx/media3/demo/gl/package-info.java b/demos/gl/src/main/java/androidx/media3/demo/gl/package-info.java
index 5a97794da8..d44a6522f1 100644
--- a/demos/gl/src/main/java/androidx/media3/demo/gl/package-info.java
+++ b/demos/gl/src/main/java/androidx/media3/demo/gl/package-info.java
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 @NonNullApi
+@OptIn(markerClass = UnstableApi.class)
 package androidx.media3.demo.gl;
 
+import androidx.annotation.OptIn;
 import androidx.media3.common.util.NonNullApi;
+import androidx.media3.common.util.UnstableApi;
diff --git a/demos/surface/src/main/java/androidx/media3/demo/surface/package-info.java b/demos/surface/src/main/java/androidx/media3/demo/surface/package-info.java
index c9510697b6..9697333ed7 100644
--- a/demos/surface/src/main/java/androidx/media3/demo/surface/package-info.java
+++ b/demos/surface/src/main/java/androidx/media3/demo/surface/package-info.java
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 @NonNullApi
+@OptIn(markerClass = UnstableApi.class)
 package androidx.media3.demo.surface;
 
+import androidx.annotation.OptIn;
 import androidx.media3.common.util.NonNullApi;
+import androidx.media3.common.util.UnstableApi;
diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/package-info.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/package-info.java
index 8a243704e2..deba694edb 100644
--- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/package-info.java
+++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/package-info.java
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 @NonNullApi
+@OptIn(markerClass = UnstableApi.class)
 package androidx.media3.demo.transformer;
 
+import androidx.annotation.OptIn;
 import androidx.media3.common.util.NonNullApi;
+import androidx.media3.common.util.UnstableApi;
diff --git a/lint.xml b/lint.xml
index 96c8015093..63165e08e5 100644
--- a/lint.xml
+++ b/lint.xml
@@ -17,14 +17,6 @@
   <issue id="UnsafeOptInUsageError">
     <ignore path='libraries/'
       regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
-    <ignore path='demos/cast/'
-      regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
-    <ignore path='demos/gl/'
-      regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
-    <ignore path='demos/surface/'
-      regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
-    <ignore path='demos/transformer/'
-      regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
     <ignore path='testapps/'
       regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
   </issue>