commit 1d2a159395df0767ecb2320aff4dd4db3d26e6b2
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 07 19:00:49 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 07 19:00:49 2020 +0000
tree ea3be2597505ffc7e1e98f7a5c9acb2d9d9653cc
parent f356189f05884926290b1f7920241ef15674cbc6
parent 49fb4521427825e4d443260d6395446536f778cc

Merge "Allow MediaMetrics entries from MediaParser"

services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp

diff --git a/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
index 68a32a2..d410ffd 100644
--- a/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
@@ -227,6 +227,7 @@
 {
     bool added = false;
     for (const auto& device : devices) {
+        ALOG_ASSERT(device != nullptr, "Null pointer found when adding DeviceVector");
         if (indexOf(device) < 0 && SortedVector::add(device) >= 0) {
             added = true;
         }
@@ -238,6 +239,7 @@
 
 ssize_t DeviceVector::add(const sp<DeviceDescriptor>& item)
 {
+    ALOG_ASSERT(item != nullptr, "Adding null pointer to DeviceVector");
     ssize_t ret = indexOf(item);
 
     if (ret < 0) {