summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2014-07-19 03:23:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-18 18:24:25 +0000
commit31380e84246844cf709ea13769679240ff2b48e6 (patch)
tree4ce8be7dcc30db7a0f081c7e96fc8509407d76bd /services
parentc01bd1167a1b08d59557f214ddc48cf24d3b8d0a (diff)
parentbbcd206a798c8c2845200daf7a2d4cb7b29056f3 (diff)
downloadframeworks_base-31380e84246844cf709ea13769679240ff2b48e6.zip
frameworks_base-31380e84246844cf709ea13769679240ff2b48e6.tar.gz
frameworks_base-31380e84246844cf709ea13769679240ff2b48e6.tar.bz2
Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/tv/TvInputManagerService.java17
1 files changed, 17 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index 69c693a..78b6883 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -565,6 +565,23 @@ public final class TvInputManagerService extends SystemService {
}
@Override
+ public void onContentAllowed() {
+ synchronized (mLock) {
+ if (DEBUG) {
+ Slog.d(TAG, "onContentAllowed()");
+ }
+ if (sessionState.mSession == null || sessionState.mClient == null) {
+ return;
+ }
+ try {
+ sessionState.mClient.onContentAllowed(sessionState.mSeq);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "error in onContentAllowed");
+ }
+ }
+ }
+
+ @Override
public void onContentBlocked(String rating) {
synchronized (mLock) {
if (DEBUG) {