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

Commit 7d31bfb5 authored by Henry Fang's avatar Henry Fang Committed by Android (Google) Code Review
Browse files

Merge "avoid to request frontend resource for CICAM to frontend operation"

parents 79edef5a 47a21a36

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

+8 −0
Original line number Diff line number Diff line
@@ -1565,6 +1565,10 @@ public class Tuner implements AutoCloseable { 
        mFrontendCiCamLock.lock();

        mFrontendLock.lock();

        try {

            if (mFrontendHandle == null) {

                Log.d(TAG, "Operation cannot be done without frontend");

                return RESULT_INVALID_STATE;

            }

            if (mFeOwnerTuner != null) {

                Log.d(TAG, "Operation cannot be done by sharee of tuner");

                return RESULT_INVALID_STATE;
@@ -1632,6 +1636,10 @@ public class Tuner implements AutoCloseable { 
    public int disconnectFrontendToCiCam(int ciCamId) {

        acquireTRMSLock("disconnectFrontendToCiCam()");

        try {

            if (mFrontendHandle == null) {

                Log.d(TAG, "Operation cannot be done without frontend");

                return RESULT_INVALID_STATE;

            }

            if (mFeOwnerTuner != null) {

                Log.d(TAG, "Operation cannot be done by sharee of tuner");

                return RESULT_INVALID_STATE;