1 files changed, 13 insertions, 4 deletions
diff --git a/src/com/android/tv/ui/sidepanel/SideFragment.java b/src/com/android/tv/ui/sidepanel/SideFragment.java
index 8c37f40f..8df56cd2 100644
--- a/src/com/android/tv/ui/sidepanel/SideFragment.java
+++ b/src/com/android/tv/ui/sidepanel/SideFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.tv.ui.sidepanel;
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.graphics.drawable.RippleDrawable;
@@ -80,11 +79,11 @@ public abstract class SideFragment extends Fragment implements HasTrackerLabel {
     }
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    public void onAttach(Context context) {
+        super.onAttach(context);
         mChannelDataManager = getMainActivity().getChannelDataManager();
         mProgramDataManager = getMainActivity().getProgramDataManager();
-        mTracker = TvApplication.getSingletons(activity).getTracker();
+        mTracker = TvApplication.getSingletons(context).getTracker();
     }
 
     @Override
@@ -236,6 +235,9 @@ public abstract class SideFragment extends Fragment implements HasTrackerLabel {
         void onSideFragmentViewDestroyed();
     }
 
+    /**
+     * Preloads the view holders.
+     */
     public static void preloadRecycledViews(Context context) {
         if (sRecycledViewPool != null) {
             return;
@@ -253,6 +255,13 @@ public abstract class SideFragment extends Fragment implements HasTrackerLabel {
         }
     }
 
+    /**
+     * Releases the pre-loaded view holders.
+     */
+    public static void releasePreloadedRecycledViews() {
+        sRecycledViewPool = null;
+    }
+
     private static class ItemAdapter extends RecyclerView.Adapter<ItemAdapter.ViewHolder> {
         private final LayoutInflater mLayoutInflater;
         private List<Item> mItems;