Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev

Browse Source
This commit is contained in:
Christopher Tate
2015-07-20 17:05:27 +00:00
committed by Android (Google) Code Review
parent 29cf9aea54 d85a664202
commit 6afdad7e88
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/Settings.java
View File

@@ -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) {