| commit | 2118f8a63faee85a08675b4a028d0b5746b33417 | [log] [tgz] |
|---|---|---|
| author | Joel Galenson <jgalenson@google.com> | Fri May 31 07:54:20 2019 -0700 |
| committer | Joel Galenson <jgalenson@google.com> | Fri May 31 07:55:19 2019 -0700 |
| tree | aedae8eb8c4521148c0dde87b6cfac42700022c5 | |
| parent | 53bbf9b78dddd6d33ebbfa600321cd7b8af2936a [diff] |
Revert "Remove Permissions Hub." This reverts commit 1e7c172ad5704754266bee50a9bc59b3205e8b70. Bug: 132292477 Test: None. Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index c4b1400..75db3e1 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java
@@ -131,6 +131,11 @@ "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. *
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java index 2f0dafd..c835a51 100644 --- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -64,7 +64,9 @@ @Override public boolean isAvailable() { - return false; + return Boolean.parseBoolean( + DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY, + Utils.PROPERTY_PERMISSIONS_HUB_ENABLED)); } @Override
diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java index 28533df..399216c 100644 --- a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java +++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
@@ -89,7 +89,10 @@ @Override public int getAvailabilityStatus() { - return UNSUPPORTED_ON_DEVICE; + return Boolean.parseBoolean( + DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY, + com.android.settings.Utils.PROPERTY_PERMISSIONS_HUB_ENABLED)) ? + AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; } @Override