summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2018-03-05 09:59:20 +0000
committer android-build-merger <android-build-merger@google.com> 2018-03-05 09:59:20 +0000
commit4390c3b5151e78f51e5eb2e648824aea3ab03659 (patch)
tree2c68f4150f08d566a8345e8c6954cfc635b14337
parent5f311906c0947d113db25093949d8ef9da6b585e (diff)
parentc64dc7c63249effdbfd341994cf8ca591a6db936 (diff)
Merge "Add DNS_TETHER to the list of UIDs in the framework." am: 0b8d55e633
am: c64dc7c632 Change-Id: I73a7bac120fb682dde44c3eb0b7587a727d2f343
-rw-r--r--core/java/android/os/Process.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 5e6f5f5dad5b..d693ee8d941a 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -140,6 +140,12 @@ public class Process {
public static final int CAMERASERVER_UID = 1047;
/**
+ * Defines the UID/GID for the tethering DNS resolver (currently dnsmasq).
+ * @hide
+ */
+ public static final int DNS_TETHER_UID = 1052;
+
+ /**
* Defines the UID/GID for the WebView zygote process.
* @hide
*/