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

Merge "Added new error types for DisplayHashResultCallback" into sc-dev

Browse Source
This commit is contained in:
Chavi Weingarten
2021-03-04 21:31:12 +00:00
committed by Android (Google) Code Review
parent 413d2573b3 d4a7330b7c
commit 8803f688ab
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -51015,6 +51015,7 @@ package android.view.displayhash {
method public void onDisplayHashError(int); method public void onDisplayHashError(int);
method public void onDisplayHashResult(@NonNull android.view.displayhash.DisplayHash); method public void onDisplayHashResult(@NonNull android.view.displayhash.DisplayHash);
field public static final int DISPLAY_HASH_ERROR_INVALID_BOUNDS = -2; // 0xfffffffe field public static final int DISPLAY_HASH_ERROR_INVALID_BOUNDS = -2; // 0xfffffffe
field public static final int DISPLAY_HASH_ERROR_INVALID_HASH_ALGORITHM = -5; // 0xfffffffb
field public static final int DISPLAY_HASH_ERROR_MISSING_WINDOW = -3; // 0xfffffffd field public static final int DISPLAY_HASH_ERROR_MISSING_WINDOW = -3; // 0xfffffffd
field public static final int DISPLAY_HASH_ERROR_NOT_VISIBLE_ON_SCREEN = -4; // 0xfffffffc field public static final int DISPLAY_HASH_ERROR_NOT_VISIBLE_ON_SCREEN = -4; // 0xfffffffc
field public static final int DISPLAY_HASH_ERROR_UNKNOWN = -1; // 0xffffffff field public static final int DISPLAY_HASH_ERROR_UNKNOWN = -1; // 0xffffffff

9
core/java/android/view/displayhash/DisplayHashResultCallback.java
View File

@@ -66,12 +66,19 @@ public interface DisplayHashResultCallback {
*/ */
int DISPLAY_HASH_ERROR_NOT_VISIBLE_ON_SCREEN = -4; int DISPLAY_HASH_ERROR_NOT_VISIBLE_ON_SCREEN = -4;
/**
* The hash algorithm sent to generate the hash was invalid. This means the value is not one
* of the supported values in {@link DisplayHashManager#getSupportedHashAlgorithms()}
*/
int DISPLAY_HASH_ERROR_INVALID_HASH_ALGORITHM = -5;
/** @hide */ /** @hide */
@IntDef(prefix = {"DISPLAY_HASH_ERROR_"}, value = { @IntDef(prefix = {"DISPLAY_HASH_ERROR_"}, value = {
DISPLAY_HASH_ERROR_UNKNOWN, DISPLAY_HASH_ERROR_UNKNOWN,
DISPLAY_HASH_ERROR_INVALID_BOUNDS, DISPLAY_HASH_ERROR_INVALID_BOUNDS,
DISPLAY_HASH_ERROR_MISSING_WINDOW, DISPLAY_HASH_ERROR_MISSING_WINDOW,
DISPLAY_HASH_ERROR_NOT_VISIBLE_ON_SCREEN DISPLAY_HASH_ERROR_NOT_VISIBLE_ON_SCREEN,
DISPLAY_HASH_ERROR_INVALID_HASH_ALGORITHM
}) })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@interface DisplayHashErrorCode { @interface DisplayHashErrorCode {