Merge "Remove watch_foreground_changes flag" into main
diff --git a/camera/camera_platform.aconfig b/camera/camera_platform.aconfig
index 3d7a051..035e059 100644
--- a/camera/camera_platform.aconfig
+++ b/camera/camera_platform.aconfig
@@ -27,13 +27,6 @@
flag {
namespace: "camera_platform"
- name: "watch_foreground_changes"
- description: "Request AppOps to notify changes in the foreground status of the client"
- bug: "290086710"
-}
-
-flag {
- namespace: "camera_platform"
name: "camera_manual_flash_strength_control"
is_exported: true
description: "Flash brightness level control in manual flash mode"
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 84a3d26..eb8708e 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -4340,14 +4340,9 @@
// Notify app ops that the camera is not available
mOpsCallback = new OpsCallback(this);
- if (flags::watch_foreground_changes()) {
- mAppOpsManager->startWatchingMode(AppOpsManager::OP_CAMERA,
- toString16(mClientPackageName),
- AppOpsManager::WATCH_FOREGROUND_CHANGES, mOpsCallback);
- } else {
- mAppOpsManager->startWatchingMode(AppOpsManager::OP_CAMERA,
- toString16(mClientPackageName), mOpsCallback);
- }
+ mAppOpsManager->startWatchingMode(AppOpsManager::OP_CAMERA,
+ toString16(mClientPackageName),
+ AppOpsManager::WATCH_FOREGROUND_CHANGES, mOpsCallback);
// Just check for camera acccess here on open - delay startOp until
// camera frames start streaming in startCameraStreamingOps
@@ -4530,19 +4525,10 @@
// (WAR for b/175320666)the AppOpsManager could return MODE_IGNORED. Do not treat such
// cases as error.
if (!mUidIsTrusted) {
- if (flags::watch_foreground_changes()) {
- if (isUidVisible && isCameraPrivacyEnabled && supportsCameraMute()) {
- setCameraMute(true);
- } else {
- block();
- }
+ if (isUidVisible && isCameraPrivacyEnabled && supportsCameraMute()) {
+ setCameraMute(true);
} else {
- if (isUidActive && isCameraPrivacyEnabled && supportsCameraMute()) {
- setCameraMute(true);
- } else if (!isUidActive
- || (isCameraPrivacyEnabled && !supportsCameraMute())) {
- block();
- }
+ block();
}
}
} else if (res == AppOpsManager::MODE_ALLOWED) {