Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct UserId when checking for lock state

Browse Source 
Update API to include userId rather than using the default Context
userId.

Fixes: 187344132
Test: Toggling muted mic works

Change-Id: I2771117d97f89e961a6fb9949d28f0edbb4b5591
This commit is contained in:
Anthony Hugh
2021-05-07 20:26:41 -07:00
parent 48a3676a12
commit 815fda395d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/SensorPrivacyService.java
View File

@@ -469,7 +469,7 @@ public final class SensorPrivacyService extends SystemService {
@Override
public void setIndividualSensorPrivacy(@UserIdInt int userId, int sensor, boolean enable) {
enforceManageSensorPrivacyPermission();
if (!canChangeIndividualSensorPrivacy(sensor)) {
if (!canChangeIndividualSensorPrivacy(userId, sensor)) {
return;
}
@@ -500,14 +500,14 @@ public final class SensorPrivacyService extends SystemService {
mHandler.onSensorPrivacyChanged(userId, sensor, enable);
}
private boolean canChangeIndividualSensorPrivacy(int sensor) {
private boolean canChangeIndividualSensorPrivacy(@UserIdInt int userId, int sensor) {
if (sensor == MICROPHONE && mEmergencyCallHelper.isInEmergencyCall()) {
// During emergency call the microphone toggle managed automatically
Log.i(TAG, "Can't change mic toggle during an emergency call");
return false;
}
if (mKeyguardManager != null && mKeyguardManager.isDeviceLocked()) {
if (mKeyguardManager != null && mKeyguardManager.isDeviceLocked(userId)) {
Log.i(TAG, "Can't change mic/cam toggle while device is locked");
return false;
}