Merge "Revert^2 "[SettingsProvider] @Readable annotation to restrict access to... (c4e2866c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+1355 −271

File changed.

Preview size limit exceeded, changes collapsed.

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

+54 −0

Original line number	Diff line number	Diff line
		@@ -297,6 +297,24 @@ 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")
		@@ -1919,6 +1937,7 @@ 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;
		@@ -1932,6 +1951,41 @@ 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