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

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

Change-Id: I2fc96c9bbc788ebfd5db6f05a8a8f1c80dbf6ab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Henry Fang
2022-05-28 19:38:22 +00:00
committed by Automerger Merge Worker

View File

@@ -2163,7 +2163,9 @@ public class Tuner implements AutoCloseable {
if (checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB, mLnbLock)
&& mLnb != null) {
mLnb.setCallbackAndOwner(this, executor, cb);
setLnb(mLnb);
if (mFrontendHandle != null && mFrontend != null) {
setLnb(mLnb);
}
return mLnb;
}
return null;
@@ -2197,7 +2199,9 @@ public class Tuner implements AutoCloseable {
}
mLnb = newLnb;
mLnb.setCallbackAndOwner(this, executor, cb);
setLnb(mLnb);
if (mFrontendHandle != null && mFrontend != null) {
setLnb(mLnb);
}
}
return mLnb;
} finally {