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

Commit c5638277 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[SettingsProvider] fix server-side Readable maxTargetSdk check" into... 

Merge "[SettingsProvider] fix server-side Readable maxTargetSdk check" into sc-v2-dev am: 325943b3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16548944

Change-Id: I8e3209163040285157f08ae67f6357e784877922
parents b517a6dd 325943b3

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -2102,7 +2102,7 @@ public class SettingsProvider extends ContentProvider { 
        }

        if ((ai.flags & ApplicationInfo.FLAG_TEST_ONLY) == 0) {

            // Skip checking readable annotations for test_only apps

            checkReadableAnnotation(settingsType, settingName, ai.targetSandboxVersion);

            checkReadableAnnotation(settingsType, settingName, ai.targetSdkVersion);

        }

        /**

         * some settings need additional permission check, this is to have a matching security