summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChiachang Wang <chiachangwang@google.com>2019-04-01 09:56:05 +0800
committerChiachang Wang <chiachangwang@google.com>2019-04-01 09:56:05 +0800
commit8dea27b56096816f93aed976be75358a14859b3f (patch)
tree94475329d63f4246cedbf61135daaf830de48968
parent5520e478e87fec276d56af2df462970706f6dbba (diff)
Provide link to android experimental flags API
Add function to link to android experiemental flags API Bug: 120013793 Test: Build and atest NetworkStackTests Change-Id: I14b9a6f06f841a9d63e8c1954907447a9e7eb8a5
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/android/net/util/NetworkStackUtils.java16
2 files changed, 17 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b60dc3..df886ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,7 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-
+ <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
<!-- Signature permission defined in NetworkStackStub -->
<uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />
<application>
diff --git a/src/android/net/util/NetworkStackUtils.java b/src/android/net/util/NetworkStackUtils.java
index fedb8d1..670563c 100644
--- a/src/android/net/util/NetworkStackUtils.java
+++ b/src/android/net/util/NetworkStackUtils.java
@@ -17,6 +17,7 @@
package android.net.util;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.util.SparseArray;
import java.io.FileDescriptor;
@@ -81,4 +82,19 @@ public class NetworkStackUtils {
}
return false;
}
+
+ /**
+ * Look up the value of a property for a particular namespace from {@link DeviceConfig}.
+ * @param namespace The namespace containing the property to look up.
+ * @param name The name of the property to look up.
+ * @param defaultValue The value to return if the property does not exist or has no non-null
+ * value.
+ * @return the corresponding value, or defaultValue if none exists.
+ */
+ @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;
+ }
}