Merge "Allow non-IPC processes to setStylusEverUsed in InputManager" into tm-qpr-dev am: fd1cfdb407

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

Change-Id: I0f9afcb7074e0ffc7bbf765ed40867ad1315ef3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vania Januar
2022-12-20 10:26:35 +00:00
committed by Automerger Merge Worker

View File

@@ -30,7 +30,6 @@ import android.app.ActivityThread;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.BatteryState; import android.hardware.BatteryState;
import android.hardware.SensorManager; import android.hardware.SensorManager;
import android.hardware.lights.Light; import android.hardware.lights.Light;
@@ -1910,11 +1909,6 @@ public final class InputManager {
*/ */
@RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
public void setStylusEverUsed(@NonNull Context context, boolean stylusEverUsed) { 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.putInt(context.getContentResolver(),
Settings.Global.STYLUS_EVER_USED, stylusEverUsed ? 1 : 0); Settings.Global.STYLUS_EVER_USED, stylusEverUsed ? 1 : 0);
} }