commit 0c5757f7ce0396698553c78e2a1b2d12c4adb9a2
author Paul Mclean <pmclean@google.com> Mon Jun 05 21:31:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 05 21:31:28 2017 +0000
tree 6a5bf11cbba12b62e51ace70e1a301a7cd37cc52
parent 3a4764463553c26ce76336c5e71fdc81d7c79920
parent cd82f70f91f97b555744ecea494e8e75990e9512

Merge "fix b/62040757 - bad pointer to native audioplayer in 32-bit builds." into oc-dev am: 453b68a9b8
am: cd82f70f91

Change-Id: I39ee98f28d81f3e0f93732a561df3c6b5548f0fe

src/android/AudioPlayer_to_android.cpp

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 4fbbc78..13301ca 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -1727,7 +1727,7 @@
             j_env->ExceptionClear();
             j_env->CallVoidMethod(pAudioPlayer->mAndroidConfiguration.mRoutingProxy,
                                   midRoutingProxy_connect,
-                                  pAudioPlayer->mTrackPlayer->mAudioTrack.get());
+                                  (jlong)pAudioPlayer->mTrackPlayer->mAudioTrack.get());
             if (j_env->ExceptionCheck()) {
                 SL_LOGE("Java exception releasing player routing object.");
                 result = SL_RESULT_INTERNAL_ERROR;