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

Commit 9aa41ee7 authored by andychou's avatar andychou Committed by Sooraj Sasindran
Browse files

Notify physical channel configuration with phoneId and subId 

Physical channel configuration may be retrieved before SIM loaded. So
configuration will not be able to report via TelephonyRegistry.
Therefore, use phoneId to mapping record and notify

Bug: 123904518
Test: Manual test and make sure physical channel configuration is
displayed in RadioInfo

Change-Id: I20b2c598dc47bc92f63484757f277ea7388c6f0c
parent 6dcb30cc

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

    }