commit 99c10998ff754242ba0c9cdde5de11dc373457ed
author Jae Seo <jaeseo@google.com> Wed Aug 27 00:46:16 2014 +0000
committer Jae Seo <jaeseo@google.com> Wed Aug 27 00:46:16 2014 +0000
tree a3422094107813fd54830de59f08244ae9bc040a
parent de09c108eabb884924ae87597f2abaaf1cb39958

Revert "Temporarily disable parental controls permission check"

This reverts commit de09c108eabb884924ae87597f2abaaf1cb39958.

Change-Id: Ic0b0f0cc95410ef6d91a6387b5cb264887e70cbf

src/com/android/providers/tv/TvProvider.java

diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java
index 1242d62..41963ee 100644
--- a/src/com/android/providers/tv/TvProvider.java
+++ b/src/com/android/providers/tv/TvProvider.java
@@ -759,11 +759,9 @@
     }
 
     private boolean callerHasModifyParentalControlsPermission() {
-        return true;
-        // STOPSHIP: Uncomment when b/16984416 is resolved.
-        //return getContext().checkCallingOrSelfPermission(
-        //        android.Manifest.permission.MODIFY_PARENTAL_CONTROLS)
-        //        == PackageManager.PERMISSION_GRANTED;
+        return getContext().checkCallingOrSelfPermission(
+                android.Manifest.permission.MODIFY_PARENTAL_CONTROLS)
+                == PackageManager.PERMISSION_GRANTED;
     }
 
     @Override