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

Commit 759efacd authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE 

* commit 'ef568c97':
  Make new networkAttribute parameter non-optional.
parents 9d5ac7bd ef568c97

core/java/android/net/NetworkConfig.java

+1 −5
Original line number Original line Diff line number Diff line
@@ -60,11 +60,7 @@ public class NetworkConfig { 
        type = Integer.parseInt(fragments[1]);

        type = Integer.parseInt(fragments[1]);

        radio = Integer.parseInt(fragments[2]);

        radio = Integer.parseInt(fragments[2]);

        priority = Integer.parseInt(fragments[3]);

        priority = Integer.parseInt(fragments[3]);

        if (fragments.length > 4) {

        dependencyMet = Boolean.parseBoolean(fragments[4]);

        dependencyMet = Boolean.parseBoolean(fragments[4]);

        } else {

            dependencyMet = true;

        }

    }

    }





    /**

    /**

core/res/res/values/config.xml

+10 −10
Original line number Original line Diff line number Diff line
@@ -131,17 +131,17 @@ 
         attributes.  This is used by the connectivity manager to decide which networks can coexist

         attributes.  This is used by the connectivity manager to decide which networks can coexist

         based on the hardware -->

         based on the hardware -->

    <!-- An Array of "[Connection name],[ConnectivityManager connection type],

    <!-- An Array of "[Connection name],[ConnectivityManager connection type],

         [associated radio-type],[priority]  -->

         [associated radio-type],[priority],[dependencyMet]  -->

    <!-- an optional 5th element can be added indicating boot-time dependency-met value.  Defaults to true -->

    <!-- the 5th element indicates boot-time dependency-met value. -->

    <string-array translatable="false" name="networkAttributes">

    <string-array translatable="false" name="networkAttributes">

        <item>"wifi,1,1,1"</item>

        <item>"wifi,1,1,1,true"</item>

        <item>"mobile,0,0,0"</item>

        <item>"mobile,0,0,0,true"</item>

        <item>"mobile_mms,2,0,2"</item>

        <item>"mobile_mms,2,0,2,true"</item>

        <item>"mobile_supl,3,0,2"</item>

        <item>"mobile_supl,3,0,2,true"</item>

        <item>"mobile_hipri,5,0,3"</item>

        <item>"mobile_hipri,5,0,3,true"</item>

        <item>"mobile_fota,10,0,2"</item>

        <item>"mobile_fota,10,0,2,true"</item>

        <item>"mobile_ims,11,0,2"</item>

        <item>"mobile_ims,11,0,2,true"</item>

        <item>"mobile_cbs,12,0,2"</item>

        <item>"mobile_cbs,12,0,2,true"</item>

    </string-array>

    </string-array>





    <!-- This string array should be overridden by the device to present a list of radio

    <!-- This string array should be overridden by the device to present a list of radio