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

Commit d3746933 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adds logging when shell permissions are adopted"

parents eabc24ac 08656ffa

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -19296,6 +19296,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
            // null permissions means all permissions are targeted

            return (mPermissions == null || ArrayUtils.contains(mPermissions, permission));

        }













        @Override













        public String toString() {













            return "ShellDelegate{targetPackageName=" + mTargetPackageName













                    + ", permissions=" + mPermissions + "}";













        }















    }





























    /**

























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



+1
−0




























Original line number
Diff line number
Diff line








@@ -4283,6 +4283,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {













        public void setCheckPermissionDelegate(CheckPermissionDelegate delegate) {















            synchronized (mLock) {















                mCheckPermissionDelegate = delegate;













                Slog.d(TAG, "CheckPermissionDelegate set to " + delegate);















            }















        }