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

Commit 3d70f2c7 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01 am: 88f77abc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147



Change-Id: I44ac73ec486c05504df47dc979855b5d1c186eb1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9326b73 88f77abc

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

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

            if (checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB, mLnbLock)

                    && mLnb != null) {

                    && mLnb != null) {

                mLnb.setCallbackAndOwner(this, executor, cb);

                mLnb.setCallbackAndOwner(this, executor, cb);

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

                    setLnb(mLnb);

                    setLnb(mLnb);

                }

                return mLnb;

                return mLnb;

            }

            }

            return null;

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

                }

                mLnb = newLnb;

                mLnb = newLnb;

                mLnb.setCallbackAndOwner(this, executor, cb);

                mLnb.setCallbackAndOwner(this, executor, cb);

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

                    setLnb(mLnb);

                    setLnb(mLnb);

                }

                }

            }

            return mLnb;

            return mLnb;

        } finally {

        } finally {

            mLnbLock.unlock();

            mLnbLock.unlock();