Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Idc732190ae6be8c060251bf32f95815d033aeccb
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
parent 6a4b71e0d8 42094ae71b
commit 6e8d987826
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -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);
setLnb(mLnb); if (mFrontendHandle != null && mFrontend != null) {
setLnb(mLnb);
}
return mLnb; return mLnb;
} }
return null; return null;
@@ -2197,7 +2199,9 @@ public class Tuner implements AutoCloseable {
} }
mLnb = newLnb; mLnb = newLnb;
mLnb.setCallbackAndOwner(this, executor, cb); mLnb.setCallbackAndOwner(this, executor, cb);
setLnb(mLnb); if (mFrontendHandle != null && mFrontend != null) {
setLnb(mLnb);
}
} }
return mLnb; return mLnb;
} finally { } finally {