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

Merge "null check"

Browse Source
This commit is contained in:
Todd Kennedy
2017-01-23 16:47:41 +00:00
committed by Android (Google) Code Review
parent a2feb80b83 540dcb222e
commit 22040a537a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -3449,7 +3449,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
private boolean filterSharedLibPackageLPr(PackageSetting ps, int uid, int userId) {
private boolean filterSharedLibPackageLPr(@Nullable PackageSetting ps, int uid, int userId) {
// System/shell/root get to see all static libs
final int appId = UserHandle.getAppId(uid);
if (appId == Process.SYSTEM_UID || appId == Process.SHELL_UID
@@ -3458,7 +3458,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
// No package means no static lib as it is always on internal storage
if (ps.pkg == null || !ps.pkg.applicationInfo.isStaticSharedLibrary()) {
if (ps == null || ps.pkg == null || !ps.pkg.applicationInfo.isStaticSharedLibrary()) {
return false;
}