Merge "Refactor checkAddPermission"