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

Commit 558acf96 authored by Conrad Chen's avatar Conrad Chen
Browse files

TIF: add TvInputManager methods to notify apps 

Adds TvInputManager methods to notify apps with protected broadcasts
for:
1. Disabling browsable state of preview and watch next programs.
2. Adding preview programs to watch next programs.

Test: build and verify manually to check if notifications are
      broadcasted.
Bug: 35881266

Change-Id: I20fd5b63f42b2c74277315bbbd251b71c649e5c1
parent 810e018e

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ package android { 
    field public static final java.lang.String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE";

    field public static final java.lang.String NFC = "android.permission.NFC";

    field public static final java.lang.String NOTIFICATION_DURING_SETUP = "android.permission.NOTIFICATION_DURING_SETUP";

    field public static final java.lang.String NOTIFY_TV_INPUTS = "android.permission.NOTIFY_TV_INPUTS";

    field public static final java.lang.String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG";

    field public static final java.lang.String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";

    field public static final java.lang.String PACKAGE_VERIFICATION_AGENT = "android.permission.PACKAGE_VERIFICATION_AGENT";
@@ -27006,6 +27007,9 @@ package android.media.tv { 
    method public boolean isParentalControlsEnabled();

    method public boolean isRatingBlocked(android.media.tv.TvContentRating);

    method public boolean isSingleSessionActive();

    method public void notifyPreviewProgramAddedToWatchNext(java.lang.String, long, long);

    method public void notifyPreviewProgramBrowsableDisabled(java.lang.String, long);

    method public void notifyWatchNextProgramBrowsableDisabled(java.lang.String, long);

    method public void registerCallback(android.media.tv.TvInputManager.TvInputCallback, android.os.Handler);

    method public void releaseTvInputHardware(int, android.media.tv.TvInputManager.Hardware);

    method public void removeBlockedRating(android.media.tv.TvContentRating);

core/res/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -531,6 +531,9 @@ 


    <protected-broadcast android:name="android.content.pm.action.SESSION_COMMITTED" />

    <protected-broadcast android:name="android.os.action.USER_RESTRICTIONS_CHANGED" />

    <protected-broadcast android:name="android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT" />

    <protected-broadcast android:name="android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" />

    <protected-broadcast android:name="android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED" />



    <!-- ====================================================================== -->

    <!--                          RUNTIME PERMISSIONS                           -->
@@ -2511,6 +2514,13 @@ 
    <permission android:name="android.permission.MODIFY_PARENTAL_CONTROLS"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows an application to notify TV inputs by sending broadcasts.

         <p>Protection level: signature|privileged

         <p>Not for use by third-party applications.

         @hide -->

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

         android:protectionLevel="signature|privileged" />



    <!-- Must be required by a {@link android.media.routing.MediaRouteService}

         to ensure that only the system can interact with it.

         @hide -->

media/java/android/media/tv/ITvInputManager.aidl

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media.tv;



import android.content.ComponentName;

import android.content.Intent;

import android.graphics.Rect;

import android.media.PlaybackParams;

import android.media.tv.DvbDeviceInfo;
@@ -105,4 +106,7 @@ interface ITvInputManager { 
    // For DVB device binding

    List<DvbDeviceInfo> getDvbDeviceList();

    ParcelFileDescriptor openDvbDevice(in DvbDeviceInfo info, int device);



    // For preview programs

    void sendTvInputNotifyIntent(in Intent intent, int userId);

}

media/java/android/media/tv/TvInputManager.java

+59 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.content.Intent;

import android.graphics.Rect;

import android.media.PlaybackParams;

import android.net.Uri;
@@ -1393,6 +1394,64 @@ public final class TvInputManager { 
        }

    }



    /**

     * Notifies the TV input of the given preview program that the program's browsable state is

     * disabled.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.NOTIFY_TV_INPUTS)

    public void notifyPreviewProgramBrowsableDisabled(String packageName, long programId) {

        Intent intent = new Intent();

        intent.setAction(TvContract.ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED);

        intent.putExtra(TvContract.EXTRA_PREVIEW_PROGRAM_ID, programId);

        intent.setPackage(packageName);

        try {

            mService.sendTvInputNotifyIntent(intent, mUserId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Notifies the TV input of the given watch next program that the program's browsable state is

     * disabled.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.NOTIFY_TV_INPUTS)

    public void notifyWatchNextProgramBrowsableDisabled(String packageName, long programId) {

        Intent intent = new Intent();

        intent.setAction(TvContract.ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED);

        intent.putExtra(TvContract.EXTRA_WATCH_NEXT_PROGRAM_ID, programId);

        intent.setPackage(packageName);

        try {

            mService.sendTvInputNotifyIntent(intent, mUserId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Notifies the TV input of the given preview program that the program is added to watch next.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.NOTIFY_TV_INPUTS)

    public void notifyPreviewProgramAddedToWatchNext(String packageName, long previewProgramId,

            long watchNextProgramId) {

        Intent intent = new Intent();

        intent.setAction(TvContract.ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT);

        intent.putExtra(TvContract.EXTRA_PREVIEW_PROGRAM_ID, previewProgramId);

        intent.putExtra(TvContract.EXTRA_WATCH_NEXT_PROGRAM_ID, watchNextProgramId);

        intent.setPackage(packageName);

        try {

            mService.sendTvInputNotifyIntent(intent, mUserId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Creates a {@link Session} for a given TV input.

     *

services/core/java/com/android/server/tv/TvInputManagerService.java

+44 −0
Original line number Diff line number Diff line
@@ -941,6 +941,50 @@ public final class TvInputManagerService extends SystemService { 
            }

        }



        @Override

        public void sendTvInputNotifyIntent(Intent intent, int userId) {

            if (mContext.checkCallingPermission(android.Manifest.permission.NOTIFY_TV_INPUTS)

                    != PackageManager.PERMISSION_GRANTED) {

                throw new SecurityException("The caller: " + getCallingPackageName()

                        + " doesn't have permission: "

                        + android.Manifest.permission.NOTIFY_TV_INPUTS);

            }

            if (TextUtils.isEmpty(intent.getPackage())) {

                throw new IllegalArgumentException("Must specify package name to notify.");

            }

            switch (intent.getAction()) {

                case TvContract.ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED:

                    if (intent.getLongExtra(TvContract.EXTRA_PREVIEW_PROGRAM_ID, -1) < 0) {

                        throw new IllegalArgumentException("Invalid preview program ID.");

                    }

                    break;

                case TvContract.ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED:

                    if (intent.getLongExtra(TvContract.EXTRA_WATCH_NEXT_PROGRAM_ID, -1) < 0) {

                        throw new IllegalArgumentException("Invalid watch next program ID.");

                    }

                    break;

                case TvContract.ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT:

                    if (intent.getLongExtra(TvContract.EXTRA_PREVIEW_PROGRAM_ID, -1) < 0) {

                        throw new IllegalArgumentException("Invalid preview program ID.");

                    }

                    if (intent.getLongExtra(TvContract.EXTRA_WATCH_NEXT_PROGRAM_ID, -1) < 0) {

                        throw new IllegalArgumentException("Invalid watch next program ID.");

                    }

                    break;

                default:

                    throw new IllegalArgumentException("Invalid TV input notifying action: "

                            + intent.getAction());

            }

            final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),

                    Binder.getCallingUid(), userId, "sendTvInputNotifyIntent");

            final long identity = Binder.clearCallingIdentity();

            try {

                getContext().sendBroadcastAsUser(intent, new UserHandle(resolvedUserId));

            } finally {

                Binder.restoreCallingIdentity(identity);

            }

        }



        @Override

        public void registerCallback(final ITvInputManagerCallback callback, int userId) {

            final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),