Snap for 7550844 from cd8503b97a53f0fd2ec372e73ceff5e8f5b9312c to mainline-conscrypt-releaseandroid-mainline-12.0.0_r8android-mainline-12.0.0_r25android12-mainline-conscrypt-release

Change-Id: I68be0007b34b3d4c794408db8a837caf453bce4b

18 files changed, 58 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 9ecbda75..c15aeed0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,9 +15,25 @@
 //
 
 // Exposes ExoPlayer classes required for implementing the MediaParser API.
-android_library {
+package {
+    default_applicable_licenses: ["external_exoplayer_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_exoplayer_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
+java_library {
     name: "exoplayer2-extractor",
-    manifest: "tree/library/extractor/src/main/AndroidManifest.xml",
     srcs: [
         "tree/library/extractor/src/main/java/**/*.java",
         "tree/library/common/src/main/java/**/*.java",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ec2d2e2e..70c90878 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,6 +2,9 @@
   "presubmit": [
     {
       "name": "CtsMediaParserTestCases"
+    },
+    {
+      "name": "CtsMediaParserHostSideTestCases"
     }
   ]
 }
diff --git a/annotation-stubs/annotation_template.java b/annotation-stubs/annotation_template.java
index 6e686340..1c721809 100644
--- a/annotation-stubs/annotation_template.java
+++ b/annotation-stubs/annotation_template.java
@@ -45,7 +45,7 @@ public @interface __CLASS__ {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/kotlin/annotations/jvm/UnderMigration.java b/annotation-stubs/src/kotlin/annotations/jvm/UnderMigration.java
index dca90144..13f95543 100644
--- a/annotation-stubs/src/kotlin/annotations/jvm/UnderMigration.java
+++ b/annotation-stubs/src/kotlin/annotations/jvm/UnderMigration.java
@@ -45,7 +45,7 @@ public @interface UnderMigration {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/org/checkerframework/checker/initialization/qual/UnknownInitialization.java b/annotation-stubs/src/org/checkerframework/checker/initialization/qual/UnknownInitialization.java
index 93bcc3d5..8dbcf561 100644
--- a/annotation-stubs/src/org/checkerframework/checker/initialization/qual/UnknownInitialization.java
+++ b/annotation-stubs/src/org/checkerframework/checker/initialization/qual/UnknownInitialization.java
@@ -45,7 +45,7 @@ public @interface UnknownInitialization {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/org/checkerframework/checker/nullness/compatqual/NullableType.java b/annotation-stubs/src/org/checkerframework/checker/nullness/compatqual/NullableType.java
index 24599ca9..18d11644 100644
--- a/annotation-stubs/src/org/checkerframework/checker/nullness/compatqual/NullableType.java
+++ b/annotation-stubs/src/org/checkerframework/checker/nullness/compatqual/NullableType.java
@@ -45,7 +45,7 @@ public @interface NullableType {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/EnsuresNonNull.java b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/EnsuresNonNull.java
index 8395ca24..bcd1a1ac 100644
--- a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/EnsuresNonNull.java
+++ b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/EnsuresNonNull.java
@@ -45,7 +45,7 @@ public @interface EnsuresNonNull {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.java b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.java
index ec96e1a5..ce8853d2 100644
--- a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.java
+++ b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.java
@@ -45,7 +45,7 @@ public @interface EnsuresNonNullIf {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/MonotonicNonNull.java b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/MonotonicNonNull.java
index 42ccade1..a264987b 100644
--- a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/MonotonicNonNull.java
+++ b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/MonotonicNonNull.java
@@ -45,7 +45,7 @@ public @interface MonotonicNonNull {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/Nullable.java b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/Nullable.java
index a4266b24..77018622 100644
--- a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/Nullable.java
+++ b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/Nullable.java
@@ -45,7 +45,7 @@ public @interface Nullable {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/PolyNull.java b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/PolyNull.java
index f9f91bbc..4a49b0a4 100644
--- a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/PolyNull.java
+++ b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/PolyNull.java
@@ -45,7 +45,7 @@ public @interface PolyNull {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/RequiresNonNull.java b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/RequiresNonNull.java
index ead1192c..24f2815f 100644
--- a/annotation-stubs/src/org/checkerframework/checker/nullness/qual/RequiresNonNull.java
+++ b/annotation-stubs/src/org/checkerframework/checker/nullness/qual/RequiresNonNull.java
@@ -45,7 +45,7 @@ public @interface RequiresNonNull {
 
   boolean result() default false;
 
-  String expression() default "";
+  String[] expression() default {};
 
   MigrationStatus status() default MigrationStatus.IGNORE;
 
diff --git a/tree/extensions/ffmpeg/src/main/jni/Android.mk b/tree/extensions/ffmpeg/src/main/jni/Android.mk
index bcaf12cd..190a6bfa 100644
--- a/tree/extensions/ffmpeg/src/main/jni/Android.mk
+++ b/tree/extensions/ffmpeg/src/main/jni/Android.mk
@@ -18,21 +18,33 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libavcodec
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libswresample
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libavutil
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := ffmpeg
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_SRC_FILES := ffmpeg_jni.cc
 LOCAL_C_INCLUDES := ffmpeg
 LOCAL_SHARED_LIBRARIES := libavcodec libswresample libavutil
diff --git a/tree/extensions/flac/src/main/jni/Android.mk b/tree/extensions/flac/src/main/jni/Android.mk
index 69520a16..16df812e 100644
--- a/tree/extensions/flac/src/main/jni/Android.mk
+++ b/tree/extensions/flac/src/main/jni/Android.mk
@@ -22,6 +22,9 @@ include $(WORKING_DIR)/flac_sources.mk
 
 LOCAL_PATH := $(WORKING_DIR)
 LOCAL_MODULE := libflacJNI
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_ARM_MODE := arm
 LOCAL_CPP_EXTENSION := .cc
 
diff --git a/tree/extensions/opus/src/main/jni/Android.mk b/tree/extensions/opus/src/main/jni/Android.mk
index 0b06d9ec..051b897c 100644
--- a/tree/extensions/opus/src/main/jni/Android.mk
+++ b/tree/extensions/opus/src/main/jni/Android.mk
@@ -25,6 +25,9 @@ include libopus.mk
 include $(CLEAR_VARS)
 LOCAL_PATH := $(WORKING_DIR)
 LOCAL_MODULE := libopusV2JNI
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_ARM_MODE := arm
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := opus_jni.cc
diff --git a/tree/extensions/opus/src/main/jni/libopus.mk b/tree/extensions/opus/src/main/jni/libopus.mk
index 672df600..abf6803f 100644
--- a/tree/extensions/opus/src/main/jni/libopus.mk
+++ b/tree/extensions/opus/src/main/jni/libopus.mk
@@ -26,6 +26,9 @@ include $(LOCAL_PATH)/silk_headers.mk
 include $(LOCAL_PATH)/silk_sources.mk
 
 LOCAL_MODULE := libopus
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_ARM_MODE := arm
 LOCAL_CFLAGS := -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT \
                 -DHAVE_LRINTF
diff --git a/tree/extensions/vp9/src/main/jni/Android.mk b/tree/extensions/vp9/src/main/jni/Android.mk
index cb7571a1..f10120b5 100644
--- a/tree/extensions/vp9/src/main/jni/Android.mk
+++ b/tree/extensions/vp9/src/main/jni/Android.mk
@@ -26,6 +26,9 @@ include libvpx.mk
 include $(CLEAR_VARS)
 LOCAL_PATH := $(WORKING_DIR)
 LOCAL_MODULE := libvpxV2JNI
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_ARM_MODE := arm
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := vpx_jni.cc
diff --git a/tree/extensions/vp9/src/main/jni/libvpx.mk b/tree/extensions/vp9/src/main/jni/libvpx.mk
index 005f49fc..85556625 100644
--- a/tree/extensions/vp9/src/main/jni/libvpx.mk
+++ b/tree/extensions/vp9/src/main/jni/libvpx.mk
@@ -20,6 +20,9 @@ CONFIG_DIR := $(LOCAL_PATH)/libvpx_android_configs/$(TARGET_ARCH_ABI)
 libvpx_source_dir := $(LOCAL_PATH)/libvpx
 
 LOCAL_MODULE := libvpx
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_CFLAGS := -DHAVE_CONFIG_H=vpx_config.h
 LOCAL_ARM_MODE := arm