| author | Lei Qian <lei.qian@amlogic.com> | 2018-01-05 02:29:04 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2018-01-05 02:29:04 (GMT) |
| commit | 1ab7828e2912dc663dcd5a18f7c170b9ea0738d3 (patch) | |
| tree | 11b2d56653aafe99f94110d4876f1b2d95ec605a | |
| parent | 95559c80827393b2dc577f80d4f59aa55a5327e9 (diff) | |
| parent | 3730369d37ad0b6c31b0dca302fa9c65331e9efa (diff) | |
| download | TvInput-1ab7828e2912dc663dcd5a18f7c170b9ea0738d3.zip TvInput-1ab7828e2912dc663dcd5a18f7c170b9ea0738d3.tar.gz TvInput-1ab7828e2912dc663dcd5a18f7c170b9ea0738d3.tar.bz2 | |
Merge "DroidLogicTvInput: Adjust the timing of the database cleanup when updateTs" into m-amlogic
| -rw-r--r-- | DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java index 57a548b..f680efa 100644 --- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java +++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java @@ -3035,7 +3035,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr releasePlayer(); Log.d(TAG, "EVENT_CHANNEL_UPDATE mUpdateFrequency:" + mUpdateFrequency); mTvControlManager.setStorDBListener(mMonitorStoreManager); - deleteChannelInfoByFreq(mUpdateFrequency); + setEpgAutoReset(false); mTvControlManager.DtvManualScan(mode, mUpdateFrequency); } } @@ -3058,7 +3058,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr if (c.getFrequency() == Frequency) { Log.d(TAG, "delete Frequency c.getDisplayNumber()" + c.getDisplayNumber() + "getId:" + c.getId() + "ChannelInfo.getFrequency()" + c.getFrequency()); mTvDataBaseManager.deleteChannel(c); - iter.remove(); + } } } @@ -3151,13 +3151,23 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr mTvControlManager.DtvStopScan(); } - public void onScanExit() { - if (mUpdateFrequency == 0) + public void onScanEndBeforeStore(int freg) { + //delete channel before store + if (mUpdateFrequency == 0 || mUpdateFrequency != freg) { - Log.d(TAG, "mUpdateFrequency == 0"); + Log.d(TAG, "[onScanEndBeforeStore] mUpdateFrequency:" + mUpdateFrequency + ", freg:" + freg); return; } + deleteChannelInfoByFreq(mUpdateFrequency); + } + public void onScanExit(int freg) { + setEpgAutoReset(true); + if (mUpdateFrequency == 0 || mUpdateFrequency != freg) + { + Log.d(TAG, "[onScanExit] mUpdateFrequency:" + mUpdateFrequency + ", freg:" + freg); + return; + } ArrayList<ChannelInfo> channelMap = mTvDataBaseManager.getChannelList(mInputId, ChannelInfo.COMMON_PROJECTION, null, null); if (channelMap != null) { for (ChannelInfo c : channelMap) |