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

Commit 745f3803 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am eddb6c00: am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to... 

am eddb6c00: am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev

* commit 'eddb6c00':
  Don't fall back to domain verification state when looking up app linkage state
parents e2059303 eddb6c00

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -1081,13 +1081,7 @@ final class Settings { 
            }

            }

            return INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;

            return INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;

        }

        }

        int status = (int)(ps.getDomainVerificationStatusForUser(userId) >> 32);

        return (int)(ps.getDomainVerificationStatusForUser(userId) >> 32);

        if (status == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED) {

            if (ps.getIntentFilterVerificationInfo() != null) {

                status = ps.getIntentFilterVerificationInfo().getStatus();

            }

        }

        return status;

    }

    }





    boolean updateIntentFilterVerificationStatusLPw(String packageName, final int status, int userId) {

    boolean updateIntentFilterVerificationStatusLPw(String packageName, final int status, int userId) {