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

Commit 712d0f7d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't allow verifier timeout to be reduced."

parents e2a51d2d ee70fcb0

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

+5 −3
Original line number Diff line number Diff line
@@ -13212,9 +13212,11 @@ public class PackageManagerService extends IPackageManager.Stub 
     * @return verification timeout in milliseconds

     */

    private long getVerificationTimeout() {

        return android.provider.Settings.Global.getLong(mContext.getContentResolver(),

                android.provider.Settings.Global.PACKAGE_VERIFIER_TIMEOUT,

                DEFAULT_VERIFICATION_TIMEOUT);

        long timeout = Global.getLong(mContext.getContentResolver(),

                Global.PACKAGE_VERIFIER_TIMEOUT, DEFAULT_VERIFICATION_TIMEOUT);

        // The setting can be used to increase the timeout but not decrease it, since that is

        // equivalent to disabling the verifier.

        return Math.max(timeout, DEFAULT_VERIFICATION_TIMEOUT);

    }















    /**