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

Merge "Qualify references to WifiNetworkSuggestions"

Browse Source
This commit is contained in:
Anton Hansson
2021-10-21 11:53:06 +00:00
committed by Gerrit Code Review
parent acd3e2be33 df40109271
commit 7ea2767864
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/android/net/ConnectivityManager.java
View File

@@ -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:

17
framework/src/android/net/NetworkCapabilities.java
View File

@@ -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.
* In the case of wifi network suggestors apps, this field is also location sensitive, so the
* app needs to hold {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. If the
* app targets SDK version greater than or equal to {@link Build.VERSION_CODES#S}, then they
* also need to use {@link NetworkCallback#FLAG_INCLUDE_LOCATION_INFO} to get the info in their
* callback. If the apps targets SDK version equal to {{@link Build.VERSION_CODES#R}, this field
* will always be included. The app will be blamed for location access if this field is
* included.
* {@link android.net.wifi.WifiNetworkSuggestion WifiNetworkSuggestion}), and only for the
* network they own. In the case of wifi network suggestors apps, this field is also location
* sensitive, so the app needs to hold {@link android.Manifest.permission#ACCESS_FINE_LOCATION}
* permission. If the app targets SDK version greater than or equal to
* {@link Build.VERSION_CODES#S}, then they also need to use
* {@link NetworkCallback#FLAG_INCLUDE_LOCATION_INFO} to get the info in their callback. If the
* apps targets SDK version equal to {{@link Build.VERSION_CODES#R}, this field will always be
* included. The app will be blamed for location access if this field is included.
* </p>
*/
public int getOwnerUid() {