summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vania Januar <vanjan@google.com> 2022-12-20 11:11:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-20 11:11:34 +0000
commit7fd6aca3cedb331c508c74c934ee36a737c816cb (patch)
treecd304850019ac765ef63b7c619959d922148750e
parent73e1fd298afd41bba9e5fbbd93c062147f6e51ec (diff)
parent53d92fdd66c947c573e2f79621e2e48747bbaf4a (diff)
Merge "Allow non-IPC processes to setStylusEverUsed in InputManager" into tm-qpr-dev am: fd1cfdb407 am: 53d92fdd66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20766196 Change-Id: Ibd535e6bbe553e504f2ae1c86a31c8c27d01b424 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/hardware/input/InputManager.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java
index 2eeae46645c5..9c4216032942 100644
--- a/core/java/android/hardware/input/InputManager.java
+++ b/core/java/android/hardware/input/InputManager.java
@@ -31,7 +31,6 @@ import android.app.ActivityThread;
import android.compat.annotation.ChangeId;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
-import android.content.pm.PackageManager;
import android.hardware.BatteryState;
import android.hardware.SensorManager;
import android.hardware.lights.Light;
@@ -2034,11 +2033,6 @@ public final class InputManager {
*/
@RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
public void setStylusEverUsed(@NonNull Context context, boolean stylusEverUsed) {
- if (context.checkCallingPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
- != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("You need WRITE_SECURE_SETTINGS permission "
- + "to set stylus ever used.");
- }
Settings.Global.putInt(context.getContentResolver(),
Settings.Global.STYLUS_EVER_USED, stylusEverUsed ? 1 : 0);
}