Snap for 6439596 from d12bfa398c56027290a9e6e4fd14f635458ec581 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: If4916a588c0e85189c29cccd566a4ac49ec6328e

1 files changed, 10 insertions, 24 deletions

diff --git a/src/com/android/tv/util/AsyncDbTask.java b/src/com/android/tv/util/AsyncDbTask.java
index 2e9a1ea8..b3523952 100644
--- a/src/com/android/tv/util/AsyncDbTask.java
+++ b/src/com/android/tv/util/AsyncDbTask.java
@@ -28,23 +28,18 @@ import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.util.Log;
 import android.util.Range;
-
 import com.android.tv.TvSingletons;
 import com.android.tv.common.BuildConfig;
 import com.android.tv.common.SoftPreconditions;
 import com.android.tv.data.ChannelImpl;
-import com.android.tv.data.ProgramImpl;
+import com.android.tv.data.Program;
 import com.android.tv.data.api.Channel;
-import com.android.tv.data.api.Program;
 import com.android.tv.dvr.data.RecordedProgram;
-
 import com.google.common.base.Predicate;
-
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
-
 import javax.inject.Qualifier;
 
 /**
@@ -128,7 +123,7 @@ public abstract class AsyncDbTask<Params, Progress, Result>
                 return null;
             }
             if (Utils.isProgramsUri(mUri)
-                    && TvProviderUtils.checkSeriesIdColumn(context, Programs.CONTENT_URI)) {
+                            && TvProviderUtils.checkSeriesIdColumn(context, Programs.CONTENT_URI)) {
                 mProjection =
                         TvProviderUtils.addExtraColumnsToProjection(
                                 mProjection, TvProviderUtils.EXTRA_PROGRAM_COLUMN_SERIES_ID);
@@ -328,19 +323,10 @@ public abstract class AsyncDbTask<Params, Progress, Result>
         }
     }
 
-    /**
-     * Gets an {@link List} of {@link ProgramImpl}s from {@link TvContract.Programs#CONTENT_URI}.
-     */
+    /** Gets an {@link List} of {@link Program}s from {@link TvContract.Programs#CONTENT_URI}. */
     public abstract static class AsyncProgramQueryTask extends AsyncQueryListTask<Program> {
         public AsyncProgramQueryTask(Executor executor, Context context) {
-            super(
-                    executor,
-                    context,
-                    Programs.CONTENT_URI,
-                    ProgramImpl.PROJECTION,
-                    null,
-                    null,
-                    null);
+            super(executor, context, Programs.CONTENT_URI, Program.PROJECTION, null, null, null);
         }
 
         public AsyncProgramQueryTask(
@@ -355,7 +341,7 @@ public abstract class AsyncDbTask<Params, Progress, Result>
                     executor,
                     context,
                     uri,
-                    ProgramImpl.PROJECTION,
+                    Program.PROJECTION,
                     selection,
                     selectionArgs,
                     sortOrder,
@@ -364,7 +350,7 @@ public abstract class AsyncDbTask<Params, Progress, Result>
 
         @Override
         protected final Program fromCursor(Cursor c) {
-            return ProgramImpl.fromCursor(c);
+            return Program.fromCursor(c);
         }
     }
 
@@ -390,7 +376,7 @@ public abstract class AsyncDbTask<Params, Progress, Result>
     }
 
     /**
-     * Gets an {@link List} of {@link ProgramImpl}s for a given channel and period {@link
+     * Gets an {@link List} of {@link Program}s for a given channel and period {@link
      * TvContract#buildProgramsUriForChannel(long, long, long)}. If the {@code period} is {@code
      * null}, then all the programs is queried.
      */
@@ -424,7 +410,7 @@ public abstract class AsyncDbTask<Params, Progress, Result>
         }
     }
 
-    /** Gets a single {@link ProgramImpl} from {@link TvContract.Programs#CONTENT_URI}. */
+    /** Gets a single {@link Program} from {@link TvContract.Programs#CONTENT_URI}. */
     public static class AsyncQueryProgramTask extends AsyncQueryItemTask<Program> {
 
         public AsyncQueryProgramTask(Executor executor, Context context, long programId) {
@@ -432,7 +418,7 @@ public abstract class AsyncDbTask<Params, Progress, Result>
                     executor,
                     context,
                     TvContract.buildProgramUri(programId),
-                    ProgramImpl.PROJECTION,
+                    Program.PROJECTION,
                     null,
                     null,
                     null);
@@ -440,7 +426,7 @@ public abstract class AsyncDbTask<Params, Progress, Result>
 
         @Override
         protected Program fromCursor(Cursor c) {
-            return ProgramImpl.fromCursor(c);
+            return Program.fromCursor(c);
         }
     }