commit e9da17a8b95c67e7fee0a8ca3b60872250cd7626
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 11 11:36:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 11 11:36:19 2023 +0000
tree ea36d529ac22c9ea38e76f0be9d921d5f3804b43
parent b464bfa049675056c61872fc34df607a7ec39c70
parent fb0986623f7b1cc04338afa3c913b9859e8471e8

Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev am: fb0986623f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904549

Change-Id: I1ce36528fa8ae6d30ad6aecc880c3bbf905fabba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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