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

Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 1515b6c96d

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

Change-Id: I6653d668d1fdc4370f8d5db1da41214b9755bb4d
This commit is contained in:
Treehugger Robot
2021-04-07 01:16:24 +00:00
committed by Automerger Merge Worker
parent afd7250ef7 1515b6c96d
commit 0eadb2848d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3418,6 +3418,8 @@ public class ConnectivityManager {
* not include location sensitive info. * not include location sensitive info.
* </p> * </p>
*/ */
// Note: Some existing fields which are location sensitive may still be included without
// this flag if the app targets SDK < S (to maintain backwards compatibility).
public static final int FLAG_INCLUDE_LOCATION_INFO = 1 << 0; public static final int FLAG_INCLUDE_LOCATION_INFO = 1 << 0;
/** @hide */ /** @hide */

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

@@ -1111,7 +1111,9 @@ public final class NetworkCapabilities implements Parcelable {
* app needs to hold {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission. If 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 * 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 * also need to use {@link NetworkCallback#FLAG_INCLUDE_LOCATION_INFO} to get the info in their
* callback. The app will be blamed for location access if this field is included. * 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> * </p>
*/ */
public int getOwnerUid() { public int getOwnerUid() {