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

resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp

Browse Source 
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
This commit is contained in:
Andrew Solovay
2018-10-04 14:59:09 -07:00
parent 29238b30fd be99bca44d
commit 1ea270c94d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/NetworkMisc.java
View File

@@ -46,7 +46,7 @@ public class NetworkMisc implements Parcelable {
/** /**
* Set if the user desires to use this network even if it is unvalidated. This field has meaning * Set if the user desires to use this network even if it is unvalidated. This field has meaning
* only if {#link explicitlySelected} is true. If it is, this field must also be set to the * only if {@link explicitlySelected} is true. If it is, this field must also be set to the
* appropriate value based on previous user choice. * appropriate value based on previous user choice.
*/ */
public boolean acceptUnvalidated; public boolean acceptUnvalidated;