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

Commit 62597cc9 authored by Shubang Lu's avatar Shubang Lu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17077993

Change-Id: I8c75018cdef923d73ab55350406e415a0c289714
parents ceae0d92 566a9a0f

media/java/android/media/tv/interactive/TvInteractiveAppManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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.

media/java/android/media/tv/interactive/TvInteractiveAppService.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -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() {

        }

        }