summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorLuke Huang <huangluke@google.com>2021-06-13 16:09:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-13 16:09:49 +0000
commit109327feb03c2a84a3a186ea9cc16d26c5f58076 (patch)
tree6d7ec258ae35a9188590271990df3d0cdea06e4c /core/java/android
parentf9119ba72134835e9680d88bff70c9ad16c054a3 (diff)
parent05081aa3b0849e07134d0a9147d4f85b58dfe91d (diff)
Merge "Make NsdService only start the native daemon when needed and automatically clean it up." am: 05081aa3b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1717479 Change-Id: I6caa9933f307118414039b9dd2391939aeb15c0f
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/nsd/NsdManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java
index 64f20b839a63..5a25cfc00cd4 100644
--- a/core/java/android/net/nsd/NsdManager.java
+++ b/core/java/android/net/nsd/NsdManager.java
@@ -200,6 +200,9 @@ public final class NsdManager {
public static final int RESOLVE_SERVICE_SUCCEEDED = BASE + 20;
/** @hide */
+ public static final int DAEMON_CLEANUP = BASE + 21;
+
+ /** @hide */
public static final int ENABLE = BASE + 24;
/** @hide */
public static final int DISABLE = BASE + 25;