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

Commit 3270b067 authored by Amy Zhang's avatar Amy Zhang
Browse files

Fix permission check log in TRM 

Fix npe in Tuner init

Test: atest TunerTest
Bug: 151186028
Change-Id: I7ce47f30ee8fc8ec280bad1465d2a081e1941044
parent a7aededa

media/java/android/media/tv/tuner/Tuner.java

+3 −0
Original line number Diff line number Diff line
@@ -245,6 +245,9 @@ public class Tuner implements AutoCloseable { 
        mContext = context;

        mTunerResourceManager = (TunerResourceManager)

                context.getSystemService(Context.TV_TUNER_RESOURCE_MGR_SERVICE);

        if (mHandler == null) {

            mHandler = createEventHandler();

        }



        int[] clientId = new int[1];

        ResourceClientProfile profile = new ResourceClientProfile(tvInputSessionId, useCase);

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

+3 −3
Original line number Diff line number Diff line
@@ -653,16 +653,16 @@ public class TunerResourceManagerService extends SystemService { 


    private void enforceTrmAccessPermission(String apiName) {

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

                TAG + ": " + "apiName");

                TAG + ": " + apiName);

    }



    private void enforceTunerAccessPermission(String apiName) {

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

                TAG + ": " + "apiName");

                TAG + ": " + apiName);

    }



    private void enforceDescramblerAccessPermission(String apiName) {

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

                TAG + ": " + "apiName");

                TAG + ": " + apiName);

    }

}