commit f0452adb4354e0d6e58b1894cc46357b39c831a8
author Sungsoo Lim <sungsoo@google.com> Fri Jul 25 00:15:09 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 24 16:04:26 2014 +0000
tree e761b5b7e436245fe2a81651c6d22800fc5be34c
parent f43192c8458e4a04874a328eae9acf14e34ffa3a
parent 1295b154c93730082a887ed9901b165d697be2ea

Merge "Call removeOverlayView() before onRelease()" into lmp-dev

media/java/android/media/tv/TvInputService.java

diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index f41c6dd..d5111f4 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -744,12 +744,12 @@
          * session.
          */
         void release() {
+            removeOverlayView(true);
             onRelease();
             if (mSurface != null) {
                 mSurface.release();
                 mSurface = null;
             }
-            removeOverlayView(true);
         }
 
         /**