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

Commit 7c79b6e6 authored by Yixiao Luo's avatar Yixiao Luo Committed by Android (Google) Code Review
Browse files

Merge "TIAF: add permission BIND_TV_INTERACTIVE_APP"

parents a9a9a0bc de8d07de

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ package android { 
    field public static final String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";

    field public static final String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";

    field public static final String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";

    field public static final String BIND_TV_INTERACTIVE_APP = "android.permission.BIND_TV_INTERACTIVE_APP";

    field public static final String BIND_VISUAL_VOICEMAIL_SERVICE = "android.permission.BIND_VISUAL_VOICEMAIL_SERVICE";

    field public static final String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";

    field public static final String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -4205,6 +4205,13 @@ 
    <permission android:name="android.permission.BIND_TV_INPUT"

        android:protectionLevel="signature|privileged" />



    <!-- Must be required by a {@link android.media.tv.interactive.TvInteractiveAppService}

         to ensure that only the system can bind to it.

         <p>Protection level: signature|privileged

    -->

    <permission android:name="android.permission.BIND_TV_INTERACTIVE_APP"

                android:protectionLevel="signature|privileged" />



    <!-- @SystemApi

         Must be required by a {@link com.android.media.tv.remoteprovider.TvRemoteProvider}

         to ensure that only the system can bind to it.

services/core/java/com/android/server/tv/interactive/TvInteractiveAppManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -134,7 +134,12 @@ public class TvInteractiveAppManagerService extends SystemService { 


        for (ResolveInfo ri : services) {

            ServiceInfo si = ri.serviceInfo;

            // TODO: add BIND_TV_INTERACTIVE_APP permission and check it here

            if (!android.Manifest.permission.BIND_TV_INTERACTIVE_APP.equals(si.permission)) {

                Slog.w(TAG, "Skipping TV interactiva app service " + si.name

                        + ": it does not require the permission "

                        + android.Manifest.permission.BIND_TV_INTERACTIVE_APP);

                continue;

            }



            ComponentName component = new ComponentName(si.packageName, si.name);

            try {