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

Merge "Bug fix: LCE list initialization" am: fb799763d1

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

Change-Id: I5ea86018c281f7c9ec58456f60f77aa03fb46da8
This commit is contained in:
Kai Shi
2021-10-15 16:36:23 +00:00
committed by Automerger Merge Worker
parent 092fd1d532 fb799763d1
commit 615b90f0ae
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -385,6 +385,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
private int[] mAllowedNetworkTypeReason; private int[] mAllowedNetworkTypeReason;
private long[] mAllowedNetworkTypeValue; private long[] mAllowedNetworkTypeValue;
private static final List<LinkCapacityEstimate> INVALID_LCE_LIST =
new ArrayList<LinkCapacityEstimate>(Arrays.asList(new LinkCapacityEstimate(
LinkCapacityEstimate.LCE_TYPE_COMBINED,
LinkCapacityEstimate.INVALID, LinkCapacityEstimate.INVALID)));
private List<List<LinkCapacityEstimate>> mLinkCapacityEstimateLists; private List<List<LinkCapacityEstimate>> mLinkCapacityEstimateLists;
/** /**
@@ -719,7 +723,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
mPhysicalChannelConfigs.add(i, new ArrayList<>()); mPhysicalChannelConfigs.add(i, new ArrayList<>());
mAllowedNetworkTypeReason[i] = -1; mAllowedNetworkTypeReason[i] = -1;
mAllowedNetworkTypeValue[i] = -1; mAllowedNetworkTypeValue[i] = -1;
mLinkCapacityEstimateLists.add(i, new ArrayList<>()); mLinkCapacityEstimateLists.add(i, INVALID_LCE_LIST);
} }
} }
@@ -819,7 +823,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
mPhysicalChannelConfigs.add(i, new ArrayList<>()); mPhysicalChannelConfigs.add(i, new ArrayList<>());
mAllowedNetworkTypeReason[i] = -1; mAllowedNetworkTypeReason[i] = -1;
mAllowedNetworkTypeValue[i] = -1; mAllowedNetworkTypeValue[i] = -1;
mLinkCapacityEstimateLists.add(i, new ArrayList<>()); mLinkCapacityEstimateLists.add(i, INVALID_LCE_LIST);
} }
mAppOps = mContext.getSystemService(AppOpsManager.class); mAppOps = mContext.getSystemService(AppOpsManager.class);