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

Merge "Check for null in applyDefiningSharedLibraryUpdateLocked."

Browse Source 
am: 801862313f

Change-Id: I5beab35e1d6fda02895e9479015f4ea2276be5c1
This commit is contained in:
Nicolas Geoffray
2018-11-16 04:46:27 -08:00
committed by android-build-merger
parent a835f23f47 801862313f
commit 0407b12c00
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9483,7 +9483,7 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
private SharedLibraryInfo getSharedLibraryInfoLPr(String name, long version) { private @Nullable SharedLibraryInfo getSharedLibraryInfoLPr(String name, long version) {
LongSparseArray<SharedLibraryInfo> versionedLib = mSharedLibraries.get(name); LongSparseArray<SharedLibraryInfo> versionedLib = mSharedLibraries.get(name);
if (versionedLib == null) { if (versionedLib == null) {
return null; return null;
@@ -9728,16 +9728,26 @@ public class PackageManagerService extends IPackageManager.Stub
private void applyDefiningSharedLibraryUpdateLocked( private void applyDefiningSharedLibraryUpdateLocked(
PackageParser.Package pkg, SharedLibraryInfo libInfo, PackageParser.Package pkg, SharedLibraryInfo libInfo,
BiConsumer<SharedLibraryInfo, SharedLibraryInfo> action) { BiConsumer<SharedLibraryInfo, SharedLibraryInfo> action) {
// Note that libraries defined by this package may be null if:
// - Package manager was unable to create the shared library. The package still
// gets installed, but the shared library does not get created.
// Or:
// - Package manager is in a state where package isn't scanned yet. This will
// get called again after scanning to fix the dependencies.
if (pkg.isLibrary()) { if (pkg.isLibrary()) {
if (pkg.staticSharedLibName != null) { if (pkg.staticSharedLibName != null) {
SharedLibraryInfo definedLibrary = getSharedLibraryInfoLPr( SharedLibraryInfo definedLibrary = getSharedLibraryInfoLPr(
pkg.staticSharedLibName, pkg.staticSharedLibVersion); pkg.staticSharedLibName, pkg.staticSharedLibVersion);
action.accept(definedLibrary, libInfo); if (definedLibrary != null) {
action.accept(definedLibrary, libInfo);
}
} else { } else {
for (String libraryName : pkg.libraryNames) { for (String libraryName : pkg.libraryNames) {
SharedLibraryInfo definedLibrary = getSharedLibraryInfoLPr( SharedLibraryInfo definedLibrary = getSharedLibraryInfoLPr(
libraryName, SharedLibraryInfo.VERSION_UNDEFINED); libraryName, SharedLibraryInfo.VERSION_UNDEFINED);
action.accept(definedLibrary, libInfo); if (definedLibrary != null) {
action.accept(definedLibrary, libInfo);
}
} }
} }
} }