commit a1ca72224da3a87d3117e764dfea35e03f62a182
author TYM Tsai <tymtsai@google.com> Sat Jan 07 02:39:03 2023 +0800
committer TYM Tsai <tymtsai@google.com> Mon Jan 09 08:34:40 2023 +0000
tree c4d8e5dcff4547465f7c980ddf364cb3332515fd
parent 30783964b33e2d0e52e820e7e06ab4a00152f81e

Fix Content Capture service starting after restriction

When a device owner and a profile owner restrict Content Capture,
there should be no toggle setting to turn on Content Capture.

Bug: 250573776
Test: Manual. Use setps on the comment#3,
      make sure no toggle setting in the Privacy page.
Change-Id: Ia17f852b224c67b9c1cf5846ee9ad5592a485bab

src/com/android/settings/privacy/EnableContentCapturePreferenceController.java

diff --git a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
index 3cf72b2..5377f15 100644
--- a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
+++ b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
@@ -18,6 +18,8 @@
 
 import android.annotation.NonNull;
 import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
 
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
@@ -42,9 +44,15 @@
 
     @Override
     public int getAvailabilityStatus() {
-        boolean available = ContentCaptureUtils.isFeatureAvailable()
-                && ContentCaptureUtils.getServiceSettingsComponentName() == null;
-        return available ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        if (!ContentCaptureUtils.isFeatureAvailable()
+                || ContentCaptureUtils.getServiceSettingsComponentName() != null) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        if (UserManager.get(mContext).hasUserRestrictionForUser(
+                UserManager.DISALLOW_CONTENT_CAPTURE, UserHandle.of(UserHandle.myUserId()))) {
+            return DISABLED_FOR_USER;
+        }
+        return AVAILABLE;
     }
 
     @Override