commit bceb076a2e60fc2a2e9a6cf6469c8a52f6034b6d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 11 23:18:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 11 23:18:23 2018 +0000
tree 2f50128b4a0bbee8186c109b1674b16e87a5737a
parent f32013a9078767d0fa8bc6b5816578db2c6bdc07
parent 19d80c34be7ddd3818839a10ef4df80fa7362841

Merge changes from topic "am-bcb09242-ce3f-453e-a1ab-496ff9dcb274" into nyc-dev

* changes:
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262
  [automerger] Add check preventing div0 issue am: 27e47ce3c3
  Add check preventing div0 issue

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

diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
index 17ed537..ce9bdc2 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
@@ -384,6 +384,7 @@
     mSamplingRate = 0;
     mChannelMask = AUDIO_CHANNEL_NONE;
     mFormat = AUDIO_FORMAT_INVALID;
+    memset(&mGain, 0, sizeof(struct audio_gain_config));
     mGain.index = -1;
 }