From fc836f6684f6e142fe53dc16e1552ffd19bd95bc Mon Sep 17 00:00:00 2001 From: Jae Seo Date: Wed, 27 Aug 2014 00:47:56 +0000 Subject: [PATCH] Revert "TIF: Temporarily disable permission check for parental controls" This reverts commit 9d197941afcef7853578fcd2d704d6f97dde0902. Change-Id: Ib376f3d4deddf72b94a5195f7aeafafd3ed189e8 --- .../android/server/tv/TvInputManagerService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java index 33781714fa8c5..dc5bc84d07491 100644 --- a/services/core/java/com/android/server/tv/TvInputManagerService.java +++ b/services/core/java/com/android/server/tv/TvInputManagerService.java @@ -996,13 +996,12 @@ public final class TvInputManagerService extends SystemService { } private void ensureParentalControlsPermission() { - // STOPSHIP: Uncomment when b/16984416 is resolved. - //if (mContext.checkCallingPermission( - // android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) - // != PackageManager.PERMISSION_GRANTED) { - // throw new SecurityException( - // "The caller does not have parental controls permission"); - //} + if (mContext.checkCallingPermission( + android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException( + "The caller does not have parental controls permission"); + } } @Override