am 67beefdd: Applying the framework change for making Session class static.

* commit '67beefdda18b693664351172496cda2d92b06f14':
  Applying the framework change for making Session class static.

5 files changed, 24 insertions, 8 deletions

diff --git a/hwsample/src/com/example/android/fakehardwaretvinput/FakeHdmiService.java b/hwsample/src/com/example/android/fakehardwaretvinput/FakeHdmiService.java
index ac9b23a5..2690a870 100644
--- a/hwsample/src/com/example/android/fakehardwaretvinput/FakeHdmiService.java
+++ b/hwsample/src/com/example/android/fakehardwaretvinput/FakeHdmiService.java
@@ -101,7 +101,7 @@ public class FakeHdmiService extends TvInputService {
             throw new IllegalArgumentException("Unknown inputId: " + inputId
                     + " ; this should not happen.");
         }
-        return new HdmiInputSessionImpl(info);
+        return new HdmiInputSessionImpl(info, this);
     }
 
     @Override
@@ -247,7 +247,8 @@ public class FakeHdmiService extends TvInputService {
             }
         };
 
-        HdmiInputSessionImpl(TvInputInfo info) {
+        HdmiInputSessionImpl(TvInputInfo info, Context context) {
+            super(context);
             mInfo = info;
             mLabel = info.loadLabel(FakeHdmiService.this).toString();
             mTextPaint.setColor(Color.BLACK);
diff --git a/sample/src/com/example/android/sampleproxyservice/FakeHdmiTvInputService.java b/sample/src/com/example/android/sampleproxyservice/FakeHdmiTvInputService.java
index 04acbea3..7f650b40 100644
--- a/sample/src/com/example/android/sampleproxyservice/FakeHdmiTvInputService.java
+++ b/sample/src/com/example/android/sampleproxyservice/FakeHdmiTvInputService.java
@@ -16,6 +16,7 @@
 
 package com.example.android.sampleproxyservice;
 
+import android.content.Context;
 import android.media.tv.TvInputService;
 import android.net.Uri;
 import android.view.Surface;
@@ -28,10 +29,14 @@ public class FakeHdmiTvInputService extends TvInputService {
 
     @Override
     public Session onCreateSession(String inputId) {
-        return new FakeHdmiSession();
+        return new FakeHdmiSession(this);
     }
 
     private class FakeHdmiSession extends Session {
+        public FakeHdmiSession(Context context) {
+            super(context);
+        }
+
         @Override
         public void onRelease() {
         }
diff --git a/sample/src/com/example/android/sampleproxyservice/SampleProxyService.java b/sample/src/com/example/android/sampleproxyservice/SampleProxyService.java
index e0914ab0..eb2a54b5 100644
--- a/sample/src/com/example/android/sampleproxyservice/SampleProxyService.java
+++ b/sample/src/com/example/android/sampleproxyservice/SampleProxyService.java
@@ -47,12 +47,16 @@ public class SampleProxyService extends TvInputService {
 
     @Override
     public Session onCreateSession(String inputId) {
-        return new SampleSession();
+        return new SampleSession(this);
     }
 
     private class SampleSession extends HardwareSession {
         private ExternalSettopBox mExternalSettopBox = ExternalSettopBox.getInstance();
 
+        public SampleSession(Context context) {
+            super(context);
+        }
+
         @Override
         public boolean onTune(Uri channel) {
             if (DEBUG) Log.d(TAG, "onTune(" + channel + ")");
diff --git a/sample/src/com/example/sampletvinput/BaseTvInputService.java b/sample/src/com/example/sampletvinput/BaseTvInputService.java
index 39d79e67..54a9b0fc 100644
--- a/sample/src/com/example/sampletvinput/BaseTvInputService.java
+++ b/sample/src/com/example/sampletvinput/BaseTvInputService.java
@@ -19,6 +19,7 @@ package com.example.sampletvinput;
 import android.content.ComponentName;
 import android.content.ContentUris;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.media.MediaPlayer;
@@ -78,7 +79,7 @@ abstract public class BaseTvInputService extends TvInputService {
     @Override
     public Session onCreateSession(String inputId) {
         if (DEBUG) Log.d(TAG, "onCreateSession(inputId=" + inputId + ")");
-        return new BaseTvInputSessionImpl();
+        return new BaseTvInputSessionImpl(this);
     }
 
     abstract public List<ChannelInfo> createSampleChannels();
@@ -151,7 +152,8 @@ abstract public class BaseTvInputService extends TvInputService {
         private Map<String, TvTrackInfo> mTracks;
 
 
-        protected BaseTvInputSessionImpl() {
+        protected BaseTvInputSessionImpl(Context context) {
+            super(context);
             mPlayer = new MediaPlayer();
             mVolume = 1.0f;
             mMute = false;
diff --git a/sample/src/com/example/sampletvinput/LocalTvInputService.java b/sample/src/com/example/sampletvinput/LocalTvInputService.java
index 0a69c77f..59bd35d8 100644
--- a/sample/src/com/example/sampletvinput/LocalTvInputService.java
+++ b/sample/src/com/example/sampletvinput/LocalTvInputService.java
@@ -16,7 +16,7 @@
 
 package com.example.sampletvinput;
 
-import android.media.tv.TvContentRating;
+import android.content.Context;
 import android.media.tv.TvInputService;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -54,7 +54,7 @@ public class LocalTvInputService extends BaseTvInputService {
     @Override
     public Session onCreateSession(String inputId) {
         if (DEBUG) Log.d(TAG, "onCreateSession(inputId=" + inputId + ")");
-        TvInputService.Session impl = new LocalTvInputSessionImpl();
+        TvInputService.Session impl = new LocalTvInputSessionImpl(this);
         impl.setOverlayViewEnabled(true);
         return impl;
     }
@@ -88,6 +88,10 @@ public class LocalTvInputService extends BaseTvInputService {
         private View mUiLayout;
         private boolean mUiVisible;
 
+        protected LocalTvInputSessionImpl(Context context) {
+            super(context);
+        }
+
         public void setUiVisibility(boolean visible) {
             if (mUiVisible == visible) {
                 return;