PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
TreeHugger Robot
2023-01-11 11:36:19 +00:00
committed by Automerger Merge Worker
parent b464bfa049 fb0986623f
commit e9da17a8b9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.privacy;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
@@ -42,9 +44,15 @@ public final class EnableContentCapturePreferenceController extends TogglePrefer
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
boolean available = ContentCaptureUtils.isFeatureAvailable() if (!ContentCaptureUtils.isFeatureAvailable()
&& ContentCaptureUtils.getServiceSettingsComponentName() == null; || ContentCaptureUtils.getServiceSettingsComponentName() != null) {
return available ? AVAILABLE : UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
}
if (UserManager.get(mContext).hasUserRestrictionForUser(
UserManager.DISALLOW_CONTENT_CAPTURE, UserHandle.of(UserHandle.myUserId()))) {
return DISABLED_FOR_USER;
}
return AVAILABLE;
} }
@Override @Override