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

Commit c0015552 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Telephony] Physical Channel Config should support DSDS" am: 435ba73a am: 80b01a7f 

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

Change-Id: Ia681cb7352671ba91dcac4823c6cbb86f144d1e1
parents 0d3acacd 80b01a7f

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

+8 −7
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 


    private final LocalLog mListenLog = new LocalLog(200);



    private List<PhysicalChannelConfig> mPhysicalChannelConfigs;

    private List<List<PhysicalChannelConfig>> mPhysicalChannelConfigs;



    private boolean[] mIsDataEnabled;
@@ -583,9 +583,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            mPreciseDataConnectionStates.add(new ArrayMap<>());

            mBarringInfo.add(i, new BarringInfo());

            mTelephonyDisplayInfos[i] = null;

            mPhysicalChannelConfigs.add(i, new PhysicalChannelConfig.Builder().build());

            mIsDataEnabled[i] = false;

            mDataEnabledReason[i] = TelephonyManager.DATA_ENABLED_REASON_USER;

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

            mAllowedNetworkTypeReason[i] = -1;

            mAllowedNetworkTypeValue[i] = -1;

            mLinkCapacityEstimateLists.add(i, new ArrayList<>());
@@ -683,9 +683,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            mPreciseDataConnectionStates.add(new ArrayMap<>());

            mBarringInfo.add(i, new BarringInfo());

            mTelephonyDisplayInfos[i] = null;

            mPhysicalChannelConfigs.add(i, new PhysicalChannelConfig.Builder().build());

            mIsDataEnabled[i] = false;

            mDataEnabledReason[i] = TelephonyManager.DATA_ENABLED_REASON_USER;

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

            mAllowedNetworkTypeReason[i] = -1;

            mAllowedNetworkTypeValue[i] = -1;

            mLinkCapacityEstimateLists.add(i, new ArrayList<>());
@@ -1176,8 +1176,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    try {

                        r.callback.onPhysicalChannelConfigChanged(

                                shouldSanitizeLocationForPhysicalChannelConfig(r)

                                        ? getLocationSanitizedConfigs(mPhysicalChannelConfigs)

                                        : mPhysicalChannelConfigs);

                                        ? getLocationSanitizedConfigs(

                                                mPhysicalChannelConfigs.get(phoneId))

                                        : mPhysicalChannelConfigs.get(phoneId));

                    } catch (RemoteException ex) {

                        remove(r.binder);

                    }
@@ -2387,7 +2388,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        synchronized (mRecords) {

            int phoneId = SubscriptionManager.getPhoneId(subId);

            if (validatePhoneId(phoneId)) {

                mPhysicalChannelConfigs.set(phoneId, configs.get(phoneId));

                mPhysicalChannelConfigs.set(phoneId, configs);

                for (Record r : mRecords) {

                    if (r.matchTelephonyCallbackEvent(

                            TelephonyCallback.EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED)
@@ -2594,6 +2595,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                pw.println("mDataEnabledReason=" + mDataEnabledReason);

                pw.println("mAllowedNetworkTypeReason=" + mAllowedNetworkTypeReason[i]);

                pw.println("mAllowedNetworkTypeValue=" + mAllowedNetworkTypeValue[i]);

                pw.println("mPhysicalChannelConfigs=" + mPhysicalChannelConfigs.get(i));

                pw.println("mLinkCapacityEstimateList=" + mLinkCapacityEstimateLists.get(i));

                pw.decreaseIndent();

            }
@@ -2604,7 +2606,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            pw.println("mEmergencyNumberList=" + mEmergencyNumberList);

            pw.println("mDefaultPhoneId=" + mDefaultPhoneId);

            pw.println("mDefaultSubId=" + mDefaultSubId);

            pw.println("mPhysicalChannelConfigs=" + mPhysicalChannelConfigs);



            pw.decreaseIndent();