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

Commit 0eee410e authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Check outInfo is not null" into jb-mr2-dev

parents 605994d6 3b9933d0

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

+10 −8
Original line number Diff line number Diff line
@@ -8647,8 +8647,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();
@@ -8659,6 +8660,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                }

            }

        }

    }



    /*

     * Tries to delete system package.