Revert "DO NOT MERGE:Import AndroidX Media from build 8361981"
This reverts commit 47973fe2468f39506e17017fc76dec6f545f4097.
Reason for revert: Broke build
Change-Id: I8fe11e98f69f1fec27968a7f06f6795e7a5f1dde
diff --git a/current/androidx/Android.bp b/current/androidx/Android.bp
index 20c6f82..fa103f3 100644
--- a/current/androidx/Android.bp
+++ b/current/androidx/Android.bp
@@ -2889,7 +2889,7 @@
android_library_import {
name: "androidx.media_media-nodeps",
- aars: ["m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar"],
+ aars: ["m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar"],
sdk_version: "31",
apex_available: [
"//apex_available:platform",
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar
deleted file mode 100644
index 4b13660..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar
+++ /dev/null
Binary files differ
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.md5 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.md5
deleted file mode 100644
index d2bf175..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-18342543b08ce35f1e5556fdfc19cb75
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha1 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha1
deleted file mode 100644
index ac00eee..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-312df766d4f9ebf0d4ed43b73e8fc3ae89b3f8f5
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha256 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha256
deleted file mode 100644
index a4b950a..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha256
+++ /dev/null
@@ -1 +0,0 @@
-3ad883d72593b22837306f51430e1fcf5d7a5c05dba48f005cc699991a8eb6b3
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha512 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha512
deleted file mode 100644
index 383755b..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02-sources.jar.sha512
+++ /dev/null
@@ -1 +0,0 @@
-3c4e05520a46870ee0e8b2217bd828e6cbe49c3633b6deabb0d706cb54e6481786e59b27e3de49df5f2c26ce543292d003f2b7cdf3479de72ba9888b21f55f5c
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar
deleted file mode 100644
index 366c649..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar
+++ /dev/null
Binary files differ
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.md5 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.md5
deleted file mode 100644
index f9e8ceb..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.md5
+++ /dev/null
@@ -1 +0,0 @@
-4973f76f6611fe778a5cc3b1505f1590
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha1 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha1
deleted file mode 100644
index cc626e6..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bf899123271a3d23b0d1a26a6031ca6a1b6f94d7
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha256 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha256
deleted file mode 100644
index ee2a36a..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha256
+++ /dev/null
@@ -1 +0,0 @@
-63bd4b8d2dfdc42f3edc7f8595b68b37ca3a2f4e77ed6d8f217dd28411386d18
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha512 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha512
deleted file mode 100644
index 0a72f2b..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.aar.sha512
+++ /dev/null
@@ -1 +0,0 @@
-300dc9cc3ca8e53212192cfc76bc2e6f70e70e5dda21efef2652a662b9c41a14ba719ad8de8d756d4f6f0bcec644e0e2d35341384736503179340732a7a67aa7
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module
deleted file mode 100644
index 19f34ad..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module
+++ /dev/null
@@ -1,110 +0,0 @@
-{
- "formatVersion": "1.1",
- "component": {
- "group": "androidx.media",
- "module": "media",
- "version": "1.6.0-beta02",
- "attributes": {
- "org.gradle.status": "release"
- }
- },
- "createdBy": {
- "gradle": {
- "version": "7.4"
- }
- },
- "variants": [
- {
- "name": "releaseVariantReleaseApiPublication",
- "attributes": {
- "org.gradle.category": "library",
- "org.gradle.dependency.bundling": "external",
- "org.gradle.libraryelements": "aar",
- "org.gradle.usage": "java-api"
- },
- "dependencies": [
- {
- "group": "androidx.core",
- "module": "core",
- "version": {
- "requires": "1.6.0"
- }
- }
- ],
- "files": [
- {
- "name": "media-1.6.0-beta02.aar",
- "url": "media-1.6.0-beta02.aar",
- "size": 338460,
- "sha512": "300dc9cc3ca8e53212192cfc76bc2e6f70e70e5dda21efef2652a662b9c41a14ba719ad8de8d756d4f6f0bcec644e0e2d35341384736503179340732a7a67aa7",
- "sha256": "63bd4b8d2dfdc42f3edc7f8595b68b37ca3a2f4e77ed6d8f217dd28411386d18",
- "sha1": "bf899123271a3d23b0d1a26a6031ca6a1b6f94d7",
- "md5": "4973f76f6611fe778a5cc3b1505f1590"
- }
- ]
- },
- {
- "name": "releaseVariantReleaseRuntimePublication",
- "attributes": {
- "org.gradle.category": "library",
- "org.gradle.dependency.bundling": "external",
- "org.gradle.libraryelements": "aar",
- "org.gradle.usage": "java-runtime"
- },
- "dependencies": [
- {
- "group": "androidx.annotation",
- "module": "annotation",
- "version": {
- "requires": "1.2.0"
- }
- },
- {
- "group": "androidx.collection",
- "module": "collection",
- "version": {
- "requires": "1.1.0"
- }
- },
- {
- "group": "androidx.core",
- "module": "core",
- "version": {
- "requires": "1.6.0"
- }
- }
- ],
- "files": [
- {
- "name": "media-1.6.0-beta02.aar",
- "url": "media-1.6.0-beta02.aar",
- "size": 338460,
- "sha512": "300dc9cc3ca8e53212192cfc76bc2e6f70e70e5dda21efef2652a662b9c41a14ba719ad8de8d756d4f6f0bcec644e0e2d35341384736503179340732a7a67aa7",
- "sha256": "63bd4b8d2dfdc42f3edc7f8595b68b37ca3a2f4e77ed6d8f217dd28411386d18",
- "sha1": "bf899123271a3d23b0d1a26a6031ca6a1b6f94d7",
- "md5": "4973f76f6611fe778a5cc3b1505f1590"
- }
- ]
- },
- {
- "name": "sourcesElements",
- "attributes": {
- "org.gradle.category": "documentation",
- "org.gradle.dependency.bundling": "external",
- "org.gradle.docstype": "sources",
- "org.gradle.usage": "java-runtime"
- },
- "files": [
- {
- "name": "media-1.6.0-beta02-sources.jar",
- "url": "media-1.6.0-beta02-sources.jar",
- "size": 145735,
- "sha512": "3c4e05520a46870ee0e8b2217bd828e6cbe49c3633b6deabb0d706cb54e6481786e59b27e3de49df5f2c26ce543292d003f2b7cdf3479de72ba9888b21f55f5c",
- "sha256": "3ad883d72593b22837306f51430e1fcf5d7a5c05dba48f005cc699991a8eb6b3",
- "sha1": "312df766d4f9ebf0d4ed43b73e8fc3ae89b3f8f5",
- "md5": "18342543b08ce35f1e5556fdfc19cb75"
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.md5 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.md5
deleted file mode 100644
index 0b4daf6..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.md5
+++ /dev/null
@@ -1 +0,0 @@
-4245b0aa5ea6de4f44cdc9444e5c264d
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha1 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha1
deleted file mode 100644
index 41f7486..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha1
+++ /dev/null
@@ -1 +0,0 @@
-531fc96af9209e76d64e688067ef0fbb21b9aa7e
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha256 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha256
deleted file mode 100644
index 698a011..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha256
+++ /dev/null
@@ -1 +0,0 @@
-f7de7406a436c071b7486c7b6e0af28b607cefd1254a9a36ad59245618eda11d
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha512 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha512
deleted file mode 100644
index 743cdbc..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.module.sha512
+++ /dev/null
@@ -1 +0,0 @@
-4d37c759c5a0785c3d2b5ca70df91fdd1f0af3db8b3366e34ad8ee0bbd85bdc21e324fdfbbe71e7e47d3b6ad9d48a61dab4b1741edfb09519a6fa642ace8cc4e
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom
deleted file mode 100644
index b560f7b..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <!-- This module was also published with a richer model, Gradle metadata, -->
- <!-- which should be used instead. Do not delete the following line which -->
- <!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
- <!-- that they should prefer consuming it instead. -->
- <!-- do_not_remove: published-with-gradle-metadata -->
- <modelVersion>4.0.0</modelVersion>
- <groupId>androidx.media</groupId>
- <artifactId>media</artifactId>
- <version>1.6.0-beta02</version>
- <packaging>aar</packaging>
- <name>Android Support Library media compat</name>
- <description>The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.</description>
- <url>https://developer.android.com/jetpack/androidx/releases/media#1.6.0-beta02</url>
- <inceptionYear>2011</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <name>The Android Open Source Project</name>
- </developer>
- </developers>
- <scm>
- <connection>scm:git:https://android.googlesource.com/platform/frameworks/support</connection>
- <url>https://cs.android.com/androidx/platform/frameworks/support</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>androidx.annotation</groupId>
- <artifactId>annotation</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>androidx.collection</groupId>
- <artifactId>collection</artifactId>
- <version>1.1.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>androidx.core</groupId>
- <artifactId>core</artifactId>
- <version>1.6.0</version>
- <scope>compile</scope>
- <type>aar</type>
- </dependency>
- </dependencies>
-</project>
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.md5 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.md5
deleted file mode 100644
index b560d21..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-b0b819edb61262eba7cf7f67d9034c34
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha1 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha1
deleted file mode 100644
index 56cce22..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0c21359769c4ede2a1e0d876d0ae4e0c87a8844e
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha256 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha256
deleted file mode 100644
index 12fc07d..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha256
+++ /dev/null
@@ -1 +0,0 @@
-121d86c4f5ad5e6b2002301d08d2cff49d6f5624791bcb4e4ca39141feb4fee9
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha512 b/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha512
deleted file mode 100644
index a409f50..0000000
--- a/current/androidx/m2repository/androidx/media/media/1.6.0-beta02/media-1.6.0-beta02.pom.sha512
+++ /dev/null
@@ -1 +0,0 @@
-59d1569adc0567a7f1cd64b7cfb7e0b37863aca5d1dce69f013dff09cff7aec74cd5da394f21e47090edb6cd3f1b6a063cd5cc628f285fefe7d549eaebe01787
\ No newline at end of file
diff --git a/current/androidx/manifests/androidx.media_media/AndroidManifest.xml b/current/androidx/manifests/androidx.media_media/AndroidManifest.xml
index 8ed30a6..96c692b 100644
--- a/current/androidx/manifests/androidx.media_media/AndroidManifest.xml
+++ b/current/androidx/manifests/androidx.media_media/AndroidManifest.xml
@@ -21,4 +21,10 @@
android:minSdkVersion="14"
android:targetSdkVersion="31" />
+ <queries>
+ <intent>
+ <action android:name="android.media.browse.MediaBrowserService" />
+ </intent>
+ </queries>
+
</manifest>
\ No newline at end of file