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

Commit a416cc7c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14255380, 14255815, 14255773, 14255816] into sc-release 

Change-Id: Ib6ae1de51a57d52642cbeb5ec518e90d3a8afc1f
parents 0aa6818e dd71c30e

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

+9 −9
Original line number Diff line number Diff line
@@ -197,18 +197,18 @@ 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);

                            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);

                    }

                }

            }



            int[] micAndCameraOps = new int[]{OP_RECORD_AUDIO, OP_CAMERA};

            mAppOpsManager.startWatchingNoted(micAndCameraOps, this);