Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dacd619 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I8569aa7c,I2ac4ee57 

* changes:
  Rename location access check flag.
  Rename Permissions Hub property.
parents dcc1a9dd c4d8921e

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5866,8 +5866,8 @@ 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_LOCATION_ACCESS_CHECK_ENABLED = "location_access_check_enabled";













    field public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled";















  }





























  public static interface DeviceConfig.RuntimeNative {

































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -1744,7 +1744,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 {

































core/java/android/provider/DeviceConfig.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -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";















    }































    /**