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

Commit ee70fcb0 authored by Alan Stokes's avatar Alan Stokes
Browse files

Don't allow verifier timeout to be reduced. 

Ignore any attempt to set the verifier timeout to less than the
default value, since that effectively allows the verifier to be
disabled.

Bug: 135751498
Test: atest PackageVerifierTest
Change-Id: I998fe560e90639967dd6adb86b1007a24b49119a
parent 12812746

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

+5 −3
Original line number Diff line number Diff line
@@ -13224,9 +13224,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);

    }















    /**