diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java
index ae7e5a637b149..5f56a73ea3881 100644
--- a/media/java/android/media/MediaExtractor.java
+++ b/media/java/android/media/MediaExtractor.java
@@ -774,7 +774,7 @@ public final class MediaExtractor {
      */
     public void setLogSessionId(@NonNull LogSessionId logSessionId) {
         mLogSessionId = Objects.requireNonNull(logSessionId);
-        native_setPlaybackId(logSessionId.getStringId());
+        native_setLogSessionId(logSessionId.getStringId());
     }
 
     /**
@@ -802,7 +802,7 @@ public final class MediaExtractor {
         return bundle;
     }
 
-    private native void native_setPlaybackId(String playbackId);
+    private native void native_setLogSessionId(String logSessionId);
     private native PersistableBundle native_getMetrics();
 
     private static native final void native_init();
diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp
index 91178e53e97ba..116237f6b998a 100644
--- a/media/jni/android_media_MediaExtractor.cpp
+++ b/media/jni/android_media_MediaExtractor.cpp
@@ -295,8 +295,8 @@ status_t JMediaExtractor::getAudioPresentations(size_t trackIdx,
     return mImpl->getAudioPresentations(trackIdx, presentations);
 }
 
-status_t JMediaExtractor::setPlaybackId(const String8 &playbackId) {
-    return mImpl->setPlaybackId(playbackId);
+status_t JMediaExtractor::setLogSessionId(const String8 &LogSessionId) {
+    return mImpl->setLogSessionId(LogSessionId);
 }
 }  // namespace android
 
@@ -924,21 +924,21 @@ android_media_MediaExtractor_native_getMetrics(JNIEnv * env, jobject thiz)
 }
 
 static void
-android_media_MediaExtractor_native_setPlaybackId(
-        JNIEnv * env, jobject thiz, jstring playbackIdJString)
+android_media_MediaExtractor_native_setLogSessionId(
+        JNIEnv * env, jobject thiz, jstring logSessionIdJString)
 {
-    ALOGV("android_media_MediaExtractor_native_setPlaybackId");
+    ALOGV("android_media_MediaExtractor_native_setLogSessionId");
 
     sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz);
     if (extractor == nullptr) {
         jniThrowException(env, "java/lang/IllegalStateException", nullptr);
     }
 
-    const char* playbackId = env->GetStringUTFChars(playbackIdJString, nullptr);
-    if (extractor->setPlaybackId(String8(playbackId)) != OK) {
-        ALOGE("setPlaybackId failed");
+    const char* logSessionId = env->GetStringUTFChars(logSessionIdJString, nullptr);
+    if (extractor->setLogSessionId(String8(logSessionId)) != OK) {
+        ALOGE("setLogSessionId failed");
     }
-    env->ReleaseStringUTFChars(playbackIdJString, playbackId);
+    env->ReleaseStringUTFChars(logSessionIdJString, logSessionId);
 }
 
 static const JNINativeMethod gMethods[] = {
@@ -1010,8 +1010,8 @@ static const JNINativeMethod gMethods[] = {
     {"native_getMetrics",          "()Landroid/os/PersistableBundle;",
       (void *)android_media_MediaExtractor_native_getMetrics},
 
-    { "native_setPlaybackId", "(Ljava/lang/String;)V",
-      (void *)android_media_MediaExtractor_native_setPlaybackId},
+    { "native_setLogSessionId", "(Ljava/lang/String;)V",
+      (void *)android_media_MediaExtractor_native_setLogSessionId},
 
     { "native_getAudioPresentations", "(I)Ljava/util/List;",
       (void *)android_media_MediaExtractor_getAudioPresentations },
diff --git a/media/jni/android_media_MediaExtractor.h b/media/jni/android_media_MediaExtractor.h
index 9aaa643a2f37f..7f48f70734bd8 100644
--- a/media/jni/android_media_MediaExtractor.h
+++ b/media/jni/android_media_MediaExtractor.h
@@ -70,7 +70,7 @@ struct JMediaExtractor : public RefBase {
     status_t getAudioPresentations(size_t trackIdx,
             AudioPresentationCollection *presentations) const;
 
-    status_t setPlaybackId(const String8& playbackId);
+    status_t setLogSessionId(const String8& LogSessionId);
 
 protected:
     virtual ~JMediaExtractor();