summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-01-31 00:57:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-01-31 00:57:53 +0000
commit8dacd6195c405a461b1b06dd00cd7aceacca9c19 (patch)
tree37f16a5a9b8cc45af45c09742e182bc288c966f1 /core/java/android
parentdcc1a9dd36705af27752355590d7f72a354e2f5a (diff)
parentc4d8921e5fdaebe869315db851ad9b9be9ec6d9a (diff)
Merge changes I8569aa7c,I2ac4ee57
* changes: Rename location access check flag. Rename Permissions Hub property.
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/DeviceConfig.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 1b2561cd203d..d4372c0341c8 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -203,12 +203,12 @@ public final class DeviceConfig {
* @hide
*/
@SystemApi
- String PROPERTY_PERMISSIONS_HUB_ENABLED = "enable_permissions_hub";
+ String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled";
/**
* Whether to show location access check notifications.
*/
- String PROPERTY_LOCATION_ACCESS_CHECK_ENABLED = "enable_location_access_check";
+ String PROPERTY_LOCATION_ACCESS_CHECK_ENABLED = "location_access_check_enabled";
}
/**