Merge "Remove Permissions Hub." into qt-dev

am: 63088840c4

Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
This commit is contained in:
Joel Galenson
2019-05-31 06:07:30 -07:00
committed by android-build-merger
6 changed files with 2 additions and 227 deletions

View File

@@ -130,11 +130,6 @@ public final class Utils extends com.android.settingslib.Utils {
public static final String PROPERTY_DEVICE_IDENTIFIER_ACCESS_RESTRICTIONS_DISABLED =
"device_identifier_access_restrictions_disabled";
/**
* Whether to show the Permissions Hub.
*/
public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled";
/**
* Finds a matching activity for a preference's intent. If a matching
* activity is not found, it will remove the preference.

View File

@@ -64,9 +64,7 @@ public class RecentLocationAccessPreferenceController extends AbstractPreference
@Override
public boolean isAvailable() {
return Boolean.parseBoolean(
DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
Utils.PROPERTY_PERMISSIONS_HUB_ENABLED));
return false;
}
@Override

View File

@@ -89,10 +89,7 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
@Override
public int getAvailabilityStatus() {
return Boolean.parseBoolean(
DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
com.android.settings.Utils.PROPERTY_PERMISSIONS_HUB_ENABLED)) ?
AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
return UNSUPPORTED_ON_DEVICE;
}
@Override