commit 9c8eb940301c7dc8b7d60fdfcde5379cecd52249
author Ray Essick <essick@google.com> Mon Mar 22 20:43:29 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 22 20:43:29 2021 +0000
tree a4f070b54551cd123f711ef9088f7afc973abbc0
parent 3bb94bad72c15a827fb429b14c4d87a08e7c9593
parent 71b08993584299a57d45d04cb7961b5a1d5f5de2

Merge "Reduce MediaFormat shaping verbosity" into sc-dev

media/libeffects/proxy/EffectProxy.cpp

diff --git a/media/libeffects/proxy/EffectProxy.cpp b/media/libeffects/proxy/EffectProxy.cpp
index c010d68..be9f8c0 100644
--- a/media/libeffects/proxy/EffectProxy.cpp
+++ b/media/libeffects/proxy/EffectProxy.cpp
@@ -116,6 +116,16 @@
         pContext->sube[SUB_FX_OFFLOAD] = sube[1];
         pContext->desc[SUB_FX_OFFLOAD] = desc[1];
         pContext->aeli[SUB_FX_OFFLOAD] = aeli[1];
+    } else {
+        ALOGE("Both effects have (or don't have) EFFECT_FLAG_HW_ACC_TUNNEL flag");
+        delete[] sube;
+        delete[] desc;
+        delete[] aeli;
+        delete[] pContext->sube;
+        delete[] pContext->desc;
+        delete[] pContext->aeli;
+        delete pContext;
+        return -EINVAL;
     }
     delete[] desc;
     delete[] aeli;

services/mediametrics/Android.bp

diff --git a/services/mediametrics/Android.bp b/services/mediametrics/Android.bp
index 443d339..5989181 100644
--- a/services/mediametrics/Android.bp
+++ b/services/mediametrics/Android.bp
@@ -61,6 +61,7 @@
     "-bugprone-unhandled-self-assignment", // found in TimeMachine.h
     "-bugprone-suspicious-string-compare", // found in TimeMachine.h
     "-cert-oop54-cpp", // found in TransactionLog.h
+    "-bugprone-narrowing-conversions", // b/182410845
 ]
 
 cc_defaults {