diff options
Diffstat (limited to 'media/jni/audioeffect/android_media_Visualizer.cpp')
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index 439715cbb811..b30f00fdf7de 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -25,12 +25,16 @@ #include <android_runtime/AndroidRuntime.h> #include <utils/threads.h> #include "Visualizer.h" -#include "permission_utils.h" #include <nativehelper/ScopedUtfChars.h> +#include <android/content/AttributionSourceState.h> +#include <android_os_Parcel.h> + using namespace android; +using content::AttributionSourceState; + #define VISUALIZER_SUCCESS 0 #define VISUALIZER_ERROR (-1) #define VISUALIZER_ERROR_ALREADY_EXISTS (-2) @@ -348,13 +352,15 @@ static void android_media_visualizer_effect_callback(int32_t event, static jint android_media_visualizer_native_setup(JNIEnv *env, jobject thiz, jobject weak_this, - jint sessionId, jintArray jId, jobject jIdentity) + jint sessionId, jintArray jId, jobject jAttributionSource) { ALOGV("android_media_visualizer_native_setup"); VisualizerJniStorage* lpJniStorage = NULL; int lStatus = VISUALIZER_ERROR_NO_MEMORY; sp<Visualizer> lpVisualizer; jint* nId = NULL; + AttributionSourceState attributionSource; + Parcel* parcel = nullptr; setVisualizer(env, thiz, 0); @@ -381,7 +387,9 @@ android_media_visualizer_native_setup(JNIEnv *env, jobject thiz, jobject weak_th } // create the native Visualizer object - lpVisualizer = new Visualizer(convertIdentity(env, jIdentity)); + parcel = parcelForJavaObject(env, jAttributionSource); + attributionSource.readFromParcel(parcel); + lpVisualizer = sp<Visualizer>::make(attributionSource); if (lpVisualizer == 0) { ALOGE("Error creating Visualizer"); goto setup_failure; @@ -678,7 +686,7 @@ android_media_setPeriodicCapture(JNIEnv *env, jobject thiz, jint rate, jboolean // Dalvik VM type signatures static const JNINativeMethod gMethods[] = { {"native_init", "()V", (void *)android_media_visualizer_native_init}, - {"native_setup", "(Ljava/lang/Object;I[ILandroid/media/permission/Identity;)I", + {"native_setup", "(Ljava/lang/Object;I[ILandroid/os/Parcel;)I", (void *)android_media_visualizer_native_setup}, {"native_finalize", "()V", (void *)android_media_visualizer_native_finalize}, {"native_release", "()V", (void *)android_media_visualizer_native_release}, |