From e4c8efe2454e77fd357ed038bea1eb2e38b4fdea Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Thu, 16 May 2019 16:36:00 -0700 Subject: [PATCH] Show the accessibility usage preference when Permissions Hub is disabled. Fixes: 132909181 Test: See dialog with Permissions Hub disabled. Test: atest AccessibilityUsagePreferenceControllerTest Change-Id: I56a433d561b0d77d8ece0fd6752871fa79cec850 --- .../privacy/AccessibilityUsagePreferenceController.java | 7 +------ .../AccessibilityUsagePreferenceControllerTest.java | 14 ++------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java b/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java index da4b100e02..8aff2238a4 100644 --- a/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java +++ b/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java @@ -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 diff --git a/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java index 1fbd66f068..33109b0638 100644 --- a/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java @@ -64,16 +64,6 @@ public class AccessibilityUsagePreferenceControllerTest { } @Test - public void isAvailable_permissionHubNotSet_shouldReturnUnsupported() { - mAccessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>()); - AccessibilityUsagePreferenceController controller = - new AccessibilityUsagePreferenceController(mContext, "test_key"); - - // We have not yet set the property to show the Permissions Hub. - assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); - } - - @Test public void getAvailabilityStatus_noEnabledServices_shouldReturnUnsupported() { DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY, Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true); @@ -85,9 +75,9 @@ public class AccessibilityUsagePreferenceControllerTest { } @Test - public void getAvailabilityStatus_enabledServices_shouldReturnAvailableUnsearchable() { + public void getAvailabilityStatus_enabledServices_shouldReturnAvailable() { DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY, - Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true); + Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "false", true); mAccessibilityManager.setEnabledAccessibilityServiceList( new ArrayList<>(Arrays.asList(new AccessibilityServiceInfo()))); AccessibilityUsagePreferenceController controller = -- 2.11.0