am 1d1cb1fb: am 51324e22: Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev

* commit '1d1cb1fbcac17fa76734f139e5db3d0a9194ef47':
  Remove the dummy implementation of onContentUnblocked()
This commit is contained in:
Sungsoo Lim
2014-07-21 19:19:40 +00:00
committed by Android Git Automerger

View File

@@ -21,7 +21,6 @@ import android.content.ContentValues;
import android.content.res.AssetFileDescriptor; import android.content.res.AssetFileDescriptor;
import android.database.Cursor; import android.database.Cursor;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.media.tv.TvContentRating;
import android.media.tv.TvContract; import android.media.tv.TvContract;
import android.media.tv.TvInputService; import android.media.tv.TvInputService;
import android.net.Uri; import android.net.Uri;
@@ -111,11 +110,6 @@ public class AtscTvInputService extends TvInputService {
mPlayer.setVolume(volume, volume); mPlayer.setVolume(volume, volume);
} }
@Override
public void onContentUnblocked(TvContentRating rating) {
// Do nothing here.
}
@Override @Override
public boolean onTune(Uri channelUri) { public boolean onTune(Uri channelUri) {
Log.d(TAG, "onTune(" + channelUri + ")"); Log.d(TAG, "onTune(" + channelUri + ")");