summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2014-07-18 03:21:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-17 18:11:21 +0000
commit54a463498316594ba7e0567db5d4f541a7a1e827 (patch)
treeb530fd7eff63640bee350531cf9a2fbe5ca0a216 /services
parenta37900658bd723a53e247000d3f5cbb4b730bfb6 (diff)
parent6057102dbb746593a7d59cf377c969b62e38c664 (diff)
downloadframeworks_base-54a463498316594ba7e0567db5d4f541a7a1e827.zip
frameworks_base-54a463498316594ba7e0567db5d4f541a7a1e827.tar.gz
frameworks_base-54a463498316594ba7e0567db5d4f541a7a1e827.tar.bz2
Merge "TIF: Add TvParentalControlManager" 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 1fb0833..f679f79 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -553,6 +553,23 @@ public final class TvInputManagerService extends SystemService {
}
@Override
+ public void onContentBlocked(String rating) {
+ synchronized (mLock) {
+ if (DEBUG) {
+ Slog.d(TAG, "onContentBlocked()");
+ }
+ if (sessionState.mSession == null || sessionState.mClient == null) {
+ return;
+ }
+ try {
+ sessionState.mClient.onContentBlocked(rating, sessionState.mSeq);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "error in onContentBlocked");
+ }
+ }
+ }
+
+ @Override
public void onSessionEvent(String eventType, Bundle eventArgs) {
synchronized (mLock) {
if (DEBUG) {