Skip to content

DeviceConfig: make product overrides authoritative #1371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pbzin wants to merge 1 commit into
base: 16.0
Choose a base branch
from
Open

DeviceConfig: make product overrides authoritative #1371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 41 additions & 25 deletions core/java/com/android/internal/util/crdroid/DeviceConfigUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,18 @@
import android.content.res.Resources;
import android.provider.Settings;
import android.util.Log;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;

import com.android.internal.util.ArrayUtils;
import java.util.Arrays;

public class DeviceConfigUtils {

private static final String TAG = DeviceConfigUtils.class.getSimpleName();

private static final boolean DEBUG = false;

/** Allows the override writer itself to pass through the public Config write path. */
private static final ThreadLocal<Boolean> sApplyingDefaults = new ThreadLocal<>();

private static String[] getDeviceConfigsOverride() {
String[] globalDeviceConfigs =
Resources.getSystem().getStringArray(com.android.internal.R.array.global_device_configs_override);
Expand All @@ -43,12 +42,19 @@ private static String[] getDeviceConfigsOverride() {
}

public static boolean shouldDenyDeviceConfigControl(String namespace, String property) {
if (Boolean.TRUE.equals(sApplyingDefaults.get())) {
return false;
}

if (DEBUG) Log.d(TAG, "shouldAllowDeviceConfigControl, namespace=" + namespace + ", property=" + property);
for (String p : getDeviceConfigsOverride()) {
String[] kv = p.split("=");
String fullKey = kv[0];
String[] nsKey = fullKey.split("/");
if (nsKey[0] == namespace && nsKey[1] == property){
String[] kv = p.split("=", 2);
String[] nsKey = kv[0].split("/", 2);
if (nsKey.length != 2) {
Log.w(TAG, "Ignoring malformed DeviceConfig override: " + p);
continue;
}
if (nsKey[0].equals(namespace) && nsKey[1].equals(property)) {
if (DEBUG) Log.d(TAG, "shouldAllowDeviceConfigControl, deny, namespace=" + namespace + ", property=" + property);
return true;
}
Expand All @@ -59,27 +65,37 @@ public static boolean shouldDenyDeviceConfigControl(String namespace, String pro

public static void setDefaultProperties(String filterNamespace, String filterProperty) {
if (DEBUG) Log.d(TAG, "setDefaultProperties");
for (String p : getDeviceConfigsOverride()) {
String[] kv = p.split("=");
String fullKey = kv[0];
String[] nsKey = fullKey.split("/");
final boolean wasApplyingDefaults = Boolean.TRUE.equals(sApplyingDefaults.get());
sApplyingDefaults.set(true);
try {
for (String p : getDeviceConfigsOverride()) {
String[] kv = p.split("=", 2);
String[] nsKey = kv[0].split("/", 2);
if (nsKey.length != 2) {
Log.w(TAG, "Ignoring malformed DeviceConfig override: " + p);
continue;
}

String namespace = nsKey[0];
String key = nsKey[1];
String namespace = nsKey[0];
String key = nsKey[1];

if (filterNamespace != null && filterNamespace == namespace){
continue;
}
if (filterNamespace != null && !filterNamespace.equals(namespace)) {
continue;
}

if (filterProperty != null && filterProperty == key){
continue;
}
if (filterProperty != null && !filterProperty.equals(key)) {
continue;
}

String value = "";
if (kv.length > 1) {
value = kv[1];
String value = kv.length > 1 ? kv[1] : "";
Settings.Config.putString(namespace, key, value, false);
}
} finally {
if (wasApplyingDefaults) {
sApplyingDefaults.set(true);
} else {
sApplyingDefaults.remove();
}
Settings.Config.putString(namespace, key, value, false);
}
}
}