From d382ad4858595760c5a2899d5f11e74527ad5baa Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Tue, 29 Jan 2019 15:38:39 -0800 Subject: [PATCH 1/2] Rename Permissions Hub property. Bug: 122615235 Test: Manually set/unset flag, see/don't see Permissions Hub screens. Change-Id: I2ac4ee57352726d9e84ee062a0f6884c9fcba0ad --- api/system-current.txt | 2 +- core/java/android/provider/DeviceConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 44c3dfe5a1e8b..cbb5af63b94df 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5877,7 +5877,7 @@ package android.provider { public static interface DeviceConfig.Privacy { field public static final String NAMESPACE = "privacy"; field public static final String PROPERTY_LOCATION_ACCESS_CHECK_ENABLED = "enable_location_access_check"; - field public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "enable_permissions_hub"; + field public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled"; } public static interface DeviceConfig.RuntimeNative { diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 0b23fe3e9168a..3822a4a7badbc 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -191,7 +191,7 @@ 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. From c4d8921e5fdaebe869315db851ad9b9be9ec6d9a Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Wed, 30 Jan 2019 10:02:24 -0800 Subject: [PATCH 2/2] Rename location access check flag. Bug: 112390914 Test: atest CtsPermissionTestCases:android.permission.cts.LocationAccessCheckTest Change-Id: I8569aa7c3567241bd4f6a03ce3449d29b4ea3795 --- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/provider/DeviceConfig.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index cbb5af63b94df..f68b78170e49e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5876,7 +5876,7 @@ package android.provider { public static interface DeviceConfig.Privacy { field public static final String NAMESPACE = "privacy"; - field public static final String PROPERTY_LOCATION_ACCESS_CHECK_ENABLED = "enable_location_access_check"; + field public static final String PROPERTY_LOCATION_ACCESS_CHECK_ENABLED = "location_access_check_enabled"; field public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled"; } diff --git a/api/test-current.txt b/api/test-current.txt index 1edd4e372f5e1..635adb60015c5 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1660,7 +1660,7 @@ package android.provider { public static interface DeviceConfig.Privacy { field public static final String NAMESPACE = "privacy"; - field public static final String PROPERTY_LOCATION_ACCESS_CHECK_ENABLED = "enable_location_access_check"; + field public static final String PROPERTY_LOCATION_ACCESS_CHECK_ENABLED = "location_access_check_enabled"; } public final class MediaStore { diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 3822a4a7badbc..3468b1c12e62f 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -196,7 +196,7 @@ public final class DeviceConfig { /** * 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"; } /**