[automerger skipped] Merge "DO NOT MERGE: Drop prebuilt files to android source tree." into udc-qpr-dev am: 2f420ef505 am: 9c2c822db4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Media/+/25490595
Change-Id: I4fd7e64b68deb0685a236ccd025e58e434718dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 75becae..608938e 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
drops {
android_build_drop {
- build_id: "T1008598"
- target: "train_build"
- source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.media/sdk/media-module-sdk-current.zip"
+ build_id: "10917791"
+ target: "mainline_modules_sdks-trunk-userdebug"
+ source_file: "mainline-sdks/for-latest-build/current/com.google.android.media/sdk/media-module-sdk-current.zip"
}
dest_file: "current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Media"
- git_branch: "udc-qpr-dev"
+ git_branch: "main"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 686d1b3..8f6a513 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,14 +1,14 @@
drops {
android_build_drop {
- build_id: "T1008598"
- target: "train_build"
- source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.media/sdk/media-module-sdk-current.zip"
+ build_id: "10917791"
+ target: "mainline_go_modules_sdks-trunk-userdebug"
+ source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.media/sdk/media-module-sdk-current.zip"
}
dest_file: "go/current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Media"
- git_branch: "udc-qpr-dev"
+ git_branch: "main"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index b47961a..4c5d4c2 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -65,8 +65,8 @@
Landroid/media/MediaCommunicationManager;->getSession2Tokens()Ljava/util/List;,public-api,sdk,system-api,test-api
Landroid/media/MediaCommunicationManager;->getVersion()I,public-api,sdk,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda1;->binderDied()V,public-api,sdk,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda2;->binderDied()V,public-api,sdk,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/MediaController2$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -233,8 +233,8 @@
Landroid/media/MediaSession2Service;->onUpdateNotification(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;,public-api,sdk,system-api,test-api
Landroid/media/MediaSession2Service;->removeSession(Landroid/media/MediaSession2;)V,public-api,sdk,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->binderDied()V,public-api,sdk,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->binderDied()V,public-api,sdk,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/MediaTranscodingManager$OnTranscodingFinishedListener;->onTranscodingFinished(Landroid/media/MediaTranscodingManager$TranscodingSession;)V,sdk,system-api,test-api
@@ -724,6 +724,7 @@
Landroid/media/internal/guava_common/collect/ImmutableCollection;->clear()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableCollection;->contains(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableCollection;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableCollection;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableCollection;->remove(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableCollection;->removeAll(Ljava/util/Collection;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableCollection;->retainAll(Ljava/util/Collection;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -774,6 +775,7 @@
Landroid/media/internal/guava_common/collect/ImmutableMap;->keySet()Ljava/util/Set;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMap;->putAll(Ljava/util/Map;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMap;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMap;->values()Ljava/util/Collection;,core-platform-api,public-api,sdk,system-api,test-api
@@ -782,6 +784,7 @@
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet$EntrySetSerializedForm;->serialVersionUID:J,sdk
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->contains(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->size()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->writeReplace()Ljava/lang/Object;,sdk
Landroid/media/internal/guava_common/collect/ImmutableSet$SerializedForm;->readResolve()Ljava/lang/Object;,sdk
@@ -789,6 +792,7 @@
Landroid/media/internal/guava_common/collect/ImmutableSet;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSet;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSet;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableSet;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableSet;->writeReplace()Ljava/lang/Object;,sdk
Landroid/media/internal/guava_common/collect/ImmutableSortedMap$1EntrySet$1;->get(I)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSortedMap$1EntrySet$1;->size()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -817,6 +821,7 @@
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->navigableKeySet()Ljava/util/NavigableSet;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->pollFirstEntry()Ljava/util/Map$Entry;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->pollLastEntry()Ljava/util/Map$Entry;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->serialVersionUID:J,sdk
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->size()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->subMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedMap;,core-platform-api,public-api,sdk,system-api,test-api
@@ -917,6 +922,7 @@
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->putAll(Ljava/util/Map;)V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->remove(Ljava/lang/Object;Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->replace(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 683a1d9..84d733b 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -65,8 +65,8 @@
Landroid/media/MediaCommunicationManager;->getSession2Tokens()Ljava/util/List;,public-api,system-api,test-api
Landroid/media/MediaCommunicationManager;->getVersion()I,public-api,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda1;->binderDied()V,public-api,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda2;->binderDied()V,public-api,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/media/MediaController2$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -232,8 +232,8 @@
Landroid/media/MediaSession2Service;->onUpdateNotification(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;,public-api,system-api,test-api
Landroid/media/MediaSession2Service;->removeSession(Landroid/media/MediaSession2;)V,public-api,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->binderDied()V,public-api,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->binderDied()V,public-api,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/media/MediaTranscodingManager$OnTranscodingFinishedListener;->onTranscodingFinished(Landroid/media/MediaTranscodingManager$TranscodingSession;)V,system-api,test-api
diff --git a/current/sdk_library/public/framework-media.srcjar b/current/sdk_library/public/framework-media.srcjar
index 5224bce..2bc0d64 100644
--- a/current/sdk_library/public/framework-media.srcjar
+++ b/current/sdk_library/public/framework-media.srcjar
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index f665110..fffc196 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10617982
\ No newline at end of file
+10917791
\ No newline at end of file
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index b47961a..4c5d4c2 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -65,8 +65,8 @@
Landroid/media/MediaCommunicationManager;->getSession2Tokens()Ljava/util/List;,public-api,sdk,system-api,test-api
Landroid/media/MediaCommunicationManager;->getVersion()I,public-api,sdk,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda1;->binderDied()V,public-api,sdk,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda2;->binderDied()V,public-api,sdk,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/MediaController2$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -233,8 +233,8 @@
Landroid/media/MediaSession2Service;->onUpdateNotification(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;,public-api,sdk,system-api,test-api
Landroid/media/MediaSession2Service;->removeSession(Landroid/media/MediaSession2;)V,public-api,sdk,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->binderDied()V,public-api,sdk,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->binderDied()V,public-api,sdk,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/MediaTranscodingManager$OnTranscodingFinishedListener;->onTranscodingFinished(Landroid/media/MediaTranscodingManager$TranscodingSession;)V,sdk,system-api,test-api
@@ -724,6 +724,7 @@
Landroid/media/internal/guava_common/collect/ImmutableCollection;->clear()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableCollection;->contains(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableCollection;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableCollection;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableCollection;->remove(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableCollection;->removeAll(Ljava/util/Collection;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableCollection;->retainAll(Ljava/util/Collection;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -774,6 +775,7 @@
Landroid/media/internal/guava_common/collect/ImmutableMap;->keySet()Ljava/util/Set;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMap;->putAll(Ljava/util/Map;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMap;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMap;->values()Ljava/util/Collection;,core-platform-api,public-api,sdk,system-api,test-api
@@ -782,6 +784,7 @@
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet$EntrySetSerializedForm;->serialVersionUID:J,sdk
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->contains(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->size()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->writeReplace()Ljava/lang/Object;,sdk
Landroid/media/internal/guava_common/collect/ImmutableSet$SerializedForm;->readResolve()Ljava/lang/Object;,sdk
@@ -789,6 +792,7 @@
Landroid/media/internal/guava_common/collect/ImmutableSet;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSet;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSet;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableSet;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableSet;->writeReplace()Ljava/lang/Object;,sdk
Landroid/media/internal/guava_common/collect/ImmutableSortedMap$1EntrySet$1;->get(I)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSortedMap$1EntrySet$1;->size()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -817,6 +821,7 @@
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->navigableKeySet()Ljava/util/NavigableSet;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->pollFirstEntry()Ljava/util/Map$Entry;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->pollLastEntry()Ljava/util/Map$Entry;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->serialVersionUID:J,sdk
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->size()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->subMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedMap;,core-platform-api,public-api,sdk,system-api,test-api
@@ -917,6 +922,7 @@
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->putAll(Ljava/util/Map;)V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->remove(Ljava/lang/Object;Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->replace(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
index 683a1d9..84d733b 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -65,8 +65,8 @@
Landroid/media/MediaCommunicationManager;->getSession2Tokens()Ljava/util/List;,public-api,system-api,test-api
Landroid/media/MediaCommunicationManager;->getVersion()I,public-api,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda1;->binderDied()V,public-api,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda2;->binderDied()V,public-api,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/media/MediaController2$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/media/MediaController2$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -232,8 +232,8 @@
Landroid/media/MediaSession2Service;->onUpdateNotification(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;,public-api,system-api,test-api
Landroid/media/MediaSession2Service;->removeSession(Landroid/media/MediaSession2;)V,public-api,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->binderDied()V,public-api,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->binderDied()V,public-api,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/media/MediaTranscodingManager$OnTranscodingFinishedListener;->onTranscodingFinished(Landroid/media/MediaTranscodingManager$TranscodingSession;)V,system-api,test-api
diff --git a/go/current/sdk_library/public/framework-media.srcjar b/go/current/sdk_library/public/framework-media.srcjar
index 5224bce..2bc0d64 100644
--- a/go/current/sdk_library/public/framework-media.srcjar
+++ b/go/current/sdk_library/public/framework-media.srcjar
Binary files differ
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index f665110..fffc196 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10617982
\ No newline at end of file
+10917791
\ No newline at end of file
