Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Telephoy] Add phone Id to support DSDS" am: 40fa3f58b2 am: 36fb168817

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676437

Change-Id: Ia0c72bde710182dbd9e5e99c3ad5f309147a0353
This commit is contained in:
Treehugger Robot
2021-04-16 03:03:44 +00:00
committed by Automerger Merge Worker
parent 3aaf67546b 36fb168817
commit bf415409e8
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/telephony/TelephonyRegistryManager.java
View File

@@ -796,13 +796,14 @@ public class TelephonyRegistryManager {
/** /**
* Notify {@link PhysicalChannelConfig} has changed for a specific subscription. * Notify {@link PhysicalChannelConfig} has changed for a specific subscription.
* *
* @param slotIndex for which physical channel configs changed.
* @param subId the subId * @param subId the subId
* @param configs a list of {@link PhysicalChannelConfig}, the configs of physical channel. * @param configs a list of {@link PhysicalChannelConfig}, the configs of physical channel.
*/ */
public void notifyPhysicalChannelConfigForSubscriber( public void notifyPhysicalChannelConfigForSubscriber(int slotIndex, int subId,
int subId, List<PhysicalChannelConfig> configs) { List<PhysicalChannelConfig> configs) {
try { try {
sRegistry.notifyPhysicalChannelConfigForSubscriber(subId, configs); sRegistry.notifyPhysicalChannelConfigForSubscriber(slotIndex, subId, configs);
} catch (RemoteException ex) { } catch (RemoteException ex) {
// system server crash // system server crash
} }

2
core/java/com/android/internal/telephony/ITelephonyRegistry.aidl
View File

@@ -91,7 +91,7 @@ interface ITelephonyRegistry {
void notifyRegistrationFailed(int slotIndex, int subId, in CellIdentity cellIdentity, void notifyRegistrationFailed(int slotIndex, int subId, in CellIdentity cellIdentity,
String chosenPlmn, int domain, int causeCode, int additionalCauseCode); String chosenPlmn, int domain, int causeCode, int additionalCauseCode);
void notifyBarringInfoChanged(int slotIndex, int subId, in BarringInfo barringInfo); void notifyBarringInfoChanged(int slotIndex, int subId, in BarringInfo barringInfo);
void notifyPhysicalChannelConfigForSubscriber(in int subId, void notifyPhysicalChannelConfigForSubscriber(in int phoneId, in int subId,
in List<PhysicalChannelConfig> configs); in List<PhysicalChannelConfig> configs);
void notifyDataEnabled(in int phoneId, int subId, boolean enabled, int reason); void notifyDataEnabled(in int phoneId, int subId, boolean enabled, int reason);
void notifyAllowedNetworkTypesChanged(in int phoneId, in int subId, in int reason, in long allowedNetworkType); void notifyAllowedNetworkTypesChanged(in int phoneId, in int subId, in int reason, in long allowedNetworkType);

6
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -2370,11 +2370,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
* Send a notification to registrants that the configs of physical channel has changed for * Send a notification to registrants that the configs of physical channel has changed for
* a particular subscription. * a particular subscription.
* *
* @param phoneId the phone id.
* @param subId the subId * @param subId the subId
* @param configs a list of {@link PhysicalChannelConfig}, the configs of physical channel. * @param configs a list of {@link PhysicalChannelConfig}, the configs of physical channel.
*/ */
public void notifyPhysicalChannelConfigForSubscriber( public void notifyPhysicalChannelConfigForSubscriber(int phoneId, int subId,
int subId, List<PhysicalChannelConfig> configs) { List<PhysicalChannelConfig> configs) {
if (!checkNotifyPermission("notifyPhysicalChannelConfig()")) { if (!checkNotifyPermission("notifyPhysicalChannelConfig()")) {
return; return;
} }
@@ -2386,7 +2387,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
synchronized (mRecords) { synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId);
if (validatePhoneId(phoneId)) { if (validatePhoneId(phoneId)) {
mPhysicalChannelConfigs.set(phoneId, configs); mPhysicalChannelConfigs.set(phoneId, configs);
for (Record r : mRecords) { for (Record r : mRecords) {