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

Commit 46449b8b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running... 

am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev

* commit 'd31db759':
  Fix issue #9000597: PackageManager get NPE while running performance plan
parents b4667497 d31db759

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

+2 −2
Original line number Diff line number Diff line
@@ -8120,7 +8120,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            allUsers = sUserManager.getUserIds();

            perUserInstalled = new boolean[allUsers.length];

            for (int i = 0; i < allUsers.length; i++) {

                perUserInstalled[i] = ps.getInstalled(allUsers[i]);

                perUserInstalled[i] = ps != null ? ps.getInstalled(allUsers[i]) : false;

            }

        }

        boolean sysPkg = (isSystemApp(oldPackage));
@@ -8689,7 +8689,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            allUsers = sUserManager.getUserIds();

            perUserInstalled = new boolean[allUsers.length];

            for (int i = 0; i < allUsers.length; i++) {

                perUserInstalled[i] = ps.getInstalled(allUsers[i]);

                perUserInstalled[i] = ps != null ? ps.getInstalled(allUsers[i]) : false;

            }

        }