From d0f00588834806d3f52c95c2d5fb13d9a92bddfc Mon Sep 17 00:00:00 2001 From: Ji-Hwan Lee Date: Wed, 27 Aug 2014 02:55:10 +0900 Subject: TIF: Reset main TvView only for explicit reset() call Or, do not reset when it's called internaly while tuning. Bug: 17269010 Change-Id: I3447ef0e628c066f71eee5a1416347fa6c721504 --- media/java/android/media/tv/TvView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java index 195945df8bb0..e6ef6d7618e2 100644 --- a/media/java/android/media/tv/TvView.java +++ b/media/java/android/media/tv/TvView.java @@ -305,7 +305,7 @@ public class TvView extends ViewGroup { mSessionCallback.mTuneParams = params; } } else { - reset(); + resetInternal(); // When createSession() is called multiple times before the callback is called, // only the callback of the last createSession() call will be actually called back. // The previous callbacks will be ignored. For the logic, mSessionCallback @@ -328,6 +328,10 @@ public class TvView extends ViewGroup { sMainTvView = NULL_TV_VIEW; } } + resetInternal(); + } + + private void resetInternal() { if (mSession != null) { release(); resetSurfaceView(); -- cgit v1.2.3-59-g8ed1b