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

Commit 0a38efde 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 

am: 255cac24

Change-Id: I04247a01f6a93001079429b1ee40f28afc877dcd
parents 1a958a57 255cac24

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -972,7 +972,10 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                        getNetworkTypeName(networkType), "");

                        getNetworkTypeName(networkType), "");

                info.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);

                info.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);

                info.setIsAvailable(true);

                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);

                        null, null, null);

            }

            }

            filterNetworkStateForUid(state, uid, ignoreBlocked);

            filterNetworkStateForUid(state, uid, ignoreBlocked);