Merge "Remove flag from local override command." into main (9a10a497) · Commits · e / os / android_frameworks_base

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

+22 −34

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@ import static android.provider.Settings.Config.SYNC_DISABLED_MODE_NONE;
		import static android.provider.Settings.Config.SYNC_DISABLED_MODE_PERSISTENT;
		import static android.provider.Settings.Config.SYNC_DISABLED_MODE_UNTIL_REBOOT;

		import static com.android.providers.settings.Flags.supportOverrides;

		import android.aconfig.Aconfig.parsed_flag;
		import android.aconfig.Aconfig.parsed_flags;
		import android.annotation.SuppressLint;
		@@ -269,9 +267,9 @@ public final class DeviceConfigService extends Binder {
		verb = CommandVerb.GET;
		} else if ("put".equalsIgnoreCase(cmd)) {
		verb = CommandVerb.PUT;
		} else if (supportOverrides() && "override".equalsIgnoreCase(cmd)) {
		} else if ("override".equalsIgnoreCase(cmd)) {
		verb = CommandVerb.OVERRIDE;
		} else if (supportOverrides() && "clear_override".equalsIgnoreCase(cmd)) {
		} else if ("clear_override".equalsIgnoreCase(cmd)) {
		verb = CommandVerb.CLEAR_OVERRIDE;
		} else if ("delete".equalsIgnoreCase(cmd)) {
		verb = CommandVerb.DELETE;
		@@ -285,7 +283,7 @@ public final class DeviceConfigService extends Binder {
		if (peekNextArg() == null) {
		isValid = true;
		}
		} else if (supportOverrides() && "list_local_overrides".equalsIgnoreCase(cmd)) {
		} else if ("list_local_overrides".equalsIgnoreCase(cmd)) {
		verb = CommandVerb.LIST_LOCAL_OVERRIDES;
		if (peekNextArg() == null) {
		isValid = true;
		@@ -427,14 +425,10 @@ public final class DeviceConfigService extends Binder {
		DeviceConfig.setProperty(namespace, key, value, makeDefault);
		break;
		case OVERRIDE:
		if (supportOverrides()) {
		DeviceConfig.setLocalOverride(namespace, key, value);
		}
		break;
		case CLEAR_OVERRIDE:
		if (supportOverrides()) {
		DeviceConfig.clearLocalOverride(namespace, key);
		}
		break;
		case DELETE:
		pout.println(delete(iprovider, namespace, key)
		@@ -452,7 +446,6 @@ public final class DeviceConfigService extends Binder {
		}
		} else {
		for (String line : listAll(iprovider)) {
		if (supportOverrides()) {
		boolean isPrivate = false;
		for (String privateNamespace : PRIVATE_NAMESPACES) {
		if (line.startsWith(privateNamespace)) {
		@@ -464,9 +457,6 @@ public final class DeviceConfigService extends Binder {
		if (!isPrivate) {
		pout.println(line);
		}
		} else {
		pout.println(line);
		}
		}
		}
		break;
		@@ -495,7 +485,6 @@ public final class DeviceConfigService extends Binder {
		}
		break;
		case LIST_LOCAL_OVERRIDES:
		if (supportOverrides()) {
		Map<String, Map<String, String>> underlyingValues =
		DeviceConfig.getUnderlyingValuesForOverriddenFlags();
		for (String overrideNamespace : underlyingValues.keySet()) {
		@@ -508,7 +497,6 @@ public final class DeviceConfigService extends Binder {
		pout.println(flagText + "=" + valueText);
		}
		}
		}
		break;
		case RESET:
		DeviceConfig.resetToDefaults(resetMode, namespace);