Merge "Fix NPE in registerLoadingProgressForIncrementalApps" into main (e1742bbe) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/LauncherAppsService.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2209,8 +2209,10 @@ public class LauncherAppsService extends SystemService {
	for (UserHandle user : users) {		for (UserHandle user : users) {
	mPackageManagerInternal.forEachInstalledPackage(pkg -> {		mPackageManagerInternal.forEachInstalledPackage(pkg -> {
	final String packageName = pkg.getPackageName();		final String packageName = pkg.getPackageName();
	if (mPackageManagerInternal.getIncrementalStatesInfo(packageName,		final IncrementalStatesInfo info =
	Process.myUid(), user.getIdentifier()).isLoading()) {		mPackageManagerInternal.getIncrementalStatesInfo(packageName,
			Process.myUid(), user.getIdentifier());
			if (info != null && info.isLoading()) {
	mPackageManagerInternal.registerInstalledLoadingProgressCallback(		mPackageManagerInternal.registerInstalledLoadingProgressCallback(
	packageName, new PackageLoadingProgressCallback(packageName, user),		packageName, new PackageLoadingProgressCallback(packageName, user),
	user.getIdentifier());		user.getIdentifier());