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

Commit 9d3b7f2e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add null check for retrieved package." into rvc-dev am: 997d9eb8 am: dd3b528b 

Change-Id: Id69acd2e5696a4aa61d3b87bc2164d4febd6ce76
parents 9045bdcf dd3b528b

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+7 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.ConcurrentUtils;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.LocalServices;

import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.usage.AppIdleHistory.AppUsageHistory;



import java.io.File;
@@ -1862,10 +1863,15 @@ public class AppStandbyController implements AppStandbyInternal { 


        public List<UserHandle> getValidCrossProfileTargets(String pkg, int userId) {

            final int uid = mPackageManagerInternal.getPackageUidInternal(pkg, 0, userId);

            final AndroidPackage aPkg = mPackageManagerInternal.getPackage(uid);

            if (uid < 0

                    || !mPackageManagerInternal.getPackage(uid).isCrossProfile()

                    || aPkg == null

                    || !aPkg.isCrossProfile()

                    || !mCrossProfileAppsInternal

                            .verifyUidHasInteractAcrossProfilePermission(pkg, uid)) {

                if (uid >= 0 && aPkg == null) {

                    Slog.wtf(TAG, "Null package retrieved for UID " + uid);

                }

                return Collections.emptyList();

            }

            return mCrossProfileAppsInternal.getTargetUserProfiles(pkg, userId);