Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use PersistableBundle.getInt(String, int) with default value parameter

Browse Source 
The default value for PersistableBundle.getInt(String) is 0. This
value is a valid value for the KEY_PREFERRED_IKE_PROTOCOL_INT
setting which is PREFERRED_IKE_PROTOCOL_AUTO. But the preferred
design now is to use IPv4 instead of AUTO. The default value for
getting KEY_PREFERRED_IKE_PROTOCOL_INT should be explicitly set
to an invalid value so that the flow will go into the default
case as expectation.

Bug: 269714970
Bug: 284246686
Test: m ; flash and check the value
(cherry picked from https://android-review.googlesource.com/q/commit:49f9216a1255b1891e20f85036d913270b4e01ce)
Merged-In: Icf83ec1a50972b2d9ce7d168dad75dd9aa3cf1bb
Change-Id: Icf83ec1a50972b2d9ce7d168dad75dd9aa3cf1bb
This commit is contained in:
chiachangwang
2023-05-30 06:49:39 +00:00
committed by Cherrypicker Worker
parent 878b61b063
commit 4030b6172d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -309,6 +309,8 @@ public class Vpn {
*/
@VisibleForTesting
static final int DEFAULT_LONG_LIVED_TCP_CONNS_EXPENSIVE_TIMEOUT_SEC = 60;
private static final int PREFERRED_IKE_PROTOCOL_UNKNOWN = -1;
/**
* Prefer using {@link IkeSessionParams.ESP_IP_VERSION_AUTO} and
* {@link IkeSessionParams.ESP_ENCAP_TYPE_AUTO} for ESP packets.
@@ -3643,11 +3645,11 @@ public class Vpn {
final int natKeepalive =
carrierConfig.getInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT);
final int preferredIpPortocol =
carrierConfig.getInt(KEY_PREFERRED_IKE_PROTOCOL_INT);
final int preferredIpProtocol = carrierConfig.getInt(
KEY_PREFERRED_IKE_PROTOCOL_INT, PREFERRED_IKE_PROTOCOL_UNKNOWN);
final String mccMnc = perSubTm.getSimOperator(subId);
final CarrierConfigInfo info =
buildCarrierConfigInfo(mccMnc, natKeepalive, preferredIpPortocol);
buildCarrierConfigInfo(mccMnc, natKeepalive, preferredIpProtocol);
synchronized (Vpn.this) {
mCachedCarrierConfigInfoPerSubId.put(subId, info);
}