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

Commit aa3ab79c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Tweak the adb verification logic." into udc-dev am: f7219b1e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22359783



Change-Id: If6fa587961b84c24427429bd29193d51308f7fdb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f198c12d f7219b1e

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

+18 −5
Original line number Diff line number Diff line
@@ -652,20 +652,33 @@ final class VerifyingSession { 


    private boolean isAdbVerificationEnabled(PackageInfoLite pkgInfoLite, int userId,

            boolean requestedDisableVerification) {

        boolean verifierIncludeAdb = android.provider.Settings.Global.getInt(

                mPm.mContext.getContentResolver(),

                android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0;



        if (mPm.isUserRestricted(userId, UserManager.ENSURE_VERIFY_APPS)) {

            if (!verifierIncludeAdb) {

                Slog.w(TAG, "Force verification of ADB install because of user restriction.");

            }

            return true;

        }

        // Check if the developer wants to skip verification for ADB installs



        // Check if the verification disabled globally, first.

        if (!verifierIncludeAdb) {

            return false;

        }



        // Check if the developer wants to skip verification for ADB installs.

        if (requestedDisableVerification) {

            if (!packageExists(pkgInfoLite.packageName)) {

                // Always verify fresh install

                // Always verify fresh install.

                return true;

            }

            // Only skip when apk is debuggable

            // Only skip when apk is debuggable.

            return !pkgInfoLite.debuggable;

        }

        return android.provider.Settings.Global.getInt(mPm.mContext.getContentResolver(),

                android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0;



        return true;

    }



    /**