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

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

Merge "[Telephony] Fix test fail in PhysicalChannelConfig" am: 88029d00 am: be31ba82 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1675553

Change-Id: Ia4aa1dfe70105e89b7f0f30db434ea8f530a28bc
parents 68830343 be31ba82

src/java/com/android/internal/telephony/DefaultPhoneNotifier.java

+2 −2
Original line number Diff line number Diff line
@@ -241,8 +241,8 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    @Override

    public void notifyPhysicalChannelConfig(Phone sender,

                                                   List<PhysicalChannelConfig> configs) {

        int subId = sender.getSubId();

        mTelephonyRegistryMgr.notifyPhysicalChannelConfigForSubscriber(subId, configs);

        mTelephonyRegistryMgr.notifyPhysicalChannelConfigForSubscriber(

                sender.getPhoneId(), sender.getSubId(), configs);

    }



    @Override

tests/telephonytests/src/com/android/internal/telephony/TelephonyRegistryTest.java

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 
        List<PhysicalChannelConfig> configs = new ArrayList<>(1);

        configs.add(config);



        mTelephonyRegistry.notifyPhysicalChannelConfigForSubscriber(subId, configs);

        mTelephonyRegistry.notifyPhysicalChannelConfigForSubscriber(0, subId, configs);

        mTelephonyRegistry.listenWithEventList(subId, mContext.getOpPackageName(),

                mContext.getAttributionTag(), mTelephonyCallback.callback, events, true);

        processAllMessages();