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

Change the location of Brandmaster statement file.

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

BUG=21153250

Change-Id: Ie8538b852d62c54254c895e0abadc7f502ea2181
This commit is contained in:
Joseph Wen
2015-05-14 14:13:11 -04:00
parent fdf9f40cb8
commit d28bb6e3ac
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/StatementService/src/com/android/statementservice/retriever/AbstractStatementRetriever.java
View File

@@ -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.
*

2
packages/StatementService/src/com/android/statementservice/retriever/DirectStatementRetriever.java
View File

@@ -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;

2
packages/StatementService/src/com/android/statementservice/retriever/Statement.java
View File

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