From 774f6c3657dff9f05ffd90d9a4a90153d06180e1 Mon Sep 17 00:00:00 2001
From: Ji-Hwan Lee <jihwan@google.com>
Date: Sat, 30 Aug 2014 16:07:36 +0900
Subject: [PATCH] Add missing checks for the current session callback

Bug: 17336320
Change-Id: I4676c4d76d1ed9d22bd476319098cbfcce52cd6d
---
 media/java/android/media/tv/TvView.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java
index 017645a276b70..f4c761e2c2f7d 100644
--- a/media/java/android/media/tv/TvView.java
+++ b/media/java/android/media/tv/TvView.java
@@ -964,6 +964,9 @@ public class TvView extends ViewGroup {
 
         @Override
         public void onContentBlocked(Session session, TvContentRating rating) {
+            if (this != mSessionCallback) {
+                return;
+            }
             if (DEBUG) {
                 Log.d(TAG, "onContentBlocked()");
             }
@@ -974,6 +977,9 @@ public class TvView extends ViewGroup {
 
         @Override
         public void onLayoutSurface(Session session, int left, int top, int right, int bottom) {
+            if (this != mSessionCallback) {
+                return;
+            }
             if (DEBUG) {
                 Log.d(TAG, "onLayoutSurface (left=" + left + ", top=" + top + ", right="
                         + right + ", bottom=" + bottom + ",)");