Merge "Qualify references to WifiNetworkSuggestions"

framework/src/android/net/ConnectivityManager.java

@@ -46,7 +46,6 @@ import android.net.SocketKeepalive.Callback;
 import android.net.TetheringManager.StartTetheringCallback;
 import android.net.TetheringManager.TetheringEventCallback;
 import android.net.TetheringManager.TetheringRequest;
-import android.net.wifi.WifiNetworkSuggestion;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
@@ -3479,7 +3478,8 @@ public class ConnectivityManager {
          * {@link NetworkCapabilities#getTransportInfo()}) like {@link android.net.wifi.WifiInfo}
          * contain location sensitive information.
          * <li> OwnerUid (retrieved via {@link NetworkCapabilities#getOwnerUid()} is location
-         * sensitive for wifi suggestor apps (i.e using {@link WifiNetworkSuggestion}).</li>
+         * sensitive for wifi suggestor apps (i.e using
+         * {@link android.net.wifi.WifiNetworkSuggestion WifiNetworkSuggestion}).</li>
          * </p>
          * <p>
          * Note:

framework/src/android/net/NetworkCapabilities.java

@@ -27,7 +27,6 @@ import android.annotation.SuppressLint;
 import android.annotation.SystemApi;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.net.ConnectivityManager.NetworkCallback;
-import android.net.wifi.WifiNetworkSuggestion;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -1192,14 +1191,14 @@ public final class NetworkCapabilities implements Parcelable {
      *
      * <p>
      * This field will only be populated for VPN and wifi network suggestor apps (i.e using
-     * {@link WifiNetworkSuggestion}), and only for the network they own.
+     * {@link android.net.wifi.WifiNetworkSuggestion WifiNetworkSuggestion}), and only for the
-     * In the case of wifi network suggestors apps, this field is also location sensitive, so the
+     * network they own. In the case of wifi network suggestors apps, this field is also location
-     * app needs to hold {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. If the
+     * sensitive, so the app needs to hold {@link android.Manifest.permission#ACCESS_FINE_LOCATION}
-     * app targets SDK version greater than or equal to {@link Build.VERSION_CODES#S}, then they
+     * permission. If the app targets SDK version greater than or equal to
-     * also need to use {@link NetworkCallback#FLAG_INCLUDE_LOCATION_INFO} to get the info in their
+     * {@link Build.VERSION_CODES#S}, then they also need to use
-     * callback. If the apps targets SDK version equal to {{@link Build.VERSION_CODES#R}, this field
+     * {@link NetworkCallback#FLAG_INCLUDE_LOCATION_INFO} to get the info in their callback. If the
-     * will always be included. The app will be blamed for location access if this field is
+     * apps targets SDK version equal to {{@link Build.VERSION_CODES#R}, this field will always be
-     * included.
+     * included. The app will be blamed for location access if this field is included.
      * </p>
      */
     public int getOwnerUid() {