Snap for 4598635 from 049ecedd92d91fb692ec424311318cd8b8977b0d to pi-release

Change-Id: Ica483c727fc2da3c722fdf11e521fab348e2ac8a
This commit is contained in:
android-build-team Robot
2018-02-11 08:23:00 +00:00

View File

@@ -1402,7 +1402,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
public boolean isActiveNetworkMetered() {
enforceAccessPermission();
final NetworkCapabilities caps = getNetworkCapabilities(getActiveNetwork());
final int uid = Binder.getCallingUid();
final NetworkCapabilities caps = getUnfilteredActiveNetworkState(uid).networkCapabilities;
if (caps != null) {
return !caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
} else {