Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ee5dd4 authored by Anna Zhuravleva's avatar Anna Zhuravleva
Browse files

Add null check for InstallAppInfo 

Bug: 349389119
Test: manual
Flag: EXEMPT bugfix
Change-Id: I0e850491644dffb5ec590403d64c78601489ad4e
parent c8c02fdf

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

+6 −3
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import android.content.pm.IPackageInstallerCallback; 
import android.content.pm.IPackageManager;

import android.content.pm.IShortcutChangeCallback;

import android.content.pm.IncrementalStatesInfo;

import android.content.pm.InstallSourceInfo;

import android.content.pm.LauncherActivityInfoInternal;

import android.content.pm.LauncherApps;

import android.content.pm.LauncherApps.ShortcutQuery;
@@ -1856,9 +1857,11 @@ public class LauncherAppsService extends SystemService { 
        private String getInstallerPackage(@NonNull String packageName, int callingUserId) {

            String installerPackageName = null;

            try {

                installerPackageName =

                        mIPM.getInstallSourceInfo(packageName, callingUserId)

                                .getInstallingPackageName();

                InstallSourceInfo info = mIPM.getInstallSourceInfo(packageName, callingUserId);

                if (info == null) {

                    return installerPackageName;

                }

                installerPackageName = info.getInstallingPackageName();

            } catch (RemoteException re) {

                Slog.e(TAG, "Couldn't find installer for " + packageName, re);

            }