From e7eee730240cf17f5b3c90e2f3f4e05a06387520 Mon Sep 17 00:00:00 2001
From: Amy Zhang <amyjojo@google.com>
Date: Tue, 10 Nov 2020 18:20:12 -0800
Subject: [PATCH] Rename RecordEvent getFirstMbInSlice into
 getFirstMacroblockInSlice

Test: atest TunerTest
Bug: 172934764
Change-Id: Ie5803509b0ee3e9b3e7279eccf2249dfe29792e5
---
 api/system-current.txt                                        | 4 ++--
 core/api/system-current.txt                                   | 4 ++--
 media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java | 2 +-
 media/java/android/media/tv/tuner/filter/TsRecordEvent.java   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 0eaebcef0040d..cc630fe1ae187 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5414,7 +5414,7 @@ package android.media.tv.tuner.filter {
 
   public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent {
     method public long getDataLength();
-    method public int getFirstMbInSlice();
+    method public int getFirstMacroblockInSlice();
     method public int getMpuSequenceNumber();
     method public long getPts();
     method public int getScHevcIndexMask();
@@ -5590,7 +5590,7 @@ package android.media.tv.tuner.filter {
 
   public class TsRecordEvent extends android.media.tv.tuner.filter.FilterEvent {
     method public long getDataLength();
-    method public int getFirstMbInSlice();
+    method public int getFirstMacroblockInSlice();
     method public int getPacketId();
     method public long getPts();
     method public int getScIndexMask();
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index ed3b7deaad54d..181e026839d59 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -5354,7 +5354,7 @@ package android.media.tv.tuner.filter {
 
   public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent {
     method public long getDataLength();
-    method public int getFirstMbInSlice();
+    method public int getFirstMacroblockInSlice();
     method public int getMpuSequenceNumber();
     method public long getPts();
     method public int getScHevcIndexMask();
@@ -5530,7 +5530,7 @@ package android.media.tv.tuner.filter {
 
   public class TsRecordEvent extends android.media.tv.tuner.filter.FilterEvent {
     method public long getDataLength();
-    method public int getFirstMbInSlice();
+    method public int getFirstMacroblockInSlice();
     method public int getPacketId();
     method public long getPts();
     method public int getScIndexMask();
diff --git a/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java b/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java
index 1031e3374be7c..1bbd6e36c104c 100644
--- a/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java
+++ b/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java
@@ -94,7 +94,7 @@ public class MmtpRecordEvent extends FilterEvent {
      * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version
      * information.
      */
-    public int getFirstMbInSlice() {
+    public int getFirstMacroblockInSlice() {
         return mFirstMbInSlice;
     }
 
diff --git a/media/java/android/media/tv/tuner/filter/TsRecordEvent.java b/media/java/android/media/tv/tuner/filter/TsRecordEvent.java
index 6ea3bf87ad323..28161993e5c88 100644
--- a/media/java/android/media/tv/tuner/filter/TsRecordEvent.java
+++ b/media/java/android/media/tv/tuner/filter/TsRecordEvent.java
@@ -99,7 +99,7 @@ public class TsRecordEvent extends FilterEvent {
      * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version
      * information.
      */
-    public int getFirstMbInSlice() {
+    public int getFirstMacroblockInSlice() {
         return mFirstMbInSlice;
     }
 }