Merge "Fix NPE when PermissionEntry.getGids() returns null." into main (67e16859) · Commits · e / os / android_frameworks_base

services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt

+7 −2

Original line number	Diff line number	Diff line
		@@ -590,10 +590,15 @@ class AppIdPermissionPolicy : SchemePolicy() {
		var areGidsPerUser = false
		if (!parsedPermission.isTree && packageState.isSystem) {
		newState.externalState.configPermissions[permissionName]?.let {
		// PermissionEntry.gids may return null when parsing legacy config trying
		// to work around an issue about upgrading from L platfrm. We can just
		// ignore such entries now.
		if (it.gids != null) {
		gids = it.gids
		areGidsPerUser = it.perUser
		}
		}
		}
		newPermission = Permission(
		newPermissionInfo,
		true,