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

Commit cc5fdf74 authored by Nicholas Sauer's avatar Nicholas Sauer Committed by android-build-merger
Browse files

Merge "Check for null in getDeviceOwnerOrProfileOwnerPackage" into qt-qpr1-dev 

am: 50d6c5a6

Change-Id: Ie670f51eb5842975ff024d64adf249b8c897d789
parents a8b72cbf 50d6c5a6

services/core/java/com/android/server/pm/ProtectedPackages.java

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ public class ProtectedPackages { 
        if (mDeviceOwnerUserId == userId) {

            return mDeviceOwnerPackage;

        }

        if (mProfileOwnerPackages == null) {

            return null;

        }

        return mProfileOwnerPackages.get(userId);

    }