diff options
| author | Xin Li <delphij@google.com> | 2019-09-04 13:34:54 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-09-04 13:34:54 -0700 |
| commit | efd27bd46247d46af3592e8a151344e8c22e8292 (patch) | |
| tree | aaf5e9d4c14079e59b37770f4a9aac38f67e19eb /src/android/net/util/NetworkStackUtils.java | |
| parent | 6002e86ede90e8758ede975e8fc3613b00e71169 (diff) | |
| parent | 8d6567a96f484d7bf3ee293deaa888a40bc001ec (diff) | |
DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: If71a5217a446ea773d461eab0bc0109b18246e33
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; } /** |