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

Commit c3ad6422 authored by Chris Tate's avatar Chris Tate Committed by Vasyl Gello
Browse files

Revert "Revoke 'always' web handler status when not autoverifying" 

This reverts commit f697cd3b.

Reason for revert: Inadvertently broke link handling stickiness even for well behaved apps

Bug: 146204120
Test: install app that handles web urls; set to 'always' in Settings;
install same apk again.  Verify that app is still in 'always' state via
'adb shell dumpsys package d'

Merged-In: If9046cb420961b8ef0333e9f1115eb69fb92242e
Change-Id: I36d9c352e741e88b9fc773b084bef3991b6d96ed
parent 6b94d503

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

+11 −33
Original line number Diff line number Diff line
@@ -15565,47 +15565,35 @@ public class PackageManagerService extends IPackageManager.Stub { 
        int count = 0;

        final String packageName = pkg.packageName;













        boolean handlesWebUris = false;













        final boolean alreadyVerified;















        synchronized (mPackages) {















            // If this is a new install and we see that we've already run verification for this















            // package, we have nothing to do: it means the state was restored from backup.













            final IntentFilterVerificationInfo ivi =













            if (!replacing) {













                IntentFilterVerificationInfo ivi =















                        mSettings.getIntentFilterVerificationLPr(packageName);













            alreadyVerified = (ivi != null);













            if (!replacing && alreadyVerified) {













                if (ivi != null) {















                    if (DEBUG_DOMAIN_VERIFICATION) {















                        Slog.i(TAG, "Package " + packageName+ " already verified: status="















                                + ivi.getStatusString());















                    }















                    return;















                }













            }



























            // If any filters need to be verified, then all need to be.  In addition, we need to













            // know whether an updating app has any web navigation intent filters, to re-













            // examine handling policy even if not re-verifying.













            // If any filters need to be verified, then all need to be.















            boolean needToVerify = false;















            for (PackageParser.Activity a : pkg.activities) {















                for (ActivityIntentInfo filter : a.intents) {













                    if (filter.handlesWebUris(true)) {













                        handlesWebUris = true;













                    }















                    if (filter.needsVerification() && needsNetworkVerificationLPr(filter)) {















                        if (DEBUG_DOMAIN_VERIFICATION) {















                            Slog.d(TAG, "Intent filter needs verification, so processing all filters");















                        }















                        needToVerify = true;













                        // It's safe to break out here because filter.needsVerification()













                        // can only be true if filter.handlesWebUris(true) returns true, so













                        // we've already noted that.















                        break;















                    }















                }















            }



























            // Note whether this app publishes any web navigation handling support at all,













            // and whether there are any web-nav filters that fit the profile for running













            // a verification pass now.















            if (needToVerify) {















                final int verificationId = mIntentFilterVerificationToken++;















                for (PackageParser.Activity a : pkg.activities) {









@@ -15625,23 +15613,13 @@ public class PackageManagerService extends IPackageManager.Stub {













        }





























        if (count > 0) {













            // count > 0 means that we're running a full verification pass















            if (DEBUG_DOMAIN_VERIFICATION) Slog.d(TAG, "Starting " + count















                    + " IntentFilter verification" + (count > 1 ? "s" : "")















                    +  " for userId:" + userId);















            mIntentFilterVerifier.startVerifications(userId);













        } else if (alreadyVerified && handlesWebUris) {













            // App used autoVerify in the past, no longer does, but still handles web













            // navigation starts.













            if (DEBUG_DOMAIN_VERIFICATION) {













                Slog.d(TAG, "App changed web filters but no longer verifying - resetting policy");













            }













            synchronized (mPackages) {













                clearIntentFilterVerificationsLPw(packageName, userId);













            }















        } else {















            if (DEBUG_DOMAIN_VERIFICATION) {













                Slog.d(TAG, "No web filters or no prior verify policy for " + packageName);













                Slog.d(TAG, "No filters or not all autoVerify for " + packageName);















            }















        }















    }

























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



+0
−1




























Original line number
Diff line number
Diff line








@@ -1331,7 +1331,6 @@ final class Settings {













            return false;















        }















        ps.clearDomainVerificationStatusForUser(userId);













        ps.setIntentFilterVerificationInfo(null);















        return true;















    }