Merge "Fallback to default device settings if not found for virtual device" into main (72ebbb5c) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -459,7 +459,8 @@ public class SettingsProvider extends ContentProvider {
		Setting setting = getSecureSetting(name, requestingUserId, callingDeviceId);
		// If any overridden setting is not available for a virtual device, return the
		// setting corresponding to the default device.
		if (setting == null \|\| setting.isNull()) {
		if (callingDeviceId != Context.DEVICE_ID_DEFAULT
		&& (setting == null \|\| setting.isNull())) {
		setting = getSecureSetting(name, requestingUserId, Context.DEVICE_ID_DEFAULT);
		}
		return packageValueForCallResult(SETTINGS_TYPE_SECURE, name, requestingUserId,
		@@ -469,7 +470,8 @@ public class SettingsProvider extends ContentProvider {
		Setting setting = getSystemSetting(name, requestingUserId, callingDeviceId);
		// If any overridden setting is not available for a virtual device, return the
		// setting corresponding to the default device.
		if (setting == null \|\| setting.isNull()) {
		if (callingDeviceId != Context.DEVICE_ID_DEFAULT
		&& (setting == null \|\| setting.isNull())) {
		setting = getSystemSetting(name, requestingUserId, Context.DEVICE_ID_DEFAULT);
		}
		return packageValueForCallResult(SETTINGS_TYPE_SYSTEM, name, requestingUserId,