Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update onTvMessage callback to also be int" into udc-dev

Browse Source
This commit is contained in:
David Zhao
2023-03-16 05:41:56 +00:00
committed by Android (Google) Code Review
parent 6c34756275 0eea615575
commit 9ce369b8d8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -27478,7 +27478,7 @@ package android.media.tv {
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 onTvMessage(@NonNull String, @NonNull android.os.Bundle);
method public void onTvMessage(int, @NonNull android.os.Bundle);
method public void onUnblockContent(android.media.tv.TvContentRating);
method public void setOverlayViewEnabled(boolean);
}

2
media/java/android/media/tv/ITvInputSessionWrapper.java
View File

@@ -280,7 +280,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
}
case DO_NOTIFY_TV_MESSAGE: {
SomeArgs args = (SomeArgs) msg.obj;
mTvInputSessionImpl.onTvMessageReceived((String) args.arg1, (Bundle) args.arg2);
mTvInputSessionImpl.onTvMessageReceived((Integer) args.arg1, (Bundle) args.arg2);
break;
}
default: {

4
media/java/android/media/tv/TvInputService.java
View File

@@ -1512,7 +1512,7 @@ public abstract class TvInputService extends Service {
* See {@link TvInputManager#TV_MESSAGE_KEY_SUBTYPE} for more information on
* how to parse this data.
*/
public void onTvMessage(@NonNull @TvInputManager.TvMessageType String type,
public void onTvMessage(@TvInputManager.TvMessageType int type,
@NonNull Bundle data) {
}
@@ -2065,7 +2065,7 @@ public abstract class TvInputService extends Service {
onAdBufferReady(buffer);
}
void onTvMessageReceived(String type, Bundle data) {
void onTvMessageReceived(int type, Bundle data) {
onTvMessage(type, data);
}