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

Commit ea08c3db authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add tuner permissions to Shell" into rvc-dev am: e0b1bfb8 am: f3ccf3c3 am: b50c1cf1 

Change-Id: Ia248ef1c954fa2e73e13bcb1bc0defbf61daedbe
parents 04638847 b50c1cf1

data/etc/privapp-permissions-platform.xml

+4 −0
Original line number Diff line number Diff line
@@ -399,6 +399,10 @@ applications that come with the platform 
        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>

        <!-- Permission required for testing system audio effect APIs. -->

        <permission name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"/>

        <!-- Permissions required for CTS test - TunerTest -->

        <permission name="android.permission.ACCESS_TV_DESCRAMBLER" />

        <permission name="android.permission.ACCESS_TV_TUNER" />

        <permission name="android.permission.TUNER_RESOURCE_ACCESS" />

    </privapp-permissions>



    <privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -284,6 +284,11 @@ 
    <!-- Permission required for testing system audio effect APIs. -->

    <uses-permission android:name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"/>



    <!-- Permissions required for CTS test - TunerTest -->

    <uses-permission android:name="android.permission.ACCESS_TV_DESCRAMBLER" />

    <uses-permission android:name="android.permission.ACCESS_TV_TUNER" />

    <uses-permission android:name="android.permission.TUNER_RESOURCE_ACCESS" />



    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"

services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -657,12 +657,12 @@ public class TunerResourceManagerService extends SystemService { 
    }



    private void enforceTunerAccessPermission(String apiName) {

        getContext().enforceCallingPermission("android.Manifest.permission.ACCESS_TV_TUNER",

        getContext().enforceCallingPermission("android.permission.ACCESS_TV_TUNER",

                TAG + ": " + apiName);

    }



    private void enforceDescramblerAccessPermission(String apiName) {

        getContext().enforceCallingPermission("android.Manifest.permission.ACCESS_TV_DESCRAMBLER",

        getContext().enforceCallingPermission("android.permission.ACCESS_TV_DESCRAMBLER",

                TAG + ": " + apiName);

    }

}