Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev

am: 51c92e5622

Change-Id: I677c4b76f44aa957eddf73d70c3291a4626f4903
This commit is contained in:
Joel Galenson
2019-05-17 19:35:47 -07:00
committed by android-build-merger
2 changed files with 3 additions and 18 deletions

View File

@@ -18,14 +18,12 @@ package com.android.settings.privacy;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.Context;
import android.provider.DeviceConfig;
import android.view.accessibility.AccessibilityManager;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import java.util.List;
@@ -46,10 +44,7 @@ public class AccessibilityUsagePreferenceController extends BasePreferenceContro
@Override
public int getAvailabilityStatus() {
return (mEnabledServiceInfos.isEmpty() || !Boolean.parseBoolean(
DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
Utils.PROPERTY_PERMISSIONS_HUB_ENABLED)))
? UNSUPPORTED_ON_DEVICE : AVAILABLE;
return mEnabledServiceInfos.isEmpty() ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
}
@Override