From 30a3a67dad3ae348c47f33976d36bdd28e322efe Mon Sep 17 00:00:00 2001 From: Evan Severson Date: Tue, 20 Apr 2021 09:04:31 -0700 Subject: [PATCH] Fix typo in sensor privacy init Should be getting the value at index i, not using int i as a key. Also when iterating over the state we should be holding the lock. Test: Push sensor_privacy.xml file and reboot Fixes: 185881144 Change-Id: I09823d888b05b674b32254d39ab030ce0e6c2acf --- .../android/server/SensorPrivacyService.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/SensorPrivacyService.java b/services/core/java/com/android/server/SensorPrivacyService.java index 3ba4c34fb1a7b..e8bc812e5ea88 100644 --- a/services/core/java/com/android/server/SensorPrivacyService.java +++ b/services/core/java/com/android/server/SensorPrivacyService.java @@ -197,16 +197,16 @@ public final class SensorPrivacyService extends SystemService { if (readPersistedSensorPrivacyStateLocked()) { persistSensorPrivacyStateLocked(); } - } - for (int i = 0; i < mIndividualEnabled.size(); i++) { - int userId = mIndividualEnabled.keyAt(i); - SparseBooleanArray userIndividualEnabled = - mIndividualEnabled.get(i); - for (int j = 0; j < userIndividualEnabled.size(); j++) { - int sensor = userIndividualEnabled.keyAt(i); - boolean enabled = userIndividualEnabled.valueAt(j); - setUserRestriction(userId, sensor, enabled); + for (int i = 0; i < mIndividualEnabled.size(); i++) { + int userId = mIndividualEnabled.keyAt(i); + SparseBooleanArray userIndividualEnabled = + mIndividualEnabled.valueAt(i); + for (int j = 0; j < userIndividualEnabled.size(); j++) { + int sensor = userIndividualEnabled.keyAt(i); + boolean enabled = userIndividualEnabled.valueAt(j); + setUserRestriction(userId, sensor, enabled); + } } }