summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/Context.java
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2014-07-28 17:30:50 +0900
committerJae Seo <jaeseo@google.com>2014-07-30 15:39:39 +0900
commit783645e99f909ffc7a2d5d2fca9324cc0e9b7362 (patch)
treeca3488762396123816eab210f35746e8e84ac31f /core/java/android/content/Context.java
parent6e62a1508cb7a5efcdde2ae9e51672fea4296dca (diff)
downloadframeworks_base-783645e99f909ffc7a2d5d2fca9324cc0e9b7362.zip
frameworks_base-783645e99f909ffc7a2d5d2fca9324cc0e9b7362.tar.gz
frameworks_base-783645e99f909ffc7a2d5d2fca9324cc0e9b7362.tar.bz2
TIF: Merge TvParentalControlManager into TvInputManager
This change addresses the following API council feedback. TvParentalControlManager: -- Replace the listener interface with a broadcast Intent with well-known action, something like ACTION_BLOCKED_RATINGS_CHANGED. -- TvParentalControlManager goes away, and two remaining methods move to TvInputManager. == Implementation changes == -- The user-selected rating preferences should be stored in an XML file, and loaded at boot by your internal system service. It should _not_ be stored in a Secure/Global setting. Bug: 16542165 Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
Diffstat (limited to 'core/java/android/content/Context.java')
-rw-r--r--core/java/android/content/Context.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 95c62e0..f3a7b1c1 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2822,16 +2822,6 @@ public abstract class Context {
public static final String TV_INPUT_SERVICE = "tv_input";
/**
- * Use with {@link #getSystemService} to retrieve a
- * {@link android.media.tv.TvParentalControlManager} for obtaining parental
- * control settings and listening to their changes.
- *
- * @see #getSystemService
- * @see android.media.tv.TvParentalControlManager
- */
- public static final String TV_PARENTAL_CONTROL_SERVICE = "tv_parental_control";
-
- /**
* {@link android.net.NetworkScoreManager} for managing network scoring.
* @see #getSystemService
* @see android.net.NetworkScoreManager