aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornchalko <nchalko@google.com>2019-06-13 09:46:16 -0700
committerNick Chalko <nchalko@google.com>2019-06-13 10:15:05 -0700
commitb7a0a0cb2cd59bdff6a6951194b7aa633b176b11 (patch)
tree023d8158bc33131458543368f7f44d4f66ae2ad0 /src
parent3b7a3f36a7136cdc741e4e0a6ef6d8826a817f6f (diff)
downloadTV-b7a0a0cb2cd59bdff6a6951194b7aa633b176b11.tar.gz
Retire enable_partial_program_fetch flag.
This was launched in TJ Hooker PiperOrigin-RevId: 253048146 Change-Id: I20c9eb624739c36a611f6ea6c261bb9dd179aae8
Diffstat (limited to 'src')
-rw-r--r--src/com/android/tv/MainActivity.java3
-rw-r--r--src/com/android/tv/data/ProgramDataManager.java30
-rw-r--r--src/com/android/tv/guide/ProgramManager.java3
3 files changed, 13 insertions, 23 deletions
diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java
index d6e0ff26..e39b5f9c 100644
--- a/src/com/android/tv/MainActivity.java
+++ b/src/com/android/tv/MainActivity.java
@@ -2839,8 +2839,7 @@ public class MainActivity extends Activity
Debug.getTimer(Debug.TAG_START_UP_TIMER).log("MainActivity.MyOnTuneListener.onTune");
mChannel = channel;
mWasUnderShrunkenTvView = wasUnderShrunkenTvView;
- if (mBackendKnobs.enablePartialProgramFetch()
- || mBackendKnobs.fetchProgramsAsNeeded()) {
+ if (mBackendKnobs.fetchProgramsAsNeeded()) {
// Fetch complete projection of tuned channel.
mProgramDataManager.onChannelTuned(channel.getId());
}
diff --git a/src/com/android/tv/data/ProgramDataManager.java b/src/com/android/tv/data/ProgramDataManager.java
index 8dcdcb88..f329d6c2 100644
--- a/src/com/android/tv/data/ProgramDataManager.java
+++ b/src/com/android/tv/data/ProgramDataManager.java
@@ -638,8 +638,7 @@ public class ProgramDataManager implements MemoryManageable {
programMap.clear();
String[] projection =
- mBackendKnobsFlags.enablePartialProgramFetch()
- || mBackendKnobsFlags.fetchProgramsAsNeeded()
+ mBackendKnobsFlags.fetchProgramsAsNeeded()
? ProgramImpl.PARTIAL_PROJECTION
: ProgramImpl.PROJECTION;
if (TvProviderUtils.checkSeriesIdColumn(mContext, Programs.CONTENT_URI)) {
@@ -661,10 +660,7 @@ public class ProgramDataManager implements MemoryManageable {
}
return null;
}
- Program program =
- mBackendKnobsFlags.enablePartialProgramFetch()
- ? ProgramImpl.fromCursorPartialProjection(c)
- : ProgramImpl.fromCursor(c);
+ Program program = ProgramImpl.fromCursorPartialProjection(c);
if (Program.isDuplicate(program, lastReadProgram)) {
duplicateCount++;
continue;
@@ -674,15 +670,14 @@ public class ProgramDataManager implements MemoryManageable {
ArrayList<Program> programs = programMap.get(program.getChannelId());
if (programs == null) {
programs = new ArrayList<>();
- if (mBackendKnobsFlags.enablePartialProgramFetch()) {
- // To skip already loaded complete data.
- Program currentProgramInfo =
- mChannelIdCurrentProgramMap.get(program.getChannelId());
- if (currentProgramInfo != null
- && Program.isDuplicate(program, currentProgramInfo)) {
- program = currentProgramInfo;
- }
+ // To skip already loaded complete data.
+ Program currentProgramInfo =
+ mChannelIdCurrentProgramMap.get(program.getChannelId());
+ if (currentProgramInfo != null
+ && Program.isDuplicate(program, currentProgramInfo)) {
+ program = currentProgramInfo;
}
+
programMap.put(program.getChannelId(), programs);
}
programs.add(program);
@@ -733,8 +728,7 @@ public class ProgramDataManager implements MemoryManageable {
nextMessageDelayedTime = 0;
}
mChannelIdProgramCache = programs;
- if (mBackendKnobsFlags.enablePartialProgramFetch()
- || mBackendKnobsFlags.fetchProgramsAsNeeded()) {
+ if (mBackendKnobsFlags.fetchProgramsAsNeeded()) {
// Since cache has partial data we need to reset the map of complete data.
clearChannelInfoMap();
// Get complete projection of tuned channel.
@@ -919,9 +913,7 @@ public class ProgramDataManager implements MemoryManageable {
for (Long channelId : removedChannelIds) {
if (mPrefetchEnabled) {
mChannelIdProgramCache.remove(channelId);
- if (mBackendKnobsFlags.enablePartialProgramFetch()) {
- mCompleteInfoChannelIds.remove(channelId);
- }
+ mCompleteInfoChannelIds.remove(channelId);
}
mChannelIdCurrentProgramMap.remove(channelId);
notifyCurrentProgramUpdate(channelId, null);
diff --git a/src/com/android/tv/guide/ProgramManager.java b/src/com/android/tv/guide/ProgramManager.java
index 4ac76353..76b00365 100644
--- a/src/com/android/tv/guide/ProgramManager.java
+++ b/src/com/android/tv/guide/ProgramManager.java
@@ -444,8 +444,7 @@ public class ProgramManager {
* one (e.g., whose channelId is INVALID_ID), when it corresponds to a gap between programs.
*/
TableEntry getTableEntry(long channelId, int index) {
- if (mBackendKnobsFlags.enablePartialProgramFetch()
- || mBackendKnobsFlags.fetchProgramsAsNeeded()) {
+ if (mBackendKnobsFlags.fetchProgramsAsNeeded()) {
mProgramDataManager.prefetchChannel(channelId, index);
}
return mChannelIdEntriesMap.get(channelId).get(index);