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

Commit c8057ecd authored by Zoey Chen's avatar Zoey Chen Committed by Gerrit Code Review
Browse files

Merge "[Telephony] Implement onDataEnabled callback"

parents 112cd8df c9448b5e

core/java/android/telephony/TelephonyRegistryManager.java

+27 −26
Original line number Diff line number Diff line
@@ -332,12 +332,12 @@ public class TelephonyRegistryManager { 
    /**

     * Notify {@link ServiceState} update on certain subscription.

     *

     * @param subId for which the service state changed.

     * @param slotIndex for which the service state changed. Can be derived from subId except

     * subId is invalid.

     * @param subId for which the service state changed.

     * @param state service state e.g, in service, out of service or roaming status.

     */

    public void notifyServiceStateChanged(int subId, int slotIndex, @NonNull ServiceState state) {

    public void notifyServiceStateChanged(int slotIndex, int subId, @NonNull ServiceState state) {

        try {

            sRegistry.notifyServiceStateForPhoneId(slotIndex, subId, state);

        } catch (RemoteException ex) {
@@ -348,12 +348,12 @@ public class TelephonyRegistryManager { 
    /**

     * Notify {@link SignalStrength} update on certain subscription.

     *

     * @param subId for which the signalstrength changed.

     * @param slotIndex for which the signalstrength changed. Can be derived from subId except when

     * subId is invalid.

     * @param subId for which the signalstrength changed.

     * @param signalStrength e.g, signalstrength level {@see SignalStrength#getLevel()}

     */

    public void notifySignalStrengthChanged(int subId, int slotIndex,

    public void notifySignalStrengthChanged(int slotIndex, int subId,

            @NonNull SignalStrength signalStrength) {

        try {

            sRegistry.notifySignalStrengthForPhoneId(slotIndex, subId, signalStrength);
@@ -366,13 +366,13 @@ public class TelephonyRegistryManager { 
     * Notify changes to the message-waiting indicator on certain subscription. e.g, The status bar

     * uses message waiting indicator to determine when to display the voicemail icon.

     *

     * @param subId for which message waiting indicator changed.

     * @param slotIndex for which message waiting indicator changed. Can be derived from subId

     * except when subId is invalid.

     * @param subId for which message waiting indicator changed.

     * @param msgWaitingInd {@code true} indicates there is message-waiting indicator, {@code false}

     * otherwise.

     */

    public void notifyMessageWaitingChanged(int subId, int slotIndex, boolean msgWaitingInd) {

    public void notifyMessageWaitingChanged(int slotIndex, int subId, boolean msgWaitingInd) {

        try {

            sRegistry.notifyMessageWaitingChangedForPhoneId(slotIndex, subId, msgWaitingInd);

        } catch (RemoteException ex) {
@@ -413,9 +413,9 @@ public class TelephonyRegistryManager { 
    /**

     * Notify changes to default (Internet) data connection state on certain subscription.

     *

     * @param subId for which data connection state changed.

     * @param slotIndex for which data connections state changed. Can be derived from subId except

     * when subId is invalid.

     * @param subId for which data connection state changed.

     * @param preciseState the PreciseDataConnectionState

     *

     * @see PreciseDataConnectionState
@@ -434,13 +434,13 @@ public class TelephonyRegistryManager { 
    /**

     * Notify {@link CallQuality} change on certain subscription.

     *

     * @param subId for which call quality state changed.

     * @param slotIndex for which call quality state changed. Can be derived from subId except when

     * subId is invalid.

     * @param subId for which call quality state changed.

     * @param callQuality Information about call quality e.g, call quality level

     * @param networkType associated with this data connection. e.g, LTE

     */

    public void notifyCallQualityChanged(int subId, int slotIndex, @NonNull CallQuality callQuality,

    public void notifyCallQualityChanged(int slotIndex, int subId, @NonNull CallQuality callQuality,

        @NetworkType int networkType) {

        try {

            sRegistry.notifyCallQualityChanged(callQuality, slotIndex, subId, networkType);
@@ -452,11 +452,11 @@ public class TelephonyRegistryManager { 
    /**

     * Notify emergency number list changed on certain subscription.

     *

     * @param subId for which emergency number list changed.

     * @param slotIndex for which emergency number list changed. Can be derived from subId except

     * when subId is invalid.

     * @param subId for which emergency number list changed.

     */

    public void notifyEmergencyNumberList(int subId, int slotIndex) {

    public void notifyEmergencyNumberList( int slotIndex, int subId) {

        try {

            sRegistry.notifyEmergencyNumberList(slotIndex, subId);

        } catch (RemoteException ex) {
@@ -497,12 +497,12 @@ public class TelephonyRegistryManager { 
    /**

     * Notify radio power state changed on certain subscription.

     *

     * @param subId for which radio power state changed.

     * @param slotIndex for which radio power state changed. Can be derived from subId except when

     * subId is invalid.

     * @param subId for which radio power state changed.

     * @param radioPowerState the current modem radio state.

     */

    public void notifyRadioPowerStateChanged(int subId, int slotIndex,

    public void notifyRadioPowerStateChanged(int slotIndex, int subId,

            @RadioPowerState int radioPowerState) {

        try {

            sRegistry.notifyRadioPowerStateChanged(slotIndex, subId, radioPowerState);
@@ -541,12 +541,12 @@ public class TelephonyRegistryManager { 
     * Notify data activation state changed on certain subscription.

     * @see TelephonyManager#getDataActivationState()

     *

     * @param subId for which data activation state changed.

     * @param slotIndex for which data activation state changed. Can be derived from subId except

     * when subId is invalid.

     * @param subId for which data activation state changed.

     * @param activationState sim activation state e.g, activated.

     */

    public void notifyDataActivationStateChanged(int subId, int slotIndex,

    public void notifyDataActivationStateChanged(int slotIndex, int subId,

            @SimActivationState int activationState) {

        try {

            sRegistry.notifySimActivationStateChangedForPhoneId(slotIndex, subId,
@@ -560,12 +560,12 @@ public class TelephonyRegistryManager { 
     * Notify voice activation state changed on certain subscription.

     * @see TelephonyManager#getVoiceActivationState()

     *

     * @param subId for which voice activation state changed.

     * @param slotIndex for which voice activation state changed. Can be derived from subId except

     * subId is invalid.

     * @param subId for which voice activation state changed.

     * @param activationState sim activation state e.g, activated.

     */

    public void notifyVoiceActivationStateChanged(int subId, int slotIndex,

    public void notifyVoiceActivationStateChanged(int slotIndex, int subId,

            @SimActivationState int activationState) {

        try {

            sRegistry.notifySimActivationStateChangedForPhoneId(slotIndex, subId,
@@ -579,9 +579,9 @@ public class TelephonyRegistryManager { 
     * Notify User mobile data state changed on certain subscription. e.g, mobile data is enabled

     * or disabled.

     *

     * @param subId for which mobile data state has changed.

     * @param slotIndex for which mobile data state has changed. Can be derived from subId except

     * when subId is invalid.

     * @param subId for which mobile data state has changed.

     * @param state {@code true} indicates mobile data is enabled/on. {@code false} otherwise.

     */

    public void notifyUserMobileDataStateChanged(int slotIndex, int subId, boolean state) {
@@ -643,14 +643,14 @@ public class TelephonyRegistryManager { 
     * Notify precise call state changed on certain subscription, including foreground, background

     * and ringcall states.

     *

     * @param subId for which precise call state changed.

     * @param slotIndex for which precise call state changed. Can be derived from subId except when

     * subId is invalid.

     * @param subId for which precise call state changed.

     * @param ringCallPreciseState ringCall state.

     * @param foregroundCallPreciseState foreground call state.

     * @param backgroundCallPreciseState background call state.

     */

    public void notifyPreciseCallState(int subId, int slotIndex,

    public void notifyPreciseCallState(int slotIndex, int subId,

            @PreciseCallStates int ringCallPreciseState,

            @PreciseCallStates int foregroundCallPreciseState,

            @PreciseCallStates int backgroundCallPreciseState) {
@@ -793,9 +793,10 @@ public class TelephonyRegistryManager { 
     * @param reason Reason for data enabled/disabled. See {@code REASON_*} in

     * {@link TelephonyManager}.

     */

    public void notifyDataEnabled(boolean enabled, @TelephonyManager.DataEnabledReason int reason) {

    public void notifyDataEnabled(int slotIndex, int subId, boolean enabled,

            @TelephonyManager.DataEnabledReason int reason) {

        try {

            sRegistry.notifyDataEnabled(enabled, reason);

            sRegistry.notifyDataEnabled(slotIndex, subId, enabled, reason);

        } catch (RemoteException ex) {

            // system server crash

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -93,5 +93,5 @@ interface ITelephonyRegistry { 
    void notifyBarringInfoChanged(int slotIndex, int subId, in BarringInfo barringInfo);

    void notifyPhysicalChannelConfigForSubscriber(in int subId,

            in List<PhysicalChannelConfig> configs);

    void notifyDataEnabled(boolean enabled, int reason);

    void notifyDataEnabled(in int phoneId, int subId, boolean enabled, int reason);

}

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

+31 −16
Original line number Diff line number Diff line
@@ -312,9 +312,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 


    private List<PhysicalChannelConfig> mPhysicalChannelConfigs;



    private boolean mIsDataEnabled = false;

    private boolean[] mIsDataEnabled;



    private int mDataEnabledReason;

    private int[] mDataEnabledReason;



    /**

     * Per-phone map of precise data connection state. The key of the map is the pair of transport
@@ -521,6 +521,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        mOutgoingCallEmergencyNumber = copyOf(mOutgoingCallEmergencyNumber, mNumPhones);

        mOutgoingSmsEmergencyNumber = copyOf(mOutgoingSmsEmergencyNumber, mNumPhones);

        mTelephonyDisplayInfos = copyOf(mTelephonyDisplayInfos, mNumPhones);

        mIsDataEnabled= copyOf(mIsDataEnabled, mNumPhones);

        mDataEnabledReason = copyOf(mDataEnabledReason, mNumPhones);



        // ds -> ss switch.

        if (mNumPhones < oldNumPhones) {
@@ -563,6 +565,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            mBarringInfo.add(i, new BarringInfo());

            mTelephonyDisplayInfos[i] = null;

            mPhysicalChannelConfigs.add(i, new PhysicalChannelConfig.Builder().build());

            mIsDataEnabled[i] = false;

            mDataEnabledReason[i] = TelephonyManager.DATA_ENABLED_REASON_USER;

        }

    }
@@ -622,6 +626,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        mBarringInfo = new ArrayList<>();

        mTelephonyDisplayInfos = new TelephonyDisplayInfo[numPhones];

        mPhysicalChannelConfigs = new ArrayList<>();

        mIsDataEnabled = new boolean[numPhones];

        mDataEnabledReason = new int[numPhones];

        for (int i = 0; i < numPhones; i++) {

            mCallState[i] =  TelephonyManager.CALL_STATE_IDLE;

            mDataActivity[i] = TelephonyManager.DATA_ACTIVITY_NONE;
@@ -652,6 +658,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            mBarringInfo.add(i, new BarringInfo());

            mTelephonyDisplayInfos[i] = null;

            mPhysicalChannelConfigs.add(i, new PhysicalChannelConfig.Builder().build());

            mIsDataEnabled[i] = false;

            mDataEnabledReason[i] = TelephonyManager.DATA_ENABLED_REASON_USER;

        }



        mAppOps = mContext.getSystemService(AppOpsManager.class);
@@ -1146,7 +1154,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                if (events.contains(

                        PhoneStateListener.EVENT_DATA_ENABLED_CHANGED)) {

                    try {

                        r.callback.onDataEnabledChanged(mIsDataEnabled, mDataEnabledReason);

                        r.callback.onDataEnabledChanged(

                                mIsDataEnabled[phoneId], mDataEnabledReason[phoneId]);

                    } catch (RemoteException ex) {

                        remove(r.binder);

                    }
@@ -2358,26 +2367,31 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    /**

     * Notify that the data enabled has changed.

     *

     * @param phoneId the phone id.

     * @param subId the subId.

     * @param enabled True if data is enabled, otherwise disabled.

     * @param reason  Reason for data enabled/disabled. See {@code DATA_*} in

     *                {@link TelephonyManager}.

     */

    public void notifyDataEnabled(boolean enabled,

    public void notifyDataEnabled(int phoneId, int subId, boolean enabled,

                                  @TelephonyManager.DataEnabledReason int reason) {

        if (!checkNotifyPermission("notifyDataEnabled()")) {

            return;

        }



        if (VDBG) {

            log("notifyDataEnabled: enabled=" + enabled + " reason=" + reason);

            log("notifyDataEnabled: PhoneId=" + phoneId + " subId=" + subId +

                    " enabled=" + enabled + " reason=" + reason);

        }



        mIsDataEnabled = enabled;

        mDataEnabledReason = reason;

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                mIsDataEnabled[phoneId] = enabled;

                mDataEnabledReason[phoneId] = reason;

                for (Record r : mRecords) {

                    if (r.matchPhoneStateListenerEvent(

                        PhoneStateListener.EVENT_DATA_ENABLED_CHANGED)) {

                            PhoneStateListener.EVENT_DATA_ENABLED_CHANGED)

                            && idMatch(r.subId, subId, phoneId)) {

                        try {

                            r.callback.onDataEnabledChanged(enabled, reason);

                        } catch (RemoteException ex) {
@@ -2385,6 +2399,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                        }

                    }

                }

            }

            handleRemoveListLocked();

        }

    }
@@ -2431,6 +2446,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                pw.println("mOutgoingSmsEmergencyNumber=" + mOutgoingSmsEmergencyNumber[i]);

                pw.println("mBarringInfo=" + mBarringInfo.get(i));

                pw.println("mTelephonyDisplayInfo=" + mTelephonyDisplayInfos[i]);

                pw.println("mIsDataEnabled=" + mIsDataEnabled);

                pw.println("mDataEnabledReason=" + mDataEnabledReason);

                pw.decreaseIndent();

            }

            pw.println("mCarrierNetworkChangeState=" + mCarrierNetworkChangeState);
@@ -2441,8 +2458,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            pw.println("mDefaultPhoneId=" + mDefaultPhoneId);

            pw.println("mDefaultSubId=" + mDefaultSubId);

            pw.println("mPhysicalChannelConfigs=" + mPhysicalChannelConfigs);

            pw.println("mIsDataEnabled=" + mIsDataEnabled);

            pw.println("mDataEnabledReason=" + mDataEnabledReason);



            pw.decreaseIndent();