summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-09-17 13:27:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-17 13:27:49 +0000
commite10a198aa507a57796c3d68cade27e7a260844ef (patch)
treed7708a9399496aaac5a7e88c4488dfc787fa71ab /media
parentf284e01c2cb1db6f3e6820197427d5b2da28b500 (diff)
parent190eca5a52f412ceac7622107db6d393b235c3b5 (diff)
downloadframeworks_av-e10a198aa507a57796c3d68cade27e7a260844ef.zip
frameworks_av-e10a198aa507a57796c3d68cade27e7a260844ef.tar.gz
frameworks_av-e10a198aa507a57796c3d68cade27e7a260844ef.tar.bz2
am 190eca5a: Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into mnc-dev
* commit '190eca5a52f412ceac7622107db6d393b235c3b5': 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 47ed359..0bf503a 100644
--- a/media/libmedia/IAudioFlinger.cpp
+++ b/media/libmedia/IAudioFlinger.cpp
@@ -1112,7 +1112,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);