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

Commit 2003f5d6 authored by Kai Shi's avatar Kai Shi Committed by Automerger Merge Worker
Browse files

Merge "Bug fix: LCE list initialization" am: fb799763 am: 615b90f0 am:... 

Merge "Bug fix: LCE list initialization" am: fb799763 am: 615b90f0 am: d61cdd1c am: d3145d3c

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

Change-Id: I637e9b82d7fca1aead67b7df875929f12bbd4bc8
parents b7c2ca68 d3145d3c

services/core/java/com/android/server/TelephonyRegistry.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -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);