diff options
| author | Xin Li <delphij@google.com> | 2019-07-01 21:00:09 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-07-01 21:00:09 +0000 |
| commit | c08f0f415b68156cf42979c7bbf299807d8fe617 (patch) | |
| tree | 9f1d002947210dcc029c57f69c2c14cca1b8671b /src/android/net/util/NetworkStackUtils.java | |
| parent | c9b602d717a63aac4cb685ad3e962b80e1260c7d (diff) | |
| parent | ee88b37212c79c4f1addfac2e517858b1e23d099 (diff) | |
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: Ia0bc5d1cfe2114c6c6e7bb1f9a7120e5d10f41e0
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 541f9d8..9bf1b96 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; @@ -173,8 +174,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; } /** |