commit 2d70375a46b64cba8a0a6d2be20718b4267f2235
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 21:29:28 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 25 21:29:28 2022 +0000
tree 12aa3832d1c016054efe843f1382478d82878074
parent 5834d15129d6ad4261640534593abc8818f68acf
parent 7b75108b268abee4d9cc6726126fc6fc1a1483d9

Merge changes I443ba0bc,I1d46e887,Idabc64be,I03a8bdb4

* changes:
  Fix arguments checking in AudioSystem::getDirectProfilesForAttributes
  Move audiosystem_tests of libaudioclient to presubmit
  Move libaudioclient tests to presubmit
  Fix typo in TEST_MAPPING

media/libaudioclient/AudioSystem.cpp

diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index de8c298..1280577 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -2317,7 +2317,7 @@
 
 status_t AudioSystem::getDirectProfilesForAttributes(const audio_attributes_t* attr,
                                                 std::vector<audio_profile>* audioProfiles) {
-    if (attr == nullptr) {
+    if (attr == nullptr || audioProfiles == nullptr) {
         return BAD_VALUE;
     }
 

media/libaudioclient/TEST_MAPPING

diff --git a/media/libaudioclient/TEST_MAPPING b/media/libaudioclient/TEST_MAPPING
index 2214bca..51080ef 100644
--- a/media/libaudioclient/TEST_MAPPING
+++ b/media/libaudioclient/TEST_MAPPING
@@ -13,11 +13,9 @@
           "include-filter": "android.nativemedia.aaudio.AAudioTests#AAudioBasic.*"
         }
       ]
-    }
-  ],
-  "postsubmit": [
+    },
     {
-      "name": "audieorecord_tests"
+      "name": "audiorecord_tests"
     },
     {
       "name": "audioeffect_tests"
@@ -30,9 +28,7 @@
     },
     {
       "name": "trackplayerbase_tests"
-    }
-  ],
-  "postsubmit": [
+    },
     {
       "name": "audiosystem_tests"
     }