Merge "Use correct UserId when checking for lock state" into sc-dev (54d4f306) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/SensorPrivacyService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}