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

Commit 1fb3a312 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Fix broken javadocs." into oc-mr1-dev am: b79eb54d 

am: 1ad38fe2

Change-Id: I21266d20be036196dbeddb9c4366d641ab1b68a8
parents 31c85e63 1ad38fe2

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since $(SRC_API_DIR)/24.txt 24 \

    -since $(SRC_API_DIR)/25.txt 25 \

    -since $(SRC_API_DIR)/26.txt 26 \

    -werror -hide 111 -hide 113 -hide 121 \

    -werror -lerror -hide 111 -hide 113 -hide 121 -hide 125 -hide 126 -hide 127 -hide 128 \

    -overview $(LOCAL_PATH)/core/java/overview.html \



framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -15859,7 +15859,6 @@ package android.hardware.fingerprint { 
    field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4

    field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3

    field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2

    field public static final int FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6; // 0x6

    field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8

  }

























api/system-current.txt



+0
−1






























Original line number
Diff line number
Diff line








@@ -16676,7 +16676,6 @@ package android.hardware.fingerprint {













    field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4















    field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3















    field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2













    field public static final int FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6; // 0x6















    field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8















  }







































api/test-current.txt



+0
−1






























Original line number
Diff line number
Diff line








@@ -15937,7 +15937,6 @@ package android.hardware.fingerprint {













    field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4















    field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3















    field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2













    field public static final int FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6; // 0x6















    field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8















  }







































core/java/android/accessibilityservice/AccessibilityService.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -612,7 +612,7 @@ public abstract class AccessibilityService extends Service {





























    /**















     * Get the controller for fingerprint gestures. This feature requires {@link













     * AccessibilityServiceInfo#CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES}.













     * AccessibilityServiceInfo#CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES}.















     *















     *<strong>Note: </strong> The service must be connected before this method is called.















     *