From c7079663978a685335d33aaddef1dd5a09dc095a Mon Sep 17 00:00:00 2001
From: Paul McLean <pmclean@google.com>
Date: Fri, 26 Feb 2016 12:45:33 -0700
Subject: Fix unitialized member/init-parameter in AudioTrack(long) and
 AudioRecord(long).

Bug: 27381351

Change-Id: Ia11c13bde978dbf1707439b82a18abf22fe23f2f
---
 media/java/android/media/AudioRecord.java | 5 +++--
 media/java/android/media/AudioTrack.java  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java
index d84523a6523a..b8f0717d7318 100644
--- a/media/java/android/media/AudioRecord.java
+++ b/media/java/android/media/AudioRecord.java
@@ -395,20 +395,21 @@ public class AudioRecord implements AudioRouting
      */
     /*package*/ AudioRecord(long nativeRecordInJavaObj) {
         int[] session = { 0 };
+        int[] rates = { 0 };
         //TODO: update native initialization when information about hardware init failure
         //      due to capture device already open is available.
         // Note that for this native_setup, we are providing an already created/initialized
         // *Native* AudioRecord, so the attributes parameters to native_setup() are ignored.
         int initResult = native_setup(new WeakReference<AudioRecord>(this),
                 null /*mAudioAttributes*/,
-                null /*mSampleRates*/,
+                rates /*mSampleRates*/,
                 0 /*mChannelMask*/,
                 0 /*mChannelIndexMask*/,
                 0 /*mAudioFormat*/,
                 0 /*mNativeBufferSizeInBytes*/,
                 session,
                 ActivityThread.currentOpPackageName(),
-                mNativeRecorderInJavaObj);
+                nativeRecordInJavaObj);
         if (initResult != SUCCESS) {
             loge("Error code "+initResult+" when initializing native AudioRecord object.");
             return; // with mState == STATE_UNINITIALIZED
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index f78a2deb5ac4..f02e8375f072 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -543,16 +543,17 @@ public class AudioTrack implements AudioRouting
         // Note that for this native_setup, we are providing an already created/initialized
         // *Native* AudioTrack, so the attributes parameters to native_setup() are ignored.
         int[] session = { 0 };
+        int[] rates = { 0 };
         int initResult = native_setup(new WeakReference<AudioTrack>(this),
                 null /*mAttributes - NA*/,
-                null /*sampleRate - NA*/,
+                rates /*sampleRate - NA*/,
                 0 /*mChannelMask - NA*/,
                 0 /*mChannelIndexMask - NA*/,
                 0 /*mAudioFormat - NA*/,
                 0 /*mNativeBufferSizeInBytes - NA*/,
                 0 /*mDataLoadMode - NA*/,
                 session,
-                mNativeTrackInJavaObj);
+                nativeTrackInJavaObj);
         if (initResult != SUCCESS) {
             loge("Error code "+initResult+" when initializing AudioTrack.");
             return; // with mState == STATE_UNINITIALIZED
-- 
cgit v1.2.3-59-g8ed1b