From d85a66420244eea14588cabf8373cd90e0a6ca49 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Fri, 17 Jul 2015 15:39:08 -0700 Subject: [PATCH] Don't fall back to domain verification state when looking up app linkage state This is in support of the always/never/ask UI tweaks in Settings: any "assume always" fallback at the verification layer should not be conflated with the user-facing semantic toggle. This was causing the UI to report apps as being in the 'always open their links' state inappropriately. Bug 22532193 Change-Id: Iaa4bc3a2d5db814e1b0d96bc1c4ecfaafb1e3105 --- services/core/java/com/android/server/pm/Settings.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 312b7b37d732..279608c31a2e 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -1056,13 +1056,7 @@ final class Settings { } return INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; } - int status = (int)(ps.getDomainVerificationStatusForUser(userId) >> 32); - if (status == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED) { - if (ps.getIntentFilterVerificationInfo() != null) { - status = ps.getIntentFilterVerificationInfo().getStatus(); - } - } - return status; + return (int)(ps.getDomainVerificationStatusForUser(userId) >> 32); } boolean updateIntentFilterVerificationStatusLPw(String packageName, final int status, int userId) { -- 2.11.0