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

Commit d4300282 authored by Yixiao Luo's avatar Yixiao Luo
Browse files

Add null check for mTunerResourceManager in newly added APIs 

Bug: 372592440
Test: atest MediaCasTest
Flag: EXEMPT Bugfix
Change-Id: I6f5ff4bbadd40b00d06e58b720bc5e29aad2e9a0
parent 2073d4f9

media/java/android/media/MediaCas.java

+7 −2
Original line number Diff line number Diff line
@@ -1000,8 +1000,11 @@ public final class MediaCas implements AutoCloseable { 
    @SystemApi

    @RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)

    public boolean updateResourcePriority(int priority, int niceValue) {

        if (mTunerResourceManager != null) {

            return mTunerResourceManager.updateClientPriority(mClientId, priority, niceValue);

        }

        return false;

    }



    /**

     * Determines whether the resource holder retains ownership of the resource during a challenge
@@ -1017,8 +1020,10 @@ public final class MediaCas implements AutoCloseable { 
    @SystemApi

    @RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS)

    public void setResourceHolderRetain(boolean resourceHolderRetain) {

        if (mTunerResourceManager != null) {

            mTunerResourceManager.setResourceHolderRetain(mClientId, resourceHolderRetain);

        }

    }



    IHwBinder getBinder() {

        if (mICas != null) {