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

Commit 7fd1ba73 authored by Todd Kennedy's avatar Todd Kennedy Committed by Songchun Fan
Browse files

Revert "[SettingsProvider] @Readable annotation to restrict acce..." 

Revert "[cts] tests for settings readable fields"

Revert submission 13355582-settings_readable

Reason for revert: b/178340718 b/178329499 b/178234427
Reverted Changes:
Id1f133d52:[cts] tests for settings readable fields
I8a2733580:[SettingsProvider] @Readable annotation to restric...

Change-Id: Ia55e58106e49ba411603bbadd8d909e22516293e
parent 8b1a4d8c

core/java/android/provider/Settings.java

+270 −1327

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −54
Original line number Diff line number Diff line
@@ -297,24 +297,6 @@ public class SettingsProvider extends ContentProvider { 
        Settings.System.getCloneFromParentOnValueSettings(sSystemCloneFromParentOnDependency);

    }



    private static final Set<String> sAllSecureSettings = new ArraySet<>();

    private static final Set<String> sReadableSecureSettings = new ArraySet<>();

    static {

        Settings.Secure.getPublicSettings(sAllSecureSettings, sReadableSecureSettings);

    }



    private static final Set<String> sAllSystemSettings = new ArraySet<>();

    private static final Set<String> sReadableSystemSettings = new ArraySet<>();

    static {

        Settings.System.getPublicSettings(sAllSystemSettings, sReadableSystemSettings);

    }



    private static final Set<String> sAllGlobalSettings = new ArraySet<>();

    private static final Set<String> sReadableGlobalSettings = new ArraySet<>();

    static {

        Settings.Global.getPublicSettings(sAllGlobalSettings, sReadableGlobalSettings);

    }



    private final Object mLock = new Object();



    @GuardedBy("mLock")
@@ -1937,7 +1919,6 @@ public class SettingsProvider extends ContentProvider { 
        if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {

            return;

        }

        checkReadableAnnotation(settingsType, settingName);

        ApplicationInfo ai = getCallingApplicationInfoOrThrow();

        if (!ai.isInstantApp()) {

            return;
@@ -1951,41 +1932,6 @@ public class SettingsProvider extends ContentProvider { 
        }

    }



    /**

     * Check if the target settings key is readable. Reject if the caller app is trying to access a

     * settings key defined in the Settings.Secure, Settings.System or Settings.Global and is not

     * annotated as @Readable.

     * Notice that a key string that is not defined in any of the Settings.* classes will still be

     * regarded as readable.

     */

    private void checkReadableAnnotation(int settingsType, String settingName) {

        final Set<String> allFields;

        final Set<String> readableFields;

        switch (settingsType) {

            case SETTINGS_TYPE_GLOBAL:

                allFields = sAllGlobalSettings;

                readableFields = sReadableGlobalSettings;

                break;

            case SETTINGS_TYPE_SYSTEM:

                allFields = sAllSystemSettings;

                readableFields = sReadableSystemSettings;

                break;

            case SETTINGS_TYPE_SECURE:

                allFields = sAllSecureSettings;

                readableFields = sReadableSecureSettings;

                break;

            default:

                throw new IllegalArgumentException("Invalid settings type: " + settingsType);

        }



        if (allFields.contains(settingName) && !readableFields.contains(settingName)) {

            throw new SecurityException(

                    "Settings key: <" + settingName + "> is not readable. From S+, new public "

                            + "settings keys need to be annotated with @Readable unless they are "

                            + "annotated with @hide.");

        }

    }



    private ApplicationInfo getCallingApplicationInfoOrThrow() {

        // We always use the callingUid for this lookup. This means that if hypothetically an

        // app was installed in user A with cross user and in user B as an Instant App