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

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

Browse Source 
am: a96ab85260

Change-Id: Ibb272d712a4a5a691bd0a0b20d6426229a5f355c
This commit is contained in:
Andy Chou
2019-06-25 18:51:29 -07:00
committed by android-build-merger
parent 73c1b41dec a96ab85260
commit 4143d9693b
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1255,23 +1255,21 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
} }
public void notifyPhysicalChannelConfiguration(List<PhysicalChannelConfig> configs) { /**
notifyPhysicalChannelConfigurationForSubscriber(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, * Notify physical channel configuration according to subscripton ID and phone ID
configs); */
} public void notifyPhysicalChannelConfigurationForSubscriber(int phoneId, int subId,
public void notifyPhysicalChannelConfigurationForSubscriber(int subId,
List<PhysicalChannelConfig> configs) { List<PhysicalChannelConfig> configs) {
if (!checkNotifyPermission("notifyPhysicalChannelConfiguration()")) { if (!checkNotifyPermission("notifyPhysicalChannelConfiguration()")) {
return; return;
} }
if (VDBG) { if (VDBG) {
log("notifyPhysicalChannelConfiguration: subId=" + subId + " configs=" + configs); log("notifyPhysicalChannelConfiguration: subId=" + subId + " phoneId=" + phoneId
+ " configs=" + configs);
} }
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) {

3
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
View File

@@ -68,8 +68,7 @@ interface ITelephonyRegistry {
void notifyOtaspChanged(in int subId, in int otaspMode); void notifyOtaspChanged(in int subId, in int otaspMode);
@UnsupportedAppUsage @UnsupportedAppUsage
void notifyCellInfo(in List<CellInfo> cellInfo); void notifyCellInfo(in List<CellInfo> cellInfo);
void notifyPhysicalChannelConfiguration(in List<PhysicalChannelConfig> configs); void notifyPhysicalChannelConfigurationForSubscriber(in int phoneId, in int subId,
void notifyPhysicalChannelConfigurationForSubscriber(in int subId,
in List<PhysicalChannelConfig> configs); in List<PhysicalChannelConfig> configs);
void notifyPreciseCallState(int phoneId, int subId, int ringingCallState, void notifyPreciseCallState(int phoneId, int subId, int ringingCallState,
int foregroundCallState, int backgroundCallState); int foregroundCallState, int backgroundCallState);