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

Commit ef568c97 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

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

parents dcbba67a af2eb4f6

core/java/android/net/NetworkConfig.java

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

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

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

        if (fragments.length > 4) {

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

        } else {

            dependencyMet = true;

        }

    }



    /**

core/res/res/values/config.xml

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

         based on the hardware -->

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    </string-array>



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