am 38b7ea4c: Merge "GID-based permissions are defined by "android"." into lmp-dev

* commit '38b7ea4cf1b3cf5dfc6e7c59a5a37e8f8f6bf098':
  GID-based permissions are defined by "android".
This commit is contained in:
Jeff Sharkey
2014-08-10 23:15:22 +00:00
committed by Android Git Automerger

View File

@@ -1346,7 +1346,7 @@ public class PackageManagerService extends IPackageManager.Stub {
SystemConfig.PermissionEntry perm = permConfig.valueAt(i);
BasePermission bp = mSettings.mPermissions.get(perm.name);
if (bp == null) {
bp = new BasePermission(perm.name, null, BasePermission.TYPE_BUILTIN);
bp = new BasePermission(perm.name, "android", BasePermission.TYPE_BUILTIN);
mSettings.mPermissions.put(perm.name, bp);
}
if (perm.gids != null) {