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

Commit caf0496d authored by Kenny Root's avatar Kenny Root Committed by Gerrit Code Review
Browse files

Merge "Check outInfo is not null"

parents 68913baf fc78e60a

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

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

                mSettings.writeLPr();

            }

            }

        }

        }

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

        if (outInfo != null) {

        // KeyStore.

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

            // from KeyStore.

            final int appId = outInfo.removedAppId;

            final int appId = outInfo.removedAppId;

            if (appId != -1) {

            if (appId != -1) {

                final KeyStore keyStore = KeyStore.getInstance();

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

                }

            }

            }

        }

        }

    }





    /*

    /*

     * Tries to delete system package.

     * Tries to delete system package.