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

Commit 7044f146 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Added new error types for DisplayHashResultCallback" into sc-dev am: 8803f688 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3df85e97f9532fce76df140d42d77f28400073c8
parents e29afdfa 8803f688

core/api/current.txt

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

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 {