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

Commit 9e804aaa authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am: 395f43dd am: 77251b3e 

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

Change-Id: I13f6757e3865068b4316143667d8137c75da3c19
parents 01d849d7 77251b3e

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

+7 −6
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import static android.hardware.SensorPrivacyManager.Sources.OTHER; 
import static android.hardware.SensorPrivacyManager.Sources.QS_TILE;

import static android.hardware.SensorPrivacyManager.Sources.SETTINGS;

import static android.hardware.SensorPrivacyManager.Sources.SHELL;

import static android.os.UserHandle.USER_NULL;

import static android.os.UserHandle.USER_SYSTEM;

import static android.service.SensorPrivacyIndividualEnabledSensorProto.UNKNOWN;
@@ -195,7 +196,7 @@ public final class SensorPrivacyService extends SystemService { 
    private EmergencyCallHelper mEmergencyCallHelper;

    private KeyguardManager mKeyguardManager;



    private int mCurrentUser = -1;

    private int mCurrentUser = USER_NULL;



    public SensorPrivacyService(Context context) {

        super(context);
@@ -228,9 +229,9 @@ public final class SensorPrivacyService extends SystemService { 


    @Override

    public void onUserStarting(TargetUser user) {

        if (mCurrentUser == -1) {

        if (mCurrentUser == USER_NULL) {

            mCurrentUser = user.getUserIdentifier();

            mSensorPrivacyServiceImpl.userSwitching(-1, user.getUserIdentifier());

            mSensorPrivacyServiceImpl.userSwitching(USER_NULL, user.getUserIdentifier());

        }

    }
@@ -1294,13 +1295,13 @@ public final class SensorPrivacyService extends SystemService { 
                micState = isIndividualSensorPrivacyEnabledLocked(to, MICROPHONE);

                camState = isIndividualSensorPrivacyEnabledLocked(to, CAMERA);

            }

            if (prevMicState != micState) {

            if (from == USER_NULL || prevMicState != micState) {

                mHandler.onUserGlobalSensorPrivacyChanged(MICROPHONE, micState);

                setGlobalRestriction(MICROPHONE, micState);

            }

            if (prevCamState != camState) {

            if (from == USER_NULL || prevCamState != camState) {

                mHandler.onUserGlobalSensorPrivacyChanged(CAMERA, camState);

                setGlobalRestriction(CAMERA, micState);

                setGlobalRestriction(CAMERA, camState);

            }

        }

services/tests/mockingservicestests/assets/SensorPrivacyServiceMockingTest/persisted_file_micMute_camMute.xml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>

<sensor-privacy persistence-version="1" version="1">

    <user id="0" enabled="false">

        <individual-sensor-privacy sensor="1" enabled="true" />

        <individual-sensor-privacy sensor="2" enabled="true" />

    </user>

</sensor-privacy>

services/tests/mockingservicestests/assets/SensorPrivacyServiceMockingTest/persisted_file_micMute_camUnmute.xml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>

<sensor-privacy persistence-version="1" version="1">

    <user id="0" enabled="false">

        <individual-sensor-privacy sensor="1" enabled="true" />

        <individual-sensor-privacy sensor="2" enabled="false" />

    </user>

</sensor-privacy>

services/tests/mockingservicestests/assets/SensorPrivacyServiceMockingTest/persisted_file_micUnmute_camMute.xml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>

<sensor-privacy persistence-version="1" version="1">

    <user id="0" enabled="false">

        <individual-sensor-privacy sensor="1" enabled="false" />

        <individual-sensor-privacy sensor="2" enabled="true" />

    </user>

</sensor-privacy>

services/tests/mockingservicestests/assets/SensorPrivacyServiceMockingTest/persisted_file_micUnmute_camUnmute.xml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>

<sensor-privacy persistence-version="1" version="1">

    <user id="0" enabled="false">

        <individual-sensor-privacy sensor="1" enabled="false" />

        <individual-sensor-privacy sensor="2" enabled="false" />

    </user>

</sensor-privacy>