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

Commit 2dab4ea3 authored by Kyeongkab.Nam's avatar Kyeongkab.Nam Committed by Henry Fang
Browse files

Guard TvInputManager#getClientPriority() 

Guard TvInputManager#getClientPriority() by
android.Manifest.permission.TUNER_RESOURCE_ACCESS.

cts test was merged in ag/16577091

CTS-Coverage-Bug: 194149304
Bug: 194149304
Bug: 215546861
Test: run cts -m CtsTvTestCases -t
android.media.tv.cts.TvInputManagerTest

Change-Id: I56a397517d54f806215dd00f9cfff904a55aa159
parent 3e6933f1

core/api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -6661,7 +6661,7 @@ package android.media.tv { 
    method @NonNull public java.util.List<java.lang.String> getAvailableExtensionInterfaceNames(@NonNull String);

    method @NonNull public java.util.List<java.lang.String> getAvailableExtensionInterfaceNames(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(String);

    method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(String);

    method @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public int getClientPid(@NonNull String);

    method @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public int getClientPid(@NonNull String);

    method public int getClientPriority(int, @Nullable String);

    method @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public int getClientPriority(int, @Nullable String);

    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TUNED_INFO) public java.util.List<android.media.tv.TunedInfo> getCurrentTunedInfos();

    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TUNED_INFO) public java.util.List<android.media.tv.TunedInfo> getCurrentTunedInfos();

    method @NonNull @RequiresPermission("android.permission.DVB_DEVICE") public java.util.List<android.media.tv.DvbDeviceInfo> getDvbDeviceList();

    method @NonNull @RequiresPermission("android.permission.DVB_DEVICE") public java.util.List<android.media.tv.DvbDeviceInfo> getDvbDeviceList();

    method @Nullable public android.os.IBinder getExtensionInterface(@NonNull String, @NonNull String);

    method @Nullable public android.os.IBinder getExtensionInterface(@NonNull String, @NonNull String);

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -1875,6 +1875,7 @@ public final class TvInputManager { 
     * @hide

     * @hide

     */

     */

    @SystemApi

    @SystemApi

    @RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)

    public int getClientPriority(@TvInputService.PriorityHintUseCaseType int useCase,

    public int getClientPriority(@TvInputService.PriorityHintUseCaseType int useCase,

            @Nullable String sessionId) {

            @Nullable String sessionId) {

        return getClientPriorityInternal(useCase, sessionId);

        return getClientPriorityInternal(useCase, sessionId);

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -2541,6 +2541,7 @@ public final class TvInputManagerService extends SystemService { 




        @Override

        @Override

        public int getClientPriority(int useCase, String sessionId) {

        public int getClientPriority(int useCase, String sessionId) {

            ensureTunerResourceAccessPermission();

            final int callingPid = Binder.getCallingPid();

            final int callingPid = Binder.getCallingPid();

            final long identity = Binder.clearCallingIdentity();

            final long identity = Binder.clearCallingIdentity();

            try {

            try {