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

Commit c07e0d7a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "remove obsolete apf properties from platform" am: 6c88b0d1 am: 26fd2a83 am: 28d26295 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2286895



Change-Id: I03ad721bbf954084cc1d9296729bb526eef8709b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a832737 28d26295

core/res/res/values/config.xml

+0 −16
Original line number Diff line number Diff line
@@ -342,22 +342,6 @@ 
    <!-- Mask to use when checking skb mark defined in config_networkWakeupPacketMark above. -->

    <integer name="config_networkWakeupPacketMask">0</integer>



    <!-- Whether the APF Filter in the device should filter out IEEE 802.3 Frames

         Those frames are identified by the field Eth-type having values

         less than 0x600 -->

    <bool translatable="false" name="config_apfDrop802_3Frames">true</bool>



    <!-- An array of Denylisted EtherType, packets with EtherTypes within this array

         will be dropped

         TODO: need to put proper values, these are for testing purposes only -->

    <integer-array translatable="false" name="config_apfEthTypeBlackList">

        <item>0x88A2</item>

        <item>0x88A4</item>

        <item>0x88B8</item>

        <item>0x88CD</item>

        <item>0x88E3</item>

    </integer-array>



    <!-- Default value for ConnectivityManager.getMultipathPreference() on metered networks. Actual

         device behaviour is controlled by Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE.

         This is the default value of that setting. -->

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -2045,8 +2045,6 @@ 
  <java-symbol type="integer" name="config_networkAvoidBadWifi" />

  <java-symbol type="integer" name="config_networkWakeupPacketMark" />

  <java-symbol type="integer" name="config_networkWakeupPacketMask" />

  <java-symbol type="bool" name="config_apfDrop802_3Frames" />

  <java-symbol type="array" name="config_apfEthTypeBlackList" />

  <java-symbol type="integer" name="config_networkDefaultDailyMultipathQuotaBytes" />

  <java-symbol type="integer" name="config_networkMeteredMultipathPreference" />

  <java-symbol type="array" name="config_networkSupportedKeepaliveCount" />