diff options
| author | Joseph Wen <josephwen@google.com> | 2015-05-14 14:13:11 -0400 |
|---|---|---|
| committer | Joseph Wen <josephwen@google.com> | 2015-05-14 16:11:10 -0400 |
| commit | d28bb6e3ac02ff9e7c6f8a38419957035ca31717 (patch) | |
| tree | ca1d07a9f34cf6a11c963f500612bfc08c342703 /packages/StatementService | |
| parent | fdf9f40cb8ca35a1d56d8cde494c6ed9602b4e48 (diff) | |
| download | frameworks_base-d28bb6e3ac02ff9e7c6f8a38419957035ca31717.zip frameworks_base-d28bb6e3ac02ff9e7c6f8a38419957035ca31717.tar.gz frameworks_base-d28bb6e3ac02ff9e7c6f8a38419957035ca31717.tar.bz2 | |
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
Diffstat (limited to 'packages/StatementService')
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/StatementService/src/com/android/statementservice/retriever/AbstractStatementRetriever.java b/packages/StatementService/src/com/android/statementservice/retriever/AbstractStatementRetriever.java index fb30bc1..3b59fd6 100644 --- a/packages/StatementService/src/com/android/statementservice/retriever/AbstractStatementRetriever.java +++ b/packages/StatementService/src/com/android/statementservice/retriever/AbstractStatementRetriever.java @@ -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. * diff --git a/packages/StatementService/src/com/android/statementservice/retriever/DirectStatementRetriever.java b/packages/StatementService/src/com/android/statementservice/retriever/DirectStatementRetriever.java index 3ad71c4..6516516 100644 --- a/packages/StatementService/src/com/android/statementservice/retriever/DirectStatementRetriever.java +++ b/packages/StatementService/src/com/android/statementservice/retriever/DirectStatementRetriever.java @@ -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; diff --git a/packages/StatementService/src/com/android/statementservice/retriever/Statement.java b/packages/StatementService/src/com/android/statementservice/retriever/Statement.java index f83edaf..da3c355 100644 --- a/packages/StatementService/src/com/android/statementservice/retriever/Statement.java +++ b/packages/StatementService/src/com/android/statementservice/retriever/Statement.java @@ -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> * { |