Merge "Always update the permissions being delegated as Shell."

                    throw new SecurityException("Shell can delegate permissions only "

                    throw new SecurityException("Shell can delegate permissions only "

                            + "to one instrumentation at a time");

                            + "to one instrumentation at a time");

                }

                }

                delegate.setPermissions(permissions);

                return;

            }

            }

            final int instrCount = mActiveInstrumentation.size();

            final int instrCount = mActiveInstrumentation.size();

    private class ShellDelegate implements CheckOpsDelegate {

    private class ShellDelegate implements CheckOpsDelegate {

        private final int mTargetUid;

        private final int mTargetUid;

        private @Nullable String[] mPermissions;

        @Nullable

        private final String[] mPermissions;

        ShellDelegate(int targetUid, @Nullable String[] permissions) {

        ShellDelegate(int targetUid, @Nullable String[] permissions) {

            mTargetUid = targetUid;

            mTargetUid = targetUid;

            return mTargetUid;

            return mTargetUid;

        }

        }

        void setPermissions(@Nullable String[] permissions) {

            mPermissions = permissions;

            PackageManager.invalidatePackageInfoCache();

        }

        @Override

        @Override

        public int checkOperation(int code, int uid, String packageName, boolean raw,

        public int checkOperation(int code, int uid, String packageName, boolean raw,

                QuadFunction<Integer, Integer, String, Boolean, Integer> superImpl) {

                QuadFunction<Integer, Integer, String, Boolean, Integer> superImpl) {