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

Commit f68659bb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix domain approval level constants" into sc-dev am: 225b6d0b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13845479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7bd7560ba57949a52a4371184e6b9fb82cbc55d
parents ad047f83 225b6d0b

services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerInternal.java

+4 −4
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ public interface DomainVerificationManagerInternal { 
     * been preserved for migration purposes, but is otherwise ignored. Corresponds to

     * {@link PackageManager#INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS}.

     */

    int APPROVAL_LEVEL_LEGACY_ALWAYS = 1;

    int APPROVAL_LEVEL_LEGACY_ALWAYS = 2;



    /**

     * The app has been chosen by the user through

     * {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID, Set, boolean)},

     * indicating an explicit choice to use this app to open an unverified domain.

     */

    int APPROVAL_LEVEL_SELECTION = 2;

    int APPROVAL_LEVEL_SELECTION = 3;



    /**

     * The app is approved through the digital asset link statement being hosted at the domain
@@ -95,7 +95,7 @@ public interface DomainVerificationManagerInternal { 
     * {@link DomainVerificationManager#setDomainVerificationStatus(UUID, Set, int)} by

     * the domain verification agent on device.

     */

    int APPROVAL_LEVEL_VERIFIED = 3;

    int APPROVAL_LEVEL_VERIFIED = 4;



    /**

     * The app has been installed as an instant app, which grants it total authority on the domains
@@ -105,7 +105,7 @@ public interface DomainVerificationManagerInternal { 
     * The user is still able to disable instant app link handling through

     * {@link DomainVerificationManager#setDomainVerificationLinkHandlingAllowed(String, boolean)}.

     */

    int APPROVAL_LEVEL_INSTANT_APP = 4;

    int APPROVAL_LEVEL_INSTANT_APP = 5;



    /**

     * Defines the possible values for {@link #approvalLevelForDomain(PackageSetting, Intent, int)}