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

Merge "TIAF API review: xml attributes and package handling" into tm-dev

Browse Source
This commit is contained in:
Shubang Lu
2022-03-09 21:53:19 +00:00
committed by Android (Google) Code Review
parent 0e76941f06 8b08f61e58
commit 566a9a0f99
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/tv/interactive/TvInteractiveAppManager.java
View File

@@ -1813,8 +1813,8 @@ public final class TvInteractiveAppManager {
} }
/** /**
* This is called when {@link TvIAppService.Session#notifyTeletextAppStateChanged} is * This is called when {@link TvInteractiveAppService.Session#notifyTeletextAppStateChanged}
* called. * is called.
* *
* @param session A {@link TvInteractiveAppManager.Session} associated with this callback. * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
* @param state the current state. * @param state the current state.

10
media/java/android/media/tv/interactive/TvInteractiveAppService.java
View File

@@ -19,6 +19,7 @@ package android.media.tv.interactive;
import android.annotation.MainThread; import android.annotation.MainThread;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.StringDef; import android.annotation.StringDef;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.ActivityManager; import android.app.ActivityManager;
@@ -76,15 +77,14 @@ public abstract class TvInteractiveAppService extends Service {
private static final int DETACH_MEDIA_VIEW_TIMEOUT_MS = 5000; private static final int DETACH_MEDIA_VIEW_TIMEOUT_MS = 5000;
// TODO: cleanup and unhide APIs.
/** /**
* This is the interface name that a service implementing a TV Interactive App service should * This is the interface name that a service implementing a TV Interactive App service should
* say that it supports -- that is, this is the action it uses for its intent filter. To be * say that it supports -- that is, this is the action it uses for its intent filter. To be
* supported, the service must also require the * supported, the service must also require the
* android.Manifest.permission#BIND_TV_INTERACTIVE_APP permission so that other applications * {@link android.Manifest.permission#BIND_TV_INTERACTIVE_APP} permission so that other
* cannot abuse it. * applications cannot abuse it.
*/ */
@SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
public static final String SERVICE_INTERFACE = public static final String SERVICE_INTERFACE =
"android.media.tv.interactive.TvInteractiveAppService"; "android.media.tv.interactive.TvInteractiveAppService";
@@ -383,7 +383,7 @@ public abstract class TvInteractiveAppService extends Service {
} }
/** /**
* Resets TvIAppService session. * Resets TvInteractiveAppService session.
*/ */
public void onResetInteractiveApp() { public void onResetInteractiveApp() {
} }