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

Commit 56d6f187 authored by Andy Chou's avatar Andy Chou Committed by android-build-merger
Browse files

Merge "Notify physical channel configuration with phoneId and subId" into qt-r1-dev am: 6ab27496 

am: 1cb5749c

Change-Id: I16b0f8d04c89361af930b19546527f4010243bec
parents 2fb3538e 1cb5749c

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");

    }