diff options
| author | Jae Seo <jaeseo@google.com> | 2014-08-27 00:46:16 +0000 |
|---|---|---|
| committer | Jae Seo <jaeseo@google.com> | 2014-08-27 00:46:16 +0000 |
| commit | 99c10998ff754242ba0c9cdde5de11dc373457ed (patch) | |
| tree | a3422094107813fd54830de59f08244ae9bc040a | |
| parent | de09c108eabb884924ae87597f2abaaf1cb39958 (diff) | |
| download | TvProvider-99c10998ff754242ba0c9cdde5de11dc373457ed.tar.gz | |
Revert "Temporarily disable parental controls permission check"
This reverts commit de09c108eabb884924ae87597f2abaaf1cb39958.
Change-Id: Ic0b0f0cc95410ef6d91a6387b5cb264887e70cbf
| -rw-r--r-- | src/com/android/providers/tv/TvProvider.java | 8 |
1 files changed, 3 insertions, 5 deletions
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 @@ public class TvProvider extends ContentProvider { } 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 |