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

Commit 0dd52d20 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add reporting to monitor apps incorrectly using getRaw"" into sc-dev am: 0214d012 

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

Change-Id: I493deb7831c962914f80e66e62c6ed743d16fa99
parents 0ec2bc9a 0214d012

core/java/android/hardware/input/InputManager.java

+0 −8
Original line number Diff line number Diff line
@@ -222,14 +222,6 @@ public final class InputManager { 
    @ChangeId

    public static final long BLOCK_FLAG_SLIPPERY = android.os.IInputConstants.BLOCK_FLAG_SLIPPERY;



    /**

     * Check whether apps are using MotionEvent.getRawX/Y. This is implementation-specific, and

     * thus undefined for most 3p app usages.

     * @hide

     */

    @ChangeId

    public static final long APP_USES_RAW_INPUT_COORDS = 179274888L;



    /**

     * Input Event Injection Synchronization Mode: None.

     * Never blocks.  Injection is asynchronous and is assumed always to be successful.

core/java/android/view/MotionEvent.java

+0 −6
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.view;



import static android.hardware.input.InputManager.APP_USES_RAW_INPUT_COORDS;

import static android.view.Display.DEFAULT_DISPLAY;



import static java.lang.annotation.RetentionPolicy.SOURCE;
@@ -24,7 +23,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.compat.Compatibility;

import android.compat.annotation.UnsupportedAppUsage;

import android.graphics.Matrix;

import android.os.Build;
@@ -2674,7 +2672,6 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * @see #AXIS_X

     */

    public final float getRawX() {

        Compatibility.reportUnconditionalChange(APP_USES_RAW_INPUT_COORDS);

        return nativeGetRawAxisValue(mNativePtr, AXIS_X, 0, HISTORY_CURRENT);

    }
@@ -2688,7 +2685,6 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * @see #AXIS_Y

     */

    public final float getRawY() {

        Compatibility.reportUnconditionalChange(APP_USES_RAW_INPUT_COORDS);

        return nativeGetRawAxisValue(mNativePtr, AXIS_Y, 0, HISTORY_CURRENT);

    }
@@ -2705,7 +2701,6 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * @see #AXIS_X

     */

    public float getRawX(int pointerIndex) {

        Compatibility.reportUnconditionalChange(APP_USES_RAW_INPUT_COORDS);

        return nativeGetRawAxisValue(mNativePtr, AXIS_X, pointerIndex, HISTORY_CURRENT);

    }
@@ -2722,7 +2717,6 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * @see #AXIS_Y

     */

    public float getRawY(int pointerIndex) {

        Compatibility.reportUnconditionalChange(APP_USES_RAW_INPUT_COORDS);

        return nativeGetRawAxisValue(mNativePtr, AXIS_Y, pointerIndex, HISTORY_CURRENT);

    }