5ba4065703
We need to watch the lifecycle so that we can unregister callbacks and
not cause leaks.
This change also rewrites the SensorPrivacyManagerHelper. The previous
implmementation was using deprecated apis. It also had an issue where
if a callback was added it would not necessarily register alistener with
the callback with the service since that was only done when the value is
checked. Now we register a listener when the class is instantiated and
with the new API there will only be the 1.
Finally we impove the tests to have more coverage and test both
SensorToggleControllers and the SensorPRivacyManagerHelper class.
Test: Use profiler to verify no more leaks
SensorToggleControllerTest, SensorPrivacyManagerHelperTest
Bug: 244280065
Change-Id: Ibf0bcee455444a104ca6800302907c3dc0de8f1f
59 lines
1.7 KiB
Java
59 lines
1.7 KiB
Java
/*
|
|
* Copyright (C) 2021 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.privacy;
|
|
|
|
import static android.os.UserManager.DISALLOW_CAMERA_TOGGLE;
|
|
|
|
import static com.android.settings.utils.SensorPrivacyManagerHelper.SENSOR_CAMERA;
|
|
|
|
import android.content.Context;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
|
|
import com.android.settings.utils.SensorPrivacyManagerHelper;
|
|
|
|
/**
|
|
* Controller for microphone toggle
|
|
*/
|
|
public class CameraToggleController extends SensorToggleController {
|
|
|
|
public CameraToggleController(Context context, String preferenceKey) {
|
|
super(context, preferenceKey);
|
|
}
|
|
|
|
@VisibleForTesting
|
|
public CameraToggleController(Context context, String preferenceKey,
|
|
SensorPrivacyManagerHelper sensorPrivacyManagerHelper) {
|
|
super(context, preferenceKey, sensorPrivacyManagerHelper, /* ignoreDeviceConfig */ true);
|
|
}
|
|
|
|
@Override
|
|
public int getSensor() {
|
|
return SENSOR_CAMERA;
|
|
}
|
|
|
|
@Override
|
|
public String getDeviceConfigKey() {
|
|
return "camera_toggle_enabled";
|
|
}
|
|
|
|
@Override
|
|
protected String getRestriction() {
|
|
return DISALLOW_CAMERA_TOGGLE;
|
|
}
|
|
}
|