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

Commit 40fa3f58 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[Telephoy] Add phone Id to support DSDS"

parents 82628265 30ad4bf9

core/java/android/telephony/TelephonyRegistryManager.java

+4 −3
Original line number Diff line number Diff line
@@ -796,13 +796,14 @@ public class TelephonyRegistryManager { 
    /**

     * Notify {@link PhysicalChannelConfig} has changed for a specific subscription.

     *

     * @param slotIndex for which physical channel configs changed.

     * @param subId the subId

     * @param configs a list of {@link PhysicalChannelConfig}, the configs of physical channel.

     */

    public void notifyPhysicalChannelConfigForSubscriber(

            int subId, List<PhysicalChannelConfig> configs) {

    public void notifyPhysicalChannelConfigForSubscriber(int slotIndex, int subId,

            List<PhysicalChannelConfig> configs) {

        try {

            sRegistry.notifyPhysicalChannelConfigForSubscriber(subId, configs);

            sRegistry.notifyPhysicalChannelConfigForSubscriber(slotIndex, subId, configs);

        } catch (RemoteException ex) {

            // system server crash

        }

core/java/com/android/internal/telephony/ITelephonyRegistry.aidl

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ interface ITelephonyRegistry { 
    void notifyRegistrationFailed(int slotIndex, int subId, in CellIdentity cellIdentity,

            String chosenPlmn, int domain, int causeCode, int additionalCauseCode);

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

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

services/core/java/com/android/server/TelephonyRegistry.java

+3 −3
Original line number Diff line number Diff line
@@ -2370,11 +2370,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
     * Send a notification to registrants that the configs of physical channel has changed for

     * a particular subscription.

     *

     * @param phoneId the phone id.

     * @param subId the subId

     * @param configs a list of {@link PhysicalChannelConfig}, the configs of physical channel.

     */

    public void notifyPhysicalChannelConfigForSubscriber(

            int subId, List<PhysicalChannelConfig> configs) {

    public void notifyPhysicalChannelConfigForSubscriber(int phoneId, int subId,

            List<PhysicalChannelConfig> configs) {

        if (!checkNotifyPermission("notifyPhysicalChannelConfig()")) {

            return;

        }
@@ -2386,7 +2387,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        }



        synchronized (mRecords) {

            int phoneId = SubscriptionManager.getPhoneId(subId);

            if (validatePhoneId(phoneId)) {

                mPhysicalChannelConfigs.set(phoneId, configs);

                for (Record r : mRecords) {