drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "TIF: Temporarily disable permission check for parental controls"

Browse Source 
This reverts commit 9d197941afcef7853578fcd2d704d6f97dde0902.

Change-Id: Ib376f3d4deddf72b94a5195f7aeafafd3ed189e8
This commit is contained in:
Jae Seo
2014-08-27 00:47:56 +00:00
parent 550c4b0d4d
commit fc836f6684
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

@ -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