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

Commit 62262160 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Match network roaming state to avoid wtf(). 

Test: sure
Bug: 70174865
Change-Id: I02faef05e3fb918c3c023fb2fdd1886d45cc8c71
Exempt-From-Owner-Approval: P0 bug
parent a9494954

services/core/java/com/android/server/ConnectivityService.java

+4 −1
Original line number Diff line number Diff line
@@ -951,7 +951,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);