summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-09-21 18:58:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-21 18:58:28 +0000
commit925042742d4ebc69fa2bd7829e80e2ec306b87f3 (patch)
tree1293036d78b53bd33761dae3a9028dc383cf10e7 /media
parentce388779cbdb5059c49a72c16b60487e68f8f418 (diff)
parent7e1d645f6822dc015bd828c12db63359517cc362 (diff)
downloadframeworks_av-925042742d4ebc69fa2bd7829e80e2ec306b87f3.zip
frameworks_av-925042742d4ebc69fa2bd7829e80e2ec306b87f3.tar.gz
frameworks_av-925042742d4ebc69fa2bd7829e80e2ec306b87f3.tar.bz2
am 7e1d645f: am a8f90d57: Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev
* commit '7e1d645f6822dc015bd828c12db63359517cc362': IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/IAudioFlinger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp
index a6ed199..ac2d1c9 100644
--- a/media/libmedia/IAudioFlinger.cpp
+++ b/media/libmedia/IAudioFlinger.cpp
@@ -1098,7 +1098,7 @@ status_t BnAudioFlinger::onTransact(
String8 address(data.readString8());
audio_output_flags_t flags = (audio_output_flags_t) data.readInt32();
uint32_t latencyMs = 0;
- audio_io_handle_t output;
+ audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
status_t status = openOutput(module, &output, &config,
&devices, address, &latencyMs, flags);
ALOGV("OPEN_OUTPUT output, %d", output);