am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev

* commit '268f858be57089e568bc55aa9089af54a53dcc94':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
diff --git a/api/current.txt b/api/current.txt
index ece458e..730275f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -26738,10 +26738,8 @@
     method public final boolean hasModifiers(int);
     method public final boolean hasNoModifiers();
     method public final boolean isAltPressed();
-    method public final boolean isCancelKey();
     method public final boolean isCanceled();
     method public final boolean isCapsLockOn();
-    method public final boolean isConfirmKey();
     method public final boolean isCtrlPressed();
     method public final boolean isFunctionPressed();
     method public static final boolean isGamepadButton(int);
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index 7b389c0..214fd12 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1855,6 +1855,7 @@
      * Returns true if the key event should be treated as a confirming action.
      * @return True for a confirmation key, such as {@link #KEYCODE_DPAD_CENTER},
      * {@link #KEYCODE_ENTER}, or {@link #KEYCODE_BUTTON_A}.
+     * @hide
      */
     public final boolean isConfirmKey() {
         switch (mKeyCode) {
@@ -1871,6 +1872,7 @@
      * Returns true if the key event should be treated as a cancelling action.
      * @return True for a cancellation key, such as {@link #KEYCODE_ESCAPE},
      * {@link #KEYCODE_BACK}, or {@link #KEYCODE_BUTTON_B}.
+     * @hide
      */
     public final boolean isCancelKey() {
         switch (mKeyCode) {