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 am: 8803f688ab

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3df85e97f9532fce76df140d42d77f28400073c8
This commit is contained in:
Chavi Weingarten
2021-03-04 23:06:36 +00:00
committed by Automerger Merge Worker
parent e29afdfa53 8803f688ab
commit 7044f1467d
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

@@ -51021,6 +51021,7 @@ package android.view.displayhash {
method public void onDisplayHashError(int);
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_HASH_ALGORITHM = -5; // 0xfffffffb
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_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;
/**
* 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 */
@IntDef(prefix = {"DISPLAY_HASH_ERROR_"}, value = {
DISPLAY_HASH_ERROR_UNKNOWN,
DISPLAY_HASH_ERROR_INVALID_BOUNDS,
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)
@interface DisplayHashErrorCode {