commit 801a252a4203c54ad7165f522f4b36dd1f14fc92
author Marco Nelissen <marcone@google.com> Fri Dec 20 19:48:00 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 20 19:48:00 2019 +0000
tree 575a607f9f3f057e657838daa9ba9c11764bc103
parent e02ad01ac791264f69eacdd36e5c52200a8c75df
parent 79673cfb78356afb4bb531d5f6fe115ab41930cc

Merge "Implement DrmSessionManager w mediaresourcemanager"

media/codec2/vndk/Android.bp

diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp
index 52cc7ad..6fbad0a 100644
--- a/media/codec2/vndk/Android.bp
+++ b/media/codec2/vndk/Android.bp
@@ -71,6 +71,8 @@
         "libutils",
     ],
 
+    tidy: false, // b/146435095, clang-tidy segmentation fault
+
     cflags: [
         "-Werror",
         "-Wall",

media/libaudioclient/AudioSystem.cpp

diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index cb9c7ba..480930b 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -1491,7 +1491,14 @@
             }
         }
     }
-    ALOGE("invalid attributes %s when converting to stream",  toString(attr).c_str());
+    switch (attr.usage) {
+        case AUDIO_USAGE_VIRTUAL_SOURCE:
+            // virtual source is not expected to have an associated product strategy
+            break;
+        default:
+            ALOGE("invalid attributes %s when converting to stream",  toString(attr).c_str());
+            break;
+    }
     return AUDIO_STREAM_MUSIC;
 }