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

Commit 03c75de3 authored by Jae Seo's avatar Jae Seo Committed by Android (Google) Code Review
Browse files

Merge "TIF: Notify of a change to TvInputInfo regardless of service connection"

parents 8861cb00 c2a89510

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -22892,7 +22892,7 @@ package android.media.tv { 
    method public void onInputAdded(java.lang.String);

    method public void onInputRemoved(java.lang.String);

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

    method public void onTvInputInfoChanged(java.lang.String, android.media.tv.TvInputInfo);

    method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);

  }















  public abstract class TvInputService extends android.app.Service {









@@ -22900,7 +22900,7 @@ package android.media.tv {













    method public final android.os.IBinder onBind(android.content.Intent);















    method public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(java.lang.String);















    method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);













    method public final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo);













    method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);















    field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";















    field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";















  }

























api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -24407,7 +24407,7 @@ package android.media.tv {













    method public void onInputRemoved(java.lang.String);















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















    method public void onInputUpdated(java.lang.String);













    method public void onTvInputInfoChanged(java.lang.String, android.media.tv.TvInputInfo);













    method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);















  }





























  public abstract class TvInputService extends android.app.Service {









@@ -24419,7 +24419,7 @@ package android.media.tv {













    method public java.lang.String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);















    method public android.media.tv.TvInputInfo onHdmiDeviceAdded(android.hardware.hdmi.HdmiDeviceInfo);















    method public java.lang.String onHdmiDeviceRemoved(android.hardware.hdmi.HdmiDeviceInfo);













    method public final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo);













    method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);















    field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";















    field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";















  }

























api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -22901,7 +22901,7 @@ package android.media.tv {













    method public void onInputAdded(java.lang.String);















    method public void onInputRemoved(java.lang.String);















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













    method public void onTvInputInfoChanged(java.lang.String, android.media.tv.TvInputInfo);













    method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);















  }





























  public abstract class TvInputService extends android.app.Service {









@@ -22909,7 +22909,7 @@ package android.media.tv {













    method public final android.os.IBinder onBind(android.content.Intent);















    method public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(java.lang.String);















    method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);













    method public final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo);













    method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);















    field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";















    field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";















  }

























media/java/android/media/tv/ITvInputManager.aidl



+1
−0




























Original line number
Diff line number
Diff line








@@ -41,6 +41,7 @@ import android.view.Surface;













interface ITvInputManager {















    List<TvInputInfo> getTvInputList(int userId);















    TvInputInfo getTvInputInfo(in String inputId, int userId);













    void setTvInputInfo(in TvInputInfo inputInfo, int userId);















    int getTvInputState(in String inputId, int userId);































    List<TvContentRatingSystemInfo> getTvContentRatingSystemList(int userId);

































media/java/android/media/tv/ITvInputManagerCallback.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -29,5 +29,5 @@ oneway interface ITvInputManagerCallback {





























    void onInputStateChanged(in String inputId, int state);





























    void onTvInputInfoChanged(in String inputId, in TvInputInfo TvInputInfo);













    void onTvInputInfoChanged(in TvInputInfo TvInputInfo);















}