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

Commit 8803f688 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

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

parents 413d2573 d4a7330b

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -51015,6 +51015,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

core/java/android/view/displayhash/DisplayHashResultCallback.java

+8 −1
Original line number Diff line number Diff line
@@ -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 {