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

Commit ca7ba1eb authored by Sherry Huang's avatar Sherry Huang Committed by Android (Google) Code Review
Browse files

Merge "TIS: Entry Point for Standardarized TIS Extension APIs" into main

parents cc609c85 9baee02a
Loading
Loading
Loading
Loading
+20 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@

package android.media.tv;

import static android.media.tv.flags.Flags.tifExtensionStandardization;

import android.annotation.FlaggedApi;
import android.annotation.FloatRange;
import android.annotation.IntDef;
@@ -159,6 +161,11 @@ public abstract class TvInputService extends Service {
            new RemoteCallbackList<>();

    private TvInputManager mTvInputManager;
    /**
     * @hide
     */
    protected TvInputServiceExtensionManager mTvInputServiceExtensionManager =
            new TvInputServiceExtensionManager();

    @Override
    public final IBinder onBind(Intent intent) {
@@ -212,11 +219,22 @@ public abstract class TvInputService extends Service {

            @Override
            public List<String> getAvailableExtensionInterfaceNames() {
                return TvInputService.this.getAvailableExtensionInterfaceNames();
                List<String> extensionNames =
                        TvInputService.this.getAvailableExtensionInterfaceNames();
                if (tifExtensionStandardization()) {
                    extensionNames.addAll(
                            TvInputServiceExtensionManager.getStandardExtensionInterfaceNames());
                }
                return extensionNames;
            }

            @Override
            public IBinder getExtensionInterface(String name) {
                if (tifExtensionStandardization() && name != null) {
                    if (TvInputServiceExtensionManager.checkIsStandardizedInterfaces(name)) {
                        return mTvInputServiceExtensionManager.getExtensionIBinder(name);
                    }
                }
                return TvInputService.this.getExtensionInterface(name);
            }

+614 −0

File added.

Preview size limit exceeded, changes collapsed.