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

Commit 7fd6aca3 authored by Vania Januar's avatar Vania Januar Committed by Automerger Merge Worker
Browse files

Merge "Allow non-IPC processes to setStylusEverUsed in InputManager" into... 

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

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



Change-Id: Ibd535e6bbe553e504f2ae1c86a31c8c27d01b424
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73e1fd29 53d92fdd

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

+0 −6
Original line number Diff line number Diff line
@@ -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);

    }