Snap for 11400057 from 4af146d89bb4ebcb721da15d55db2df8083e8ee3 to simpleperf-releasesimpleperf-release

Change-Id: I72f2047dbe0d15a49f868db3dc8aa6e399957417

3 files changed, 13 insertions, 18 deletions

diff --git a/framework/Android.bp b/framework/Android.bp
index 3869ba5..2629228 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -18,15 +18,18 @@ package {
 
 java_sdk_library {
     name: "framework-configinfrastructure",
-    srcs: [ "java/**/*.java" ],
+    srcs: ["java/**/*.java"],
     defaults: ["framework-module-defaults"],
-    permitted_packages: [ "android.provider" ],
+    permitted_packages: ["android.provider"],
     apex_available: [
         "com.android.configinfrastructure",
     ],
     min_sdk_version: "UpsideDownCake",
     sdk_version: "module_current",
     impl_library_visibility: [
-        "//packages/modules/ConfigInfrastructure:__subpackages__"
+        "//packages/modules/ConfigInfrastructure:__subpackages__",
     ],
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt
index cfe7cf7..e4154c6 100644
--- a/framework/api/system-current.txt
+++ b/framework/api/system-current.txt
@@ -6,14 +6,14 @@ package android.provider {
     method @RequiresPermission(android.Manifest.permission.MONITOR_DEVICE_CONFIG_ACCESS) public static void clearMonitorCallback(@NonNull android.content.ContentResolver);
     method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG}) public static boolean deleteProperty(@NonNull String, @NonNull String);
     method @NonNull public static java.util.Set<java.lang.String> getAdbWritableFlags();
-    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static boolean getBoolean(@NonNull String, @NonNull String, boolean);
-    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static float getFloat(@NonNull String, @NonNull String, float);
-    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static int getInt(@NonNull String, @NonNull String, int);
-    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static long getLong(@NonNull String, @NonNull String, long);
-    method @NonNull @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static android.provider.DeviceConfig.Properties getProperties(@NonNull String, @NonNull java.lang.String...);
-    method @Nullable @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getProperty(@NonNull String, @NonNull String);
+    method public static boolean getBoolean(@NonNull String, @NonNull String, boolean);
+    method public static float getFloat(@NonNull String, @NonNull String, float);
+    method public static int getInt(@NonNull String, @NonNull String, int);
+    method public static long getLong(@NonNull String, @NonNull String, long);
+    method @NonNull public static android.provider.DeviceConfig.Properties getProperties(@NonNull String, @NonNull java.lang.String...);
+    method @Nullable public static String getProperty(@NonNull String, @NonNull String);
     method @NonNull public static java.util.List<java.lang.String> getPublicNamespaces();
-    method @Nullable @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getString(@NonNull String, @NonNull String, @Nullable String);
+    method @Nullable public static String getString(@NonNull String, @NonNull String, @Nullable String);
     method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG}) public static int getSyncDisabledMode();
     method public static void removeOnPropertiesChangedListener(@NonNull android.provider.DeviceConfig.OnPropertiesChangedListener);
     method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG}) public static void resetToDefaults(int, @Nullable String);
diff --git a/framework/java/android/provider/DeviceConfig.java b/framework/java/android/provider/DeviceConfig.java
index e9254b9..06d5572 100644
--- a/framework/java/android/provider/DeviceConfig.java
+++ b/framework/java/android/provider/DeviceConfig.java
@@ -17,7 +17,6 @@
 package android.provider;
 
 import static android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG;
-import static android.Manifest.permission.READ_DEVICE_CONFIG;
 import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
 import static android.Manifest.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG;
 
@@ -1028,7 +1027,6 @@ public final class DeviceConfig {
      * @hide
      */
     @SystemApi
-    @RequiresPermission(READ_DEVICE_CONFIG)
     @Nullable
     public static String getProperty(@NonNull String namespace, @NonNull String name) {
         // Fetch all properties for the namespace at once and cache them in the local process, so we
@@ -1058,7 +1056,6 @@ public final class DeviceConfig {
      */
     @SystemApi
     @NonNull
-    @RequiresPermission(READ_DEVICE_CONFIG)
     public static Properties getProperties(@NonNull String namespace, @NonNull String ... names) {
         return new Properties(namespace,
                 Settings.Config.getStrings(namespace, Arrays.asList(names)));
@@ -1075,7 +1072,6 @@ public final class DeviceConfig {
      * @hide
      */
     @SystemApi
-    @RequiresPermission(READ_DEVICE_CONFIG)
     @Nullable
     public static String getString(@NonNull String namespace, @NonNull String name,
             @Nullable String defaultValue) {
@@ -1094,7 +1090,6 @@ public final class DeviceConfig {
      * @hide
      */
     @SystemApi
-    @RequiresPermission(READ_DEVICE_CONFIG)
     public static boolean getBoolean(@NonNull String namespace, @NonNull String name,
             boolean defaultValue) {
         String value = getProperty(namespace, name);
@@ -1112,7 +1107,6 @@ public final class DeviceConfig {
      * @hide
      */
     @SystemApi
-    @RequiresPermission(READ_DEVICE_CONFIG)
     public static int getInt(@NonNull String namespace, @NonNull String name, int defaultValue) {
         String value = getProperty(namespace, name);
         if (value == null) {
@@ -1137,7 +1131,6 @@ public final class DeviceConfig {
      * @hide
      */
     @SystemApi
-    @RequiresPermission(READ_DEVICE_CONFIG)
     public static long getLong(@NonNull String namespace, @NonNull String name, long defaultValue) {
         String value = getProperty(namespace, name);
         if (value == null) {
@@ -1162,7 +1155,6 @@ public final class DeviceConfig {
      * @hide
      */
     @SystemApi
-    @RequiresPermission(READ_DEVICE_CONFIG)
     public static float getFloat(@NonNull String namespace, @NonNull String name,
             float defaultValue) {
         String value = getProperty(namespace, name);