diff options
| author | Jae Seo <jaeseo@google.com> | 2014-07-28 17:30:50 +0900 |
|---|---|---|
| committer | Jae Seo <jaeseo@google.com> | 2014-07-30 15:39:39 +0900 |
| commit | 783645e99f909ffc7a2d5d2fca9324cc0e9b7362 (patch) | |
| tree | ca3488762396123816eab210f35746e8e84ac31f /core/java/android/provider | |
| parent | 6e62a1508cb7a5efcdde2ae9e51672fea4296dca (diff) | |
| download | frameworks_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/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index eed250a..5d5be4a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3726,20 +3726,6 @@ public final class Settings { */ public static final String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url"; - - /** - * Whether the TV parental control is enabled. - * @hide - */ - public static final String TV_PARENTAL_CONTROL_ENABLED = "tv_parental_control_enabled"; - - /** - * List of TV content ratings blocked by the user. (comma-delimited) - * @hide - */ - public static final String TV_PARENTAL_CONTROL_BLOCKED_RATINGS = - "tv_parental_control_blocked_ratings"; - /** * Settings classname to launch when Settings is clicked from All * Applications. Needed because of user testing between the old |