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
diff --git a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
index fc0a993..20a3dd2 100644
--- a/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
+++ b/src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
@@ -245,9 +245,10 @@
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
diff --git a/tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java b/tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java
index 8cf1fe5..d597505 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/mocks/TelephonyRegistryMock.java
@@ -353,12 +353,7 @@
}
@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");
}
