Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check for retrieved package." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-27 18:58:25 +00:00
committed by Android (Google) Code Review
parent d98b964b80 259403ef7f
commit 997d9eb807
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
View File

@@ -110,6 +110,7 @@ import com.android.internal.util.ArrayUtils;
import com.android.internal.util.ConcurrentUtils; import com.android.internal.util.ConcurrentUtils;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import com.android.server.usage.AppIdleHistory.AppUsageHistory; import com.android.server.usage.AppIdleHistory.AppUsageHistory;
import java.io.File; import java.io.File;
@@ -1862,10 +1863,15 @@ public class AppStandbyController implements AppStandbyInternal {
public List<UserHandle> getValidCrossProfileTargets(String pkg, int userId) { public List<UserHandle> getValidCrossProfileTargets(String pkg, int userId) {
final int uid = mPackageManagerInternal.getPackageUidInternal(pkg, 0, userId); final int uid = mPackageManagerInternal.getPackageUidInternal(pkg, 0, userId);
final AndroidPackage aPkg = mPackageManagerInternal.getPackage(uid);
if (uid < 0 if (uid < 0
|| !mPackageManagerInternal.getPackage(uid).isCrossProfile() || aPkg == null
|| !aPkg.isCrossProfile()
|| !mCrossProfileAppsInternal || !mCrossProfileAppsInternal
.verifyUidHasInteractAcrossProfilePermission(pkg, uid)) { .verifyUidHasInteractAcrossProfilePermission(pkg, uid)) {
if (uid >= 0 && aPkg == null) {
Slog.wtf(TAG, "Null package retrieved for UID " + uid);
}
return Collections.emptyList(); return Collections.emptyList();
} }
return mCrossProfileAppsInternal.getTargetUserProfiles(pkg, userId); return mCrossProfileAppsInternal.getTargetUserProfiles(pkg, userId);