Merge "[SettingsProvider] do not check @Readable for system/priv apps in the server" into sc-dev

2021-03-11 20:17:56 +00:00
parent 0ec8d259d5 403d4ee851
commit 7ddd1bd457
1 changed files with 4 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1937,8 +1937,11 @@ public class SettingsProvider extends ContentProvider {
        if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {
            return;
        }
-        checkReadableAnnotation(settingsType, settingName);
        ApplicationInfo ai = getCallingApplicationInfoOrThrow();
+        if (ai.isSystemApp() || ai.isSignedWithPlatformKey()) {
+            return;
+        }
+        checkReadableAnnotation(settingsType, settingName);
        if (!ai.isInstantApp()) {
            return;
        }