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

This commit is contained in:
TreeHugger Robot
2023-01-11 11:05:12 +00:00
committed by Android (Google) Code Review

View File

@@ -18,6 +18,8 @@ package com.android.settings.privacy;
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 @@ public final class EnableContentCapturePreferenceController extends TogglePrefer
@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