Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev (e253fabb) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/tv/TvInputManagerService.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -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