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

Commit 51f456f5 authored by Wink Saville's avatar Wink Saville
Browse files

Support WiFi only device at runtime. 

To date WiFi only devices were defined by the list of networkAttributes
in config.xml overriden in on a per-device basis. This change is the
simplest change needed to determine this at runtime and therefore allowing
a single build to support the two different configurations.

Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91
parent c5fc9988

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

+8 −0
Original line number Diff line number Diff line
@@ -432,6 +432,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            mRadioAttributes[r.mType] = r;

        }



        // TODO: What is the "correct" way to do determine if this is a wifi only device?

        boolean wifiOnly = SystemProperties.getBoolean("ro.radio.noril", false);

        log("wifiOnly=" + wifiOnly);

        String[] naStrings = context.getResources().getStringArray(

                com.android.internal.R.array.networkAttributes);

        for (String naString : naStrings) {
@@ -442,6 +445,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                            n.type);

                    continue;

                }

                if (wifiOnly && ConnectivityManager.isNetworkTypeMobile(n.type)) {

                    log("networkAttributes - ignoring mobile as this dev is wifiOnly " +

                            n.type);

                    continue;

                }

                if (mNetConfigs[n.type] != null) {

                    loge("Error in networkAttributes - ignoring attempt to redefine type " +

                            n.type);