Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 255cac24 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Match network roaming state to avoid wtf()." am: 3fb2711e

am: bafba08c

Change-Id: I3dd62df8b9bb89936c1c722849bfa921bc8b3e6d
parents 3dbbd3d3 bafba08c
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -949,7 +949,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
                        getNetworkTypeName(networkType), "");
                info.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);
                info.setIsAvailable(true);
                state = new NetworkState(info, new LinkProperties(), new NetworkCapabilities(),
                final NetworkCapabilities capabilities = new NetworkCapabilities();
                capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING,
                        !info.isRoaming());
                state = new NetworkState(info, new LinkProperties(), capabilities,
                        null, null, null);
            }
            filterNetworkStateForUid(state, uid, ignoreBlocked);