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

Commit 615b90f0 authored by Kai Shi's avatar Kai Shi Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5ea86018c281f7c9ec58456f60f77aa03fb46da8
parents 092fd1d5 fb799763

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

+6 −2
Original line number Diff line number Diff line
@@ -385,6 +385,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    private int[] mAllowedNetworkTypeReason;

    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;



    /**
@@ -719,7 +723,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            mPhysicalChannelConfigs.add(i, new ArrayList<>());

            mAllowedNetworkTypeReason[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<>());

            mAllowedNetworkTypeReason[i] = -1;

            mAllowedNetworkTypeValue[i] = -1;

            mLinkCapacityEstimateLists.add(i, new ArrayList<>());

            mLinkCapacityEstimateLists.add(i, INVALID_LCE_LIST);

        }



        mAppOps = mContext.getSystemService(AppOpsManager.class);