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

Commit 75d15097 authored by Joseph Wen's avatar Joseph Wen Committed by The Android Automerger
Browse files

Change the location of Brandmaster statement file. 

Change the location of statement file for web asset
from /.well-known/associations.json to /.well-known/statements.json.

BUG=21153250

Change-Id: Ie8538b852d62c54254c895e0abadc7f502ea2181
parent d2aac451

core/res/res/values/attrs_manifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ 
         intern filter data scheme is set to "http" or "https". When set to true, the intent filter

         will need to use its data tag for getting the URIs to verify with.



         For each URI, an HTTPS network request will be done to <code>/.well-known/associations.json</code>

         For each URI, an HTTPS network request will be done to <code>/.well-known/statements.json</code>

         host to verify that the web site is okay with the app intercepting the URI.

         -->

    <attr name="autoVerify" format="boolean" />

packages/StatementService/src/com/android/statementservice/retriever/AbstractStatementRetriever.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public abstract class AbstractStatementRetriever { 
     * Creates a new StatementRetriever that directly retrieves statements from the asset.

     *

     * <p> For web assets, {@link AbstractStatementRetriever} will try to retrieve the statement

     * file from URL: {@code [webAsset.site]/.well-known/associations.json"} where {@code

     * file from URL: {@code [webAsset.site]/.well-known/statements.json"} where {@code

     * [webAsset.site]} is in the form {@code http{s}://[hostname]:[optional_port]}. The file

     * should contain one JSON array of statements.

     *

packages/StatementService/src/com/android/statementservice/retriever/DirectStatementRetriever.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import java.util.List; 
    private static final int HTTP_CONNECTION_TIMEOUT_MILLIS = 5000;

    private static final long HTTP_CONTENT_SIZE_LIMIT_IN_BYTES = 1024 * 1024;

    private static final int MAX_INCLUDE_LEVEL = 1;

    private static final String WELL_KNOWN_STATEMENT_PATH = "/.well-known/associations.json";

    private static final String WELL_KNOWN_STATEMENT_PATH = "/.well-known/statements.json";



    private final URLFetcher mUrlFetcher;

    private final AndroidPackageInfoFetcher mAndroidFetcher;

packages/StatementService/src/com/android/statementservice/retriever/Statement.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.annotation.NonNull; 
/**

 * An immutable value type representing a statement, consisting of a source, target, and relation.

 * This reflects an assertion that the relation holds for the source, target pair. For example, if a

 * web site has the following in its associations.json file:

 * web site has the following in its statements.json file:

 *

 * <pre>

 * {