Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4f14930b: am 16b98b6f: Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev

Browse Source 
* commit '4f14930bce11b1efeb36c16d3e35f9a9ff981fa2':
  Revert "TIF: Temporarily disable permission check for parental controls"
This commit is contained in:
Jae Seo
2014-08-27 04:20:25 +00:00
committed by Android Git Automerger
parent 5bb6b996d4 0a2551d0c1
commit 22fdd1d2ec
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

@@ -1019,13 +1019,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