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

Commit 6ab27496 authored by Andy Chou's avatar Andy Chou Committed by Android (Google) Code Review
Browse files

Merge "Notify physical channel configuration with phoneId and subId" into qt-r1-dev

parents 2ea06507 9aa41ee7

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

+2 −1
Original line number Diff line number Diff line
@@ -245,9 +245,10 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    public void notifyPhysicalChannelConfiguration(Phone sender,

            List<PhysicalChannelConfig> configs) {

        int subId = sender.getSubId();

        int phoneId = sender.getPhoneId();

        try {

            if (mRegistry != null) {

                mRegistry.notifyPhysicalChannelConfigurationForSubscriber(subId, configs);

                mRegistry.notifyPhysicalChannelConfigurationForSubscriber(phoneId, subId, configs);

            }

        } catch (RemoteException ex) {

            // system process is dead

tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java

+1 −6
Original line number Diff line number Diff line
@@ -353,12 +353,7 @@ public class TelephonyRegistryMock extends ITelephonyRegistry.Stub { 
    }



    @Override

    public void notifyPhysicalChannelConfiguration(List<PhysicalChannelConfig> configs) {

        throw new RuntimeException("Not implemented");

    }



    @Override

    public void notifyPhysicalChannelConfigurationForSubscriber(int subId,

    public void notifyPhysicalChannelConfigurationForSubscriber(int phoneId, int subId,

            List<PhysicalChannelConfig> configs) {

        throw new RuntimeException("Not implemented");

    }