summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/api/current.txt2
-rw-r--r--core/java/android/hardware/input/input_framework.aconfig8
-rw-r--r--core/java/android/view/MotionEvent.java4
3 files changed, 1 insertions, 13 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index b00c8985eeac..012a2e62755c 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -52229,7 +52229,7 @@ package android.view {
method public void clear();
method public void copyFrom(android.view.MotionEvent.PointerCoords);
method public float getAxisValue(int);
- method @FlaggedApi("com.android.hardware.input.pointer_coords_is_resampled_api") public boolean isResampled();
+ method public boolean isResampled();
method public void setAxisValue(int, float);
field public float orientation;
field public float pressure;
diff --git a/core/java/android/hardware/input/input_framework.aconfig b/core/java/android/hardware/input/input_framework.aconfig
index f03a4a954842..66697546a24a 100644
--- a/core/java/android/hardware/input/input_framework.aconfig
+++ b/core/java/android/hardware/input/input_framework.aconfig
@@ -27,14 +27,6 @@ flag {
flag {
namespace: "input_native"
- name: "pointer_coords_is_resampled_api"
- is_exported: true
- description: "Makes MotionEvent.PointerCoords#isResampled() a public API"
- bug: "298197511"
-}
-
-flag {
- namespace: "input_native"
name: "emoji_and_screenshot_keycodes_available"
is_exported: true
description: "Add new KeyEvent keycodes for opening Emoji Picker and Taking Screenshots"
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index 326e34b258e5..bd6ff4c2af02 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -20,7 +20,6 @@ import static android.view.Display.DEFAULT_DISPLAY;
import static java.lang.annotation.RetentionPolicy.SOURCE;
-import android.annotation.FlaggedApi;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -36,8 +35,6 @@ import android.os.SystemClock;
import android.util.Log;
import android.util.SparseArray;
-import com.android.hardware.input.Flags;
-
import dalvik.annotation.optimization.CriticalNative;
import dalvik.annotation.optimization.FastNative;
@@ -4436,7 +4433,6 @@ public final class MotionEvent extends InputEvent implements Parcelable {
* @see android.view.View#requestUnbufferedDispatch(int)
* @see android.view.View#requestUnbufferedDispatch(MotionEvent)
*/
- @FlaggedApi(Flags.FLAG_POINTER_COORDS_IS_RESAMPLED_API)
public boolean isResampled() {
return isResampled;
}