am b198dbaf: am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev

* commit 'b198dbaf19fcad86f81226aa06644db41d6028e4':
  Add WebVTT caption renderer

1 files changed, 3 insertions, 3 deletions

diff --git a/api/current.txt b/api/current.txt
index 866ec6c..7a77692 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29086,12 +29086,12 @@ package android.view.accessibility {
   }
 
   public class CaptioningManager {
-    method public void addCaptioningStateChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
+    method public void addCaptioningChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
     method public final float getFontScale();
     method public final java.util.Locale getLocale();
     method public android.view.accessibility.CaptioningManager.CaptionStyle getUserStyle();
     method public final boolean isEnabled();
-    method public void removeCaptioningStateChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
+    method public void removeCaptioningChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
   }
 
   public static final class CaptioningManager.CaptionStyle {
@@ -29105,7 +29105,7 @@ package android.view.accessibility {
     field public final int foregroundColor;
   }
 
-  public abstract class CaptioningManager.CaptioningChangeListener {
+  public static abstract class CaptioningManager.CaptioningChangeListener {
     ctor public CaptioningManager.CaptioningChangeListener();
     method public void onEnabledChanged(boolean);
     method public void onFontScaleChanged(float);