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

Commit c21e2cb6 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am b3be67ce: am 0eee410e: Merge "Check outInfo is not null" into jb-mr2-dev 

* commit 'b3be67ce':
  Check outInfo is not null
parents f4bb4a2e b3be67ce

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

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

            }

        }

    }



    /*

     * Tries to delete system package.