Revert "Allow Instant Apps to read Settings defined by apps" (a6830e74) · Commits · e / os / android_frameworks_base

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

+12 −26

Original line number	Original line	Diff line number	Diff line
	@@ -898,14 +898,13 @@ public class SettingsProvider extends ContentProvider {
	Slog.v(LOG_TAG, "getGlobalSetting(" + name + ")");		Slog.v(LOG_TAG, "getGlobalSetting(" + name + ")");
	}		}

			// Ensure the caller can access the setting.
			enforceSettingReadable(name, SETTINGS_TYPE_GLOBAL, UserHandle.getCallingUserId());

	// Get the value.		// Get the value.
	synchronized (mLock) {		synchronized (mLock) {
	Setting setting = mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_GLOBAL,		return mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_GLOBAL,
	UserHandle.USER_SYSTEM, name);		UserHandle.USER_SYSTEM, name);
	// Ensure the caller can access the setting before we return it.
	enforceSettingReadable(setting, name, SETTINGS_TYPE_GLOBAL,
	UserHandle.getCallingUserId());
	return setting;
	}		}
	}		}

	@@ -1063,6 +1062,9 @@ public class SettingsProvider extends ContentProvider {
	// Resolve the userId on whose behalf the call is made.		// Resolve the userId on whose behalf the call is made.
	final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId);		final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId);

			// Ensure the caller can access the setting.
			enforceSettingReadable(name, SETTINGS_TYPE_SECURE, UserHandle.getCallingUserId());

	// Determine the owning user as some profile settings are cloned from the parent.		// Determine the owning user as some profile settings are cloned from the parent.
	final int owningUserId = resolveOwningUserIdForSecureSettingLocked(callingUserId, name);		final int owningUserId = resolveOwningUserIdForSecureSettingLocked(callingUserId, name);

	@@ -1076,7 +1078,6 @@ public class SettingsProvider extends ContentProvider {

	// As of Android O, the SSAID is read from an app-specific entry in table		// As of Android O, the SSAID is read from an app-specific entry in table
	// SETTINGS_FILE_SSAID, unless accessed by a system process.		// SETTINGS_FILE_SSAID, unless accessed by a system process.
	// All apps are allowed to access their SSAID, so we skip the permission check.
	if (isNewSsaidSetting(name)) {		if (isNewSsaidSetting(name)) {
	PackageInfo callingPkg = getCallingPackageInfo(owningUserId);		PackageInfo callingPkg = getCallingPackageInfo(owningUserId);
	synchronized (mLock) {		synchronized (mLock) {
	@@ -1086,12 +1087,8 @@ public class SettingsProvider extends ContentProvider {

	// Not the SSAID; do a straight lookup		// Not the SSAID; do a straight lookup
	synchronized (mLock) {		synchronized (mLock) {
	Setting setting = mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_SECURE,		return mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_SECURE,
	owningUserId, name);		owningUserId, name);
	// Ensure the caller can access the setting before we return it.
	enforceSettingReadable(setting, name, SETTINGS_TYPE_SECURE,
	UserHandle.getCallingUserId());
	return setting;
	}		}
	}		}

	@@ -1292,18 +1289,15 @@ public class SettingsProvider extends ContentProvider {
	// Resolve the userId on whose behalf the call is made.		// Resolve the userId on whose behalf the call is made.
	final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId);		final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId);

			// Ensure the caller can access the setting.
			enforceSettingReadable(name, SETTINGS_TYPE_SYSTEM, UserHandle.getCallingUserId());

	// Determine the owning user as some profile settings are cloned from the parent.		// Determine the owning user as some profile settings are cloned from the parent.
	final int owningUserId = resolveOwningUserIdForSystemSettingLocked(callingUserId, name);		final int owningUserId = resolveOwningUserIdForSystemSettingLocked(callingUserId, name);

	// Get the value.		// Get the value.
	synchronized (mLock) {		synchronized (mLock) {
	Setting setting = mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_SYSTEM,		return mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_SYSTEM, owningUserId, name);
	owningUserId, name);
	// Ensure the caller can access the setting before we return it.
	enforceSettingReadable(setting, name, SETTINGS_TYPE_SYSTEM,
	UserHandle.getCallingUserId());
	return setting;
	}		}
	}		}

	@@ -1650,22 +1644,14 @@ public class SettingsProvider extends ContentProvider {
	}		}
	}		}

	private void enforceSettingReadable(Setting setting, String settingName, int settingsType,		private void enforceSettingReadable(String settingName, int settingsType, int userId) {
	int userId) {
	if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {		if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {
	return;		return;
	}		}
	ApplicationInfo ai = getCallingApplicationInfoOrThrow();		ApplicationInfo ai = getCallingApplicationInfoOrThrow();
	// Installed apps are allowed to read all settings.
	if (!ai.isInstantApp()) {		if (!ai.isInstantApp()) {
	return;		return;
	}		}
	// Instant Apps are allowed to read settings defined by applications.
	// TODO: Replace this with an API that allows the setting application to say if a setting
	// shoud/shouldn't be accessible.
	if (!setting.isDefaultFromSystem()) {
	return;
	}
	if (!getInstantAppAccessibleSettings(settingsType).contains(settingName)) {		if (!getInstantAppAccessibleSettings(settingsType).contains(settingName)) {
	throw new SecurityException("Setting " + settingName + " is not accessible from"		throw new SecurityException("Setting " + settingName + " is not accessible from"
	+ " ephemeral package " + getCallingPackage());		+ " ephemeral package " + getCallingPackage());