From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 3 Nov 2017 23:18:45 +0000 (+0000)
Subject: Merge "Define NOT_ROAMING network capability." am: 8f380ab29c am: 3fe1ae29cd
X-Git-Tag: android-x86-9.0-r1~336^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e4595d58b6c8d0a4495d089a826f42cb3ca46b85;p=android-x86%2Fframeworks-base.git

Merge "Define NOT_ROAMING network capability." am: 8f380ab29c am: 3fe1ae29cd
am: 69b31d4eb0

Change-Id: I04220ff55fc87dbf8d417a30f15a06a877b412d4
---

e4595d58b6c8d0a4495d089a826f42cb3ca46b85
diff --cc tests/net/java/android/net/NetworkCapabilitiesTest.java
index 7346f9f95041,e6170cb42cbb..cd2d0985c793
--- a/tests/net/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/java/android/net/NetworkCapabilitiesTest.java
@@@ -16,7 -16,9 +16,8 @@@
  
  package android.net;
  
+ import static android.net.NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;
  import static android.net.NetworkCapabilities.NET_CAPABILITY_CBS;
 -import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;
  import static android.net.NetworkCapabilities.NET_CAPABILITY_EIMS;
  import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
  import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;