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

Merge "Move module utils to the module package." am: eeb7c450aa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c42945df36d94e4abdf073fac17141f3b23d034
This commit is contained in:
Chalard Jean
2020-12-21 06:11:51 +00:00
committed by Automerger Merge Worker
parent 6fe90d9859 1c1883133b
commit 07d2787724
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/NsdService.java
View File

@@ -25,7 +25,6 @@ import android.net.Uri;
import android.net.nsd.INsdManager; import android.net.nsd.INsdManager;
import android.net.nsd.NsdManager; import android.net.nsd.NsdManager;
import android.net.nsd.NsdServiceInfo; import android.net.nsd.NsdServiceInfo;
import android.net.util.nsd.DnsSdTxtRecord;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.Message; import android.os.Message;
@@ -42,6 +41,7 @@ import com.android.internal.util.AsyncChannel;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import com.android.internal.util.State; import com.android.internal.util.State;
import com.android.internal.util.StateMachine; import com.android.internal.util.StateMachine;
import com.android.net.module.util.DnsSdTxtRecord;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;