From bd7615c0b83df8187daaf7e8d91eb1ce9bb35240 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Wed, 15 Nov 2023 02:32:12 -0800
Subject: [PATCH] Update recommended way to suppress `@UnstableApi` errors in
 `lint.xml`

#minor-release

PiperOrigin-RevId: 582599098
---
 .../main/java/androidx/media3/common/util/UnstableApi.java   | 3 +--
 lint.xml => libraries/lint.xml                               | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename lint.xml => libraries/lint.xml (75%)

diff --git a/libraries/common/src/main/java/androidx/media3/common/util/UnstableApi.java b/libraries/common/src/main/java/androidx/media3/common/util/UnstableApi.java
index c05311052d..f5793a071b 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/UnstableApi.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/UnstableApi.java
@@ -95,8 +95,7 @@ import java.lang.annotation.Target;
  * <?xml version="1.0" encoding="utf-8"?>
  * <lint>
  *   <issue id="UnsafeOptInUsageError">
- *     <ignore
- *         regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
+ *     <option name="opt-in" value="androidx.media3.common.util.UnstableApi" />
  *   </issue>
  * </lint>
  * }</pre>
diff --git a/lint.xml b/libraries/lint.xml
similarity index 75%
rename from lint.xml
rename to libraries/lint.xml
index 63165e08e5..171f44b064 100644
--- a/lint.xml
+++ b/libraries/lint.xml
@@ -15,9 +15,6 @@
 -->
 <lint>
   <issue id="UnsafeOptInUsageError">
-    <ignore path='libraries/'
-      regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
-    <ignore path='testapps/'
-      regexp='\(markerClass = androidx\.media3\.common\.util\.UnstableApi\.class\)' />
+    <option name="opt-in" value="androidx.media3.common.util.UnstableApi" />
   </issue>
 </lint>