diff options
| author | Christopher Tate <ctate@google.com> | 2015-07-20 17:05:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-20 17:05:32 +0000 |
| commit | 6afdad7e8863cb1fa3db5909e48269606fa76991 (patch) | |
| tree | 0e4b4fcc6f80c305861db92f906df9a2ab488087 /services | |
| parent | 29cf9aea5490c42b85aaaa98b6784daff82629f8 (diff) | |
| parent | d85a66420244eea14588cabf8373cd90e0a6ca49 (diff) | |
| download | frameworks_base-6afdad7e8863cb1fa3db5909e48269606fa76991.zip frameworks_base-6afdad7e8863cb1fa3db5909e48269606fa76991.tar.gz frameworks_base-6afdad7e8863cb1fa3db5909e48269606fa76991.tar.bz2 | |
Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/Settings.java | 8 |
1 files changed, 1 insertions, 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 96ec5aa..92b9da6 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -1078,13 +1078,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) { |