Merge "remove obsolete apf properties from platform" am: 6c88b0d188 am: 26fd2a8305
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2286895 Change-Id: I7e76cb74d19f644a4f5f9fa3107366d6c40bf489 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -342,22 +342,6 @@
|
|||||||
<!-- Mask to use when checking skb mark defined in config_networkWakeupPacketMark above. -->
|
<!-- Mask to use when checking skb mark defined in config_networkWakeupPacketMark above. -->
|
||||||
<integer name="config_networkWakeupPacketMask">0</integer>
|
<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
|
<!-- Default value for ConnectivityManager.getMultipathPreference() on metered networks. Actual
|
||||||
device behaviour is controlled by Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE.
|
device behaviour is controlled by Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE.
|
||||||
This is the default value of that setting. -->
|
This is the default value of that setting. -->
|
||||||
|
|||||||
@@ -2032,8 +2032,6 @@
|
|||||||
<java-symbol type="integer" name="config_networkAvoidBadWifi" />
|
<java-symbol type="integer" name="config_networkAvoidBadWifi" />
|
||||||
<java-symbol type="integer" name="config_networkWakeupPacketMark" />
|
<java-symbol type="integer" name="config_networkWakeupPacketMark" />
|
||||||
<java-symbol type="integer" name="config_networkWakeupPacketMask" />
|
<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_networkDefaultDailyMultipathQuotaBytes" />
|
||||||
<java-symbol type="integer" name="config_networkMeteredMultipathPreference" />
|
<java-symbol type="integer" name="config_networkMeteredMultipathPreference" />
|
||||||
<java-symbol type="array" name="config_networkSupportedKeepaliveCount" />
|
<java-symbol type="array" name="config_networkSupportedKeepaliveCount" />
|
||||||
|
|||||||
Reference in New Issue
Block a user