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

Commit 88b486e0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11324029 from d5aa1125 to 24Q2-release 

Change-Id: I4c713f7501e20d3e3ce2db2532b01af3e031e271
parents 40c292a3 d5aa1125

flags/Android.bp

+12 −11
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ aconfig_declarations { 
    name: "telephony_flags",

    package: "com.android.internal.telephony.flags",

    srcs: [

        "calling.aconfig",

        "data.aconfig",

        "domainselection.aconfig",

        "ims.aconfig",

flags/calling.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.internal.telephony.flags"



flag {

  name: "simultaneous_calling_indications"

  namespace: "telephony"

  description: "APIs that are used to notify simultaneous calling changes to other applications."

  bug: "297446980"

}
 
 No newline at end of file

src/java/com/android/internal/telephony/DefaultPhoneNotifier.java

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.internal.telephony.flags.FeatureFlags; 
import com.android.telephony.Rlog;



import java.util.List;

import java.util.Set;



/**

 * broadcast intents
@@ -300,6 +301,11 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
                sender.getSubId(), linkCapacityEstimateList);

    }



    @Override

    public void notifySimultaneousCellularCallingSubscriptionsChanged(Set<Integer> subIds) {

        mTelephonyRegistryMgr.notifySimultaneousCellularCallingSubscriptionsChanged(subIds);

    }



    @Override

    public void notifyCallbackModeStarted(Phone sender, @EmergencyCallbackModeType int type) {

        mTelephonyRegistryMgr.notifyCallBackModeStarted(sender.getPhoneId(),

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+5 −1
Original line number Diff line number Diff line
@@ -5373,7 +5373,11 @@ public class GsmCdmaPhone extends Phone { 
        }

        boolean prefEnabled = getNullCipherNotificationsPreferenceEnabled();



        // TODO(b/316592273): Enable / disable in NullCipherNotifier once the class is available.

        if (prefEnabled) {

            mNullCipherNotifier.enable();

        } else {

            mNullCipherNotifier.disable();

        }



        mCi.setSecurityAlgorithmsUpdatedEnabled(prefEnabled,

                obtainMessage(EVENT_SET_SECURITY_ALGORITHMS_UPDATED_ENABLED_DONE));

src/java/com/android/internal/telephony/PhoneConfigurationManager.java

+8 −3
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ public class PhoneConfigurationManager { 
    /** Feature flags */

    @NonNull

    private final FeatureFlags mFeatureFlags;

    private final DefaultPhoneNotifier mNotifier;

    /**

     * True if 'Virtual DSDA' i.e., in-call IMS connectivity on both subs with only single logical

     * modem, is enabled.
@@ -128,6 +129,7 @@ public class PhoneConfigurationManager { 
        mPhoneStatusMap = new HashMap<>();

        mVirtualDsdaEnabled = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_TELEPHONY, KEY_ENABLE_VIRTUAL_DSDA, false);

        mNotifier = new DefaultPhoneNotifier(mContext, mFeatureFlags);

        DeviceConfig.addOnPropertiesChangedListener(

                DeviceConfig.NAMESPACE_TELEPHONY, Runnable::run,

                properties -> {
@@ -294,6 +296,11 @@ public class PhoneConfigurationManager { 
                    } else {

                        log(msg.what + " failure. Not getting logical slots that support "

                                + "simultaneous calling." + ar.exception);

                        mSlotsSupportingSimultaneousCellularCalls.clear();

                    }

                    if (mFeatureFlags.simultaneousCallingIndications()) {

                        mNotifier.notifySimultaneousCellularCallingSubscriptionsChanged(

                                mSlotsSupportingSimultaneousCellularCalls);

                    }

                    break;

                default:
@@ -449,9 +456,7 @@ public class PhoneConfigurationManager { 
    }



    private void notifyCapabilityChanged() {

        PhoneNotifier notifier = new DefaultPhoneNotifier(mContext, mFeatureFlags);



        notifier.notifyPhoneCapabilityChanged(mStaticCapability);

        mNotifier.notifyPhoneCapabilityChanged(mStaticCapability);

    }



    /**