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

am 3f96209d: am bb1586c1: Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev

Browse Source 
* commit '3f96209d8791524f1d5df8ae23fffaeaa8725c47':
  TIF: Temporarily disable permission check for parental controls
This commit is contained in:
Jae Seo
2014-08-13 04:26:04 +00:00
committed by Android Git Automerger
parent 3ca0fb8e1d e9c39d0868
commit fe90d78e54
1 changed files with 7 additions and 6 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,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