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

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

Merge "Allow LNB to be opened before Frontend" into tm-dev

parents 83979ad7 e6983c1f

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

+6 −2
Original line number Diff line number Diff line
@@ -2163,7 +2163,9 @@ public class Tuner implements AutoCloseable { 
            if (checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB, mLnbLock)

                    && mLnb != null) {

                mLnb.setCallbackAndOwner(this, executor, cb);

                if (mFrontendHandle != null && mFrontend != null) {

                    setLnb(mLnb);

                }

                return mLnb;

            }

            return null;
@@ -2197,8 +2199,10 @@ public class Tuner implements AutoCloseable { 
                }

                mLnb = newLnb;

                mLnb.setCallbackAndOwner(this, executor, cb);

                if (mFrontendHandle != null && mFrontend != null) {

                    setLnb(mLnb);

                }

            }

            return mLnb;

        } finally {

            mLnbLock.unlock();