LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove the DisabledState from NsdService" am: d65740346e am: 537e5289fe

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110094

Change-Id: I86da81dbd9e5d55042a9cf2df8d5876a4f244e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Hu
2022-06-01 10:17:28 +00:00
committed by Automerger Merge Worker
parent c24c82e9d4 537e5289fe
commit 6773b82577
2 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework-t/src/android/net/nsd/NsdManager.java
View File

@@ -175,6 +175,7 @@ public final class NsdManager {
*
* @see #ACTION_NSD_STATE_CHANGED
*/
// TODO: Deprecate this since NSD service is never disabled.
public static final int NSD_STATE_DISABLED = 1;
/**
@@ -230,17 +231,12 @@ public final class NsdManager {
public static final int DAEMON_STARTUP = 19;
/** @hide */
public static final int ENABLE = 20;
/** @hide */
public static final int DISABLE = 21;
public static final int MDNS_SERVICE_EVENT = 20;
/** @hide */
public static final int MDNS_SERVICE_EVENT = 22;
public static final int REGISTER_CLIENT = 21;
/** @hide */
public static final int REGISTER_CLIENT = 23;
/** @hide */
public static final int UNREGISTER_CLIENT = 24;
public static final int UNREGISTER_CLIENT = 22;
/** Dns based service discovery protocol */
public static final int PROTOCOL_DNS_SD = 0x0001;
@@ -266,8 +262,6 @@ public final class NsdManager {
EVENT_NAMES.put(RESOLVE_SERVICE_SUCCEEDED, "RESOLVE_SERVICE_SUCCEEDED");
EVENT_NAMES.put(DAEMON_CLEANUP, "DAEMON_CLEANUP");
EVENT_NAMES.put(DAEMON_STARTUP, "DAEMON_STARTUP");
EVENT_NAMES.put(ENABLE, "ENABLE");
EVENT_NAMES.put(DISABLE, "DISABLE");
EVENT_NAMES.put(MDNS_SERVICE_EVENT, "MDNS_SERVICE_EVENT");
}