commit 38c4d6c26158dbbab39636e626b07c178ad765e6
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Thu Apr 07 00:17:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 07 00:17:32 2022 +0000
tree 825f49297082c523f9e16a17f9ec399b7e35eee5
parent 4f7627cd19c6b8616f61e5faf0f2b881baa8816c
parent 1193b11357c3294c191b34c3aaf5013856980ffd

[automerger skipped] Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation. am: 6a3817573b -s ours am: 156794b105 -s ours am: f95792e18c -s ours am: 1193b11357 -s ours

am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 b297bcbf2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17615049

Change-Id: Ifc31f69df19dcc12a5dfef24679b6d106e09cb01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 0c67186..b5ebb72 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,7 +94,7 @@
 
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth.updatable",
+        "com.android.bluetooth",
         "com.android.media.swcodec",
     ],
     min_sdk_version: "29",

METADATA

diff --git a/METADATA b/METADATA
index 5c12860..4dab5e4 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+#     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
+  license_note: "Software License for The Fraunhofer FDK AAC Codec Library for Android"
   license_type: BY_EXCEPTION_ONLY
 }