Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92

1 files changed, 41 insertions, 13 deletions

diff --git a/src/com/android/tv/tuner/tvinput/ChannelDataManager.java b/src/com/android/tv/tuner/tvinput/ChannelDataManager.java
index a16bc522..d2b4998a 100644
--- a/src/com/android/tv/tuner/tvinput/ChannelDataManager.java
+++ b/src/com/android/tv/tuner/tvinput/ChannelDataManager.java
@@ -25,6 +25,7 @@ import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.media.tv.TvContract;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
@@ -37,6 +38,7 @@ import com.android.tv.tuner.TunerPreferences;
 import com.android.tv.tuner.data.PsipData.EitItem;
 import com.android.tv.tuner.data.TunerChannel;
 import com.android.tv.tuner.util.ConvertUtils;
+import com.android.tv.util.PermissionUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -192,11 +194,14 @@ public class ChannelDataManager implements Handler.Callback {
 
     public void release() {
         mHandler.removeCallbacksAndMessages(null);
-        mHandlerThread.quitSafely();
+        releaseSafely();
     }
 
     public void releaseSafely() {
         mHandlerThread.quitSafely();
+        mListener = null;
+        mChannelScanListener = null;
+        mChannelScanHandler = null;
     }
 
     public TunerChannel getChannel(long channelId) {
@@ -435,7 +440,7 @@ public class ChannelDataManager implements Handler.Callback {
                     }
                 }
                 ops.add(buildContentProviderOperation(ContentProviderOperation.newInsert(
-                        TvContract.Programs.CONTENT_URI), newItem, channel.getChannelId()));
+                        TvContract.Programs.CONTENT_URI), newItem, channel));
                 if (ops.size() >= BATCH_OPERATION_COUNT) {
                     applyBatch(channel.getName(), ops);
                     ops.clear();
@@ -505,7 +510,7 @@ public class ChannelDataManager implements Handler.Callback {
                 continue;
             }
             ops.add(buildContentProviderOperation(ContentProviderOperation.newInsert(
-                    TvContract.Programs.CONTENT_URI), item, channel.getChannelId()));
+                    TvContract.Programs.CONTENT_URI), item, channel));
             if (ops.size() >= BATCH_OPERATION_COUNT) {
                 applyBatch(channel.getName(), ops);
                 ops.clear();
@@ -516,9 +521,13 @@ public class ChannelDataManager implements Handler.Callback {
     }
 
     private ContentProviderOperation buildContentProviderOperation(
-            ContentProviderOperation.Builder builder, EitItem item, Long channelId) {
-        if (channelId != null) {
-            builder.withValue(TvContract.Programs.COLUMN_CHANNEL_ID, channelId);
+            ContentProviderOperation.Builder builder, EitItem item, TunerChannel channel) {
+        if (channel != null) {
+            builder.withValue(TvContract.Programs.COLUMN_CHANNEL_ID, channel.getChannelId());
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                builder.withValue(TvContract.Programs.COLUMN_RECORDING_PROHIBITED,
+                        channel.isRecordingProhibited() ? 1 : 0);
+            }
         }
         if (item != null) {
             builder.withValue(TvContract.Programs.COLUMN_TITLE, item.getTitleText())
@@ -556,7 +565,10 @@ public class ChannelDataManager implements Handler.Callback {
         values.put(TvContract.Channels.COLUMN_DISPLAY_NAME, channel.getName());
         values.put(TvContract.Channels.COLUMN_INTERNAL_PROVIDER_DATA, channel.toByteArray());
         values.put(TvContract.Channels.COLUMN_DESCRIPTION, channel.getDescription());
+        values.put(TvContract.Channels.COLUMN_VIDEO_FORMAT, channel.getVideoFormat());
         values.put(TvContract.Channels.COLUMN_INTERNAL_PROVIDER_FLAG1, VERSION);
+        values.put(TvContract.Channels.COLUMN_INTERNAL_PROVIDER_FLAG2,
+                channel.isRecordingProhibited() ? 1 : 0);
 
         if (channelId <= 0) {
             values.put(TvContract.Channels.COLUMN_INPUT_ID, mInputId);
@@ -598,13 +610,29 @@ public class ChannelDataManager implements Handler.Callback {
     }
 
     private void checkVersion() {
-        String selection = TvContract.Channels.COLUMN_INTERNAL_PROVIDER_FLAG1 + "<>?";
-        try (Cursor cursor = mContext.getContentResolver().query(mChannelsUri,
-                CHANNEL_DATA_SELECTION_ARGS, selection,
-                new String[] {Integer.toString(VERSION)}, null)) {
-            if (cursor != null && cursor.moveToFirst()) {
-                // The stored channel data seem outdated. Delete them all.
-                clearChannels();
+        if (PermissionUtils.hasAccessAllEpg(mContext)) {
+            String selection = TvContract.Channels.COLUMN_INTERNAL_PROVIDER_FLAG1 + "<>?";
+            try (Cursor cursor = mContext.getContentResolver().query(mChannelsUri,
+                    CHANNEL_DATA_SELECTION_ARGS, selection,
+                    new String[] {Integer.toString(VERSION)}, null)) {
+                if (cursor != null && cursor.moveToFirst()) {
+                    // The stored channel data seem outdated. Delete them all.
+                    clearChannels();
+                }
+            }
+        } else {
+            try (Cursor cursor = mContext.getContentResolver().query(mChannelsUri,
+                    new String[] { TvContract.Channels.COLUMN_INTERNAL_PROVIDER_FLAG1 },
+                    null, null, null)) {
+                if (cursor != null) {
+                    while (cursor.moveToNext()) {
+                        int version = cursor.getInt(0);
+                        if (version != VERSION) {
+                            clearChannels();
+                            break;
+                        }
+                    }
+                }
             }
         }
     }