Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08713d2a authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent" into nyc-dev

parents 943dedaf e12d810e

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -23092,6 +23092,7 @@ package android.media.tv { 
    method public boolean onTouchEvent(android.view.MotionEvent);

    method public boolean onTrackballEvent(android.view.MotionEvent);

    method public abstract boolean onTune(android.net.Uri);

    method public boolean onTune(android.net.Uri, android.os.Bundle);

    method public void onUnblockContent(android.media.tv.TvContentRating);

    method public void setOverlayViewEnabled(boolean);

  }
@@ -23165,12 +23166,15 @@ package android.media.tv { 
    method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);

    method public void setStreamVolume(float);

    method public void setTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);

    method public void setZOrderMediaOverlay(boolean);

    method public void setZOrderOnTop(boolean);

    method public void timeShiftPause();

    method public void timeShiftPlay(java.lang.String, android.net.Uri);

    method public void timeShiftResume();

    method public void timeShiftSeekTo(long);

    method public void timeShiftSetPlaybackParams(android.media.PlaybackParams);

    method public void tune(java.lang.String, android.net.Uri);

    method public void tune(java.lang.String, android.net.Uri, android.os.Bundle);

  }















  public static abstract interface TvView.OnUnhandledInputEventListener {

























api/removed.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -43,6 +43,14 @@ package android.media {





























}





























package android.media.tv {



























  public class TvView extends android.view.ViewGroup {













    method public void requestUnblockContent(android.media.tv.TvContentRating);













  }



























}





























package android.net {































  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {

































api/system-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -24941,7 +24941,6 @@ package android.media.tv {













    method public java.util.List<android.media.tv.TvTrackInfo> getTracks(int);















    method protected void onLayout(boolean, int, int, int, int);















    method public boolean onUnhandledInputEvent(android.view.InputEvent);













    method public deprecated void requestUnblockContent(android.media.tv.TvContentRating);















    method public void reset();















    method public void selectTrack(int, java.lang.String);















    method public void sendAppPrivateCommand(java.lang.String, android.os.Bundle);

























api/system-removed.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -41,6 +41,14 @@ package android.media {





























}





























package android.media.tv {



























  public class TvView extends android.view.ViewGroup {













    method public void requestUnblockContent(android.media.tv.TvContentRating);













  }



























}





























package android.net {































  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {

































api/test-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -23103,6 +23103,7 @@ package android.media.tv {













    method public boolean onTouchEvent(android.view.MotionEvent);















    method public boolean onTrackballEvent(android.view.MotionEvent);















    method public abstract boolean onTune(android.net.Uri);













    method public boolean onTune(android.net.Uri, android.os.Bundle);















    method public void onUnblockContent(android.media.tv.TvContentRating);















    method public void setOverlayViewEnabled(boolean);















  }










@@ -23176,12 +23177,15 @@ package android.media.tv {













    method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);















    method public void setStreamVolume(float);















    method public void setTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);













    method public void setZOrderMediaOverlay(boolean);













    method public void setZOrderOnTop(boolean);















    method public void timeShiftPause();















    method public void timeShiftPlay(java.lang.String, android.net.Uri);















    method public void timeShiftResume();















    method public void timeShiftSeekTo(long);















    method public void timeShiftSetPlaybackParams(android.media.PlaybackParams);















    method public void tune(java.lang.String, android.net.Uri);













    method public void tune(java.lang.String, android.net.Uri, android.os.Bundle);















  }





























  public static abstract interface TvView.OnUnhandledInputEventListener {