Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22fdd1d2 authored by Jae Seo's avatar Jae Seo Committed by Android Git Automerger
Browse files

am 4f14930b: am 16b98b6f: Merge "Revert "TIF: Temporarily disable permission... 

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

* commit '4f14930bce11b1efeb36c16d3e35f9a9ff981fa2':
  Revert "TIF: Temporarily disable permission check for parental controls"
parents 5bb6b996 0a2551d0

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

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