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

Commit fc78e60a authored by Kenny Root's avatar Kenny Root
Browse files

Check outInfo is not null 

Only call keystore if outInfo is not null

(cherry picked from commit 3b9933d0)

Bug: 8568820
Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28
parent 68913baf

services/java/com/android/server/pm/PackageManagerService.java

+10 −8
Original line number Diff line number Diff line
@@ -8221,8 +8221,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
                mSettings.writeLPr();

            }

        }

        // A user ID was deleted here. Go through all users and remove it from

        // KeyStore.

        if (outInfo != null) {

            // A user ID was deleted here. Go through all users and remove it

            // from KeyStore.

            final int appId = outInfo.removedAppId;

            if (appId != -1) {

                final KeyStore keyStore = KeyStore.getInstance();
@@ -8233,6 +8234,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                }

            }

        }

    }



    /*

     * Tries to delete system package.