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

Commit 2c2859bb authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge "Allow app be installed if the sdk-library dependency doesn't exist" into main

parents 7913f8b3 255c22c9

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

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.pm;



import static android.content.pm.Flags.sdkLibIndependence;

import static android.content.pm.PackageManager.INSTALL_FAILED_MISSING_SHARED_LIBRARY;

import static android.content.pm.PackageManager.INSTALL_FAILED_SHARED_LIBRARY_BAD_CERTIFICATE_DIGEST;
@@ -951,10 +952,12 @@ public final class SharedLibrariesImpl implements SharedLibrariesRead, Watchable 
            }

        }

        if (!pkg.getUsesSdkLibraries().isEmpty()) {

            // Allow installation even if sdk-library dependency doesn't exist

            boolean required = !sdkLibIndependence();

            usesLibraryInfos = collectSharedLibraryInfos(pkg.getUsesSdkLibraries(),

                    pkg.getUsesSdkLibrariesVersionsMajor(), pkg.getUsesSdkLibrariesCertDigests(),

                    pkg.getPackageName(), "sdk", true, pkg.getTargetSdkVersion(), usesLibraryInfos,

                    availablePackages, newLibraries);

                    pkg.getPackageName(), "sdk", required, pkg.getTargetSdkVersion(),

                    usesLibraryInfos, availablePackages, newLibraries);

        }

        return usesLibraryInfos;

    }