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

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

Merge "TIF: Allow the application to indicate a TV program to record" into nyc-dev

parents 93f04f89 4eee6a73

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -22998,7 +22998,7 @@ package android.media.tv { 
    method public void notifyRecordingStopped(android.net.Uri);

    method public abstract void onConnect(android.net.Uri);

    method public abstract void onDisconnect();

    method public abstract void onStartRecording();

    method public abstract void onStartRecording(android.net.Uri);

    method public abstract void onStopRecording();

  }










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













    ctor public TvRecordingClient(android.content.Context, java.lang.String, android.media.tv.TvRecordingClient.RecordingCallback, android.os.Handler);















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















    method public void disconnect();













    method public void startRecording();













    method public void startRecording(android.net.Uri);















    method public void stopRecording();















  }







































api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








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













    method public abstract void onConnect(android.net.Uri);















    method public void onConnect(android.net.Uri, android.os.Bundle);















    method public abstract void onDisconnect();













    method public abstract void onStartRecording();













    method public abstract void onStartRecording(android.net.Uri);















    method public abstract void onStopRecording();















  }
























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













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















    method public void disconnect();















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













    method public void startRecording();













    method public void startRecording(android.net.Uri);















    method public void stopRecording();















  }







































api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








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













    method public void notifyRecordingStopped(android.net.Uri);















    method public abstract void onConnect(android.net.Uri);















    method public abstract void onDisconnect();













    method public abstract void onStartRecording();













    method public abstract void onStartRecording(android.net.Uri);















    method public abstract void onStopRecording();















  }
























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













    ctor public TvRecordingClient(android.content.Context, java.lang.String, android.media.tv.TvRecordingClient.RecordingCallback, android.os.Handler);















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















    method public void disconnect();













    method public void startRecording();













    method public void startRecording(android.net.Uri);















    method public void stopRecording();















  }







































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -88,7 +88,7 @@ interface ITvInputManager {





























    // For the recording session















    void connect(in IBinder sessionToken, in Uri channelUri, in Bundle params, int userId);













    void startRecording(in IBinder sessionToken, int userId);













    void startRecording(in IBinder sessionToken, in Uri programHint, int userId);















    void stopRecording(in IBinder sessionToken, int userId);































    // For TV input hardware binding

































media/java/android/media/tv/ITvInputSession.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -58,6 +58,6 @@ oneway interface ITvInputSession {













    // For the recording session















    void connect(in Uri channelUri, in Bundle params);















    void disconnect();













    void startRecording();













    void startRecording(in Uri programHint);















    void stopRecording();















}