From 662dced94141995b0510e1e4c5d6c3ea7d62eec1 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Thu, 3 Nov 2011 09:27:53 -0700
Subject: [PATCH] Moved onPause from WidevineSamplePlayer class to
 VideoPlayerView class. BUG: 5561197

Change-Id: I0486c04094e3535106726ef9902814315dd07522
---
 .../src/com/widevine/demo/VideoPlayerView.java             | 7 +++++++
 .../src/com/widevine/demo/WidevineSamplePlayer.java        | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java b/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
index 5f2205b1..50b60af5 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnErrorListener;
 import android.media.MediaPlayer.OnCompletionListener;
+import android.util.Log;
 
 public class VideoPlayerView extends Activity {
     private final static float BUTTON_FONT_SIZE = 10;
@@ -341,4 +342,10 @@ public class VideoPlayerView extends Activity {
     private void updateLogs() {
         hRefresh.sendEmptyMessage(REFRESH);
     }
+
+    @Override
+    protected void onPause() {
+        Log.v("VideoPlayerView", "------------------- onPause ----------------");
+        onStop();
+    }
 }
diff --git a/proprietary/samplePlayer/src/com/widevine/demo/WidevineSamplePlayer.java b/proprietary/samplePlayer/src/com/widevine/demo/WidevineSamplePlayer.java
index 8321e553..c92a06cd 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/WidevineSamplePlayer.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/WidevineSamplePlayer.java
@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.widget.TabHost;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.util.Log;
 
 public class WidevineSamplePlayer extends TabActivity {
 
@@ -83,10 +82,4 @@ public class WidevineSamplePlayer extends TabActivity {
         // Commit the edits!
         editor.commit();
     }
-
-    @Override
-    protected void onPause() {
-        Log.v("WVSamplePlayer", "------------------- onPause ----------------");
-        onStop();
-    }
 }