diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:31 +0000 |
| commit | fbb796b347092b99277d5440d646d4415e006520 (patch) | |
| tree | 378f123a88a9d2ace965a3a55c6edd663926386c /src/android/net/util/NetworkStackUtils.java | |
| parent | 8f2ec7b3b9cecd2c2ac4abd865a28a642535f443 (diff) | |
| parent | efd27bd46247d46af3592e8a151344e8c22e8292 (diff) | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'src/android/net/util/NetworkStackUtils.java')
| -rw-r--r-- | src/android/net/util/NetworkStackUtils.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/android/net/util/NetworkStackUtils.java b/src/android/net/util/NetworkStackUtils.java index 4afc34b..4e340ce 100644 --- a/src/android/net/util/NetworkStackUtils.java +++ b/src/android/net/util/NetworkStackUtils.java @@ -18,6 +18,7 @@ package android.net.util; import android.annotation.NonNull; import android.annotation.Nullable; +import android.provider.DeviceConfig; import android.util.SparseArray; import java.io.FileDescriptor; @@ -183,8 +184,8 @@ public class NetworkStackUtils { @Nullable public static String getDeviceConfigProperty(@NonNull String namespace, @NonNull String name, @Nullable String defaultValue) { - // TODO: Link to DeviceConfig API once it is ready. - return defaultValue; + String value = DeviceConfig.getProperty(namespace, name); + return value != null ? value : defaultValue; } /** |