Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0050d3a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I4cfcbf8cdfeafdd2547ed81bf3953eb371296ee7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5404ade7 e9da17a8

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

+11 −3
Original line number Diff line number Diff line
@@ -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