From 550c4b0d4dc6f3e2ef388b4250c758829c8255bc Mon Sep 17 00:00:00 2001 From: Jae Seo Date: Tue, 12 Aug 2014 17:50:37 -0700 Subject: [PATCH] TIF: Temporarily disable permission check for parental controls Bug: 16979343 Change-Id: I00ff70194faaf7218151388dc10ce8e4dd3d2728 --- .../android/server/tv/TvInputManagerService.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java index dc5bc84d07491..33781714fa8c5 100644 --- a/services/core/java/com/android/server/tv/TvInputManagerService.java +++ b/services/core/java/com/android/server/tv/TvInputManagerService.java @@ -996,12 +996,13 @@ public final class TvInputManagerService extends SystemService { } private void ensureParentalControlsPermission() { - if (mContext.checkCallingPermission( - android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) - != PackageManager.PERMISSION_GRANTED) { - throw new SecurityException( - "The caller does not have parental controls permission"); - } + // 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"); + //} } @Override