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

Commit 0a853442 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make error message readable." into tm-dev am: fadb0863 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17110250

Change-Id: I3cf56f4266fb8348bef405d8b4c636f203e449e7
parents 0f04cff9 fadb0863

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

+4 −3
Original line number Diff line number Diff line
@@ -3532,8 +3532,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
        final Boolean granted =

                SystemConfig.getInstance().getOemPermissions(pkg.getPackageName()).get(permission);

        if (granted == null) {

            throw new IllegalStateException("OEM permission" + permission + " requested by package "

                    + pkg.getPackageName() + " must be explicitly declared granted or not");

            throw new IllegalStateException("OEM permission " + permission

                    + " requested by package " + pkg.getPackageName()

                    + " must be explicitly declared granted or not");

        }

        return Boolean.TRUE == granted;

    }