commit c621ac4b44e2661bd720a9d4d013c4ca04d51db9
author Junyu Lai <junyulai@google.com> Mon Jan 13 14:09:52 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 13 14:09:52 2020 +0000
tree ca838059b046c6d63e60005aab80da137b0366b2
parent fcda85b7729c4142182ad7953d4d6143970d2ae1
parent a97b5c3bb30bed46b4b7e802fdac8e111580563e

Merge changes from topic "sp04"

* changes:
  [SP05] add unit test for onStatsProviderLimitReached in NPMS
  [SP04] add unit test for NetworkStatsProvider
  [SP03] support registerNetworkStatsProvider API
  [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull

core/java/android/net/nsd/NsdServiceInfo.java

diff --git a/core/java/android/net/nsd/NsdServiceInfo.java b/core/java/android/net/nsd/NsdServiceInfo.java
index 459b140..0946499 100644
--- a/core/java/android/net/nsd/NsdServiceInfo.java
+++ b/core/java/android/net/nsd/NsdServiceInfo.java
@@ -17,13 +17,13 @@
 package android.net.nsd;
 
 import android.annotation.NonNull;
-import android.annotation.UnsupportedAppUsage;
-import android.os.Parcelable;
+import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Parcel;
+import android.os.Parcelable;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.util.Base64;
 import android.util.Log;
-import android.util.ArrayMap;
 
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;