|
|
|
@ -307,7 +307,6 @@ public class ConnectionHelper {
|
|
|
|
|
|
|
|
|
|
boolean captive = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
|
|
|
|
|
if ((require_validated || (require_validated_captive && captive)) &&
|
|
|
|
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
|
|
|
|
|
!caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
|
|
|
|
|
Log.i("isMetered: not validated captive=" + captive);
|
|
|
|
|
return null;
|
|
|
|
@ -374,7 +373,6 @@ public class ConnectionHelper {
|
|
|
|
|
|
|
|
|
|
boolean captive = caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
|
|
|
|
|
if ((require_validated || (require_validated_captive && captive)) &&
|
|
|
|
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
|
|
|
|
|
!caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
|
|
|
|
|
Log.i("isMetered: underlying not validated captive=" + captive);
|
|
|
|
|
continue;
|
|
|
|
|