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

Commit bdba7d87 authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Cherrypicker Worker
Browse files

Update CallWaitingController, SYNC_FIRST_POWER_UP 

Implement the configuration CALL_WAITING_SYNC_FIRST_POWER_UP
The configuration is same with CALL_WAITING_SYNC_NONE,
except that UE enables call waiting in the CS network
when the SIM gets changed or the device boots.

Bug: 202463005
Test: atest

Change-Id: I34d341748743d7d9a400ae730b7647b81284f786
(cherry picked from commit ce2a584f3aab80b4b4e9d2a72bc184b3401f7b4d)
Merged-In: I34d341748743d7d9a400ae730b7647b81284f786
parent 5a295f5c

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

+145 −16
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.telephony;



import static android.telephony.CarrierConfigManager.ImsSs.CALL_WAITING_SYNC_FIRST_POWER_UP;

import static android.telephony.CarrierConfigManager.ImsSs.CALL_WAITING_SYNC_NONE;

import static android.telephony.CarrierConfigManager.ImsSs.CALL_WAITING_SYNC_USER_CHANGE;

import static android.telephony.CarrierConfigManager.ImsSs.KEY_TERMINAL_BASED_CALL_WAITING_DEFAULT_ENABLED_BOOL;
@@ -62,6 +63,7 @@ public class CallWaitingController extends Handler { 


    private static final int EVENT_SET_CALL_WAITING_DONE = 1;

    private static final int EVENT_GET_CALL_WAITING_DONE = 2;

    private static final int EVENT_REGISTERED_TO_NETWORK = 3;



    // Class to pack mOnComplete object passed by the caller

    private static class Cw {
@@ -119,12 +121,17 @@ public class CallWaitingController extends Handler { 
    private int mSyncPreference = CALL_WAITING_SYNC_NONE;

    private int mLastSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;



    private boolean mCsEnabled = false;

    private boolean mRegisteredForNetworkAttach = false;



    private GsmCdmaPhone mPhone;

    private ServiceStateTracker mSST;

    private Context mContext;



    // Constructors

    public CallWaitingController(GsmCdmaPhone phone) {

        mPhone = phone;

        mSST = phone.getServiceStateTracker();

        mContext = phone.getContext();

    }
@@ -142,7 +149,8 @@ public class CallWaitingController extends Handler { 


        Rlog.i(LOG_TAG, "initialize phoneId=" + phoneId

                + ", lastSubId=" + mLastSubId + ", subId=" + subId

                + ", state=" + mCallWaitingState + ", sync=" + mSyncPreference);

                + ", state=" + mCallWaitingState + ", sync=" + mSyncPreference

                + ", csEnabled=" + mCsEnabled);

    }



    /**
@@ -170,7 +178,8 @@ public class CallWaitingController extends Handler { 


        Rlog.i(LOG_TAG, "getCallWaiting " + mCallWaitingState);



        if (mSyncPreference == CALL_WAITING_SYNC_NONE) {

        if (mSyncPreference == CALL_WAITING_SYNC_NONE

                || mSyncPreference == CALL_WAITING_SYNC_FIRST_POWER_UP) {

            sendGetCallWaitingResponse(onComplete);

            return true;

        } else if (mSyncPreference == CALL_WAITING_SYNC_USER_CHANGE) {
@@ -197,7 +206,8 @@ public class CallWaitingController extends Handler { 


        Rlog.i(LOG_TAG, "setCallWaiting enable=" + enable + ", service=" + serviceClass);



        if (mSyncPreference == CALL_WAITING_SYNC_NONE) {

        if (mSyncPreference == CALL_WAITING_SYNC_NONE

                || mSyncPreference == CALL_WAITING_SYNC_FIRST_POWER_UP) {

            updateState(

                    enable ? TERMINAL_BASED_ACTIVATED : TERMINAL_BASED_NOT_ACTIVATED);
@@ -222,11 +232,30 @@ public class CallWaitingController extends Handler { 
            case EVENT_GET_CALL_WAITING_DONE:

                onGetCallWaitingDone((AsyncResult) msg.obj);

                break;

            case EVENT_REGISTERED_TO_NETWORK:

                onRegisteredToNetwork();

                break;

        }

    }



    private void onSetCallWaitingDone(AsyncResult ar) {

        if (ar.userObj != null && ar.userObj instanceof Cw) {

        if (ar.userObj == null) {

            // For the case, CALL_WAITING_SYNC_FIRST_POWER_UP

            if (DBG) Rlog.d(LOG_TAG, "onSetCallWaitingDone to sync on network attached");

            if (ar.exception == null) {

                updateSyncState(true);

            } else {

                Rlog.e(LOG_TAG, "onSetCallWaitingDone e=" + ar.exception);

            }

            return;

        }



        if (!(ar.userObj instanceof Cw)) {

            // Unexpected state

            if (DBG) Rlog.d(LOG_TAG, "onSetCallWaitingDone unexpected result");

            return;

        }



        if (DBG) Rlog.d(LOG_TAG, "onSetCallWaitingDone");

        Cw cw = (Cw) ar.userObj;

        if (ar.exception == null) {
@@ -235,14 +264,48 @@ public class CallWaitingController extends Handler { 
        }

        sendToTarget(cw.mOnComplete, ar.result, ar.exception);

    }

    }



    private void onGetCallWaitingDone(AsyncResult ar) {

        if (ar.userObj != null && ar.userObj instanceof Cw) {

        if (ar.userObj == null) {

            // For the case, CALL_WAITING_SYNC_FIRST_POWER_UP

            if (DBG) Rlog.d(LOG_TAG, "onGetCallWaitingDone to sync on network attached");

            boolean enabled = false;

            if (ar.exception == null) {

                //resp[0]: 1 if enabled, 0 otherwise

                //resp[1]: bitwise ORs of SERVICE_CLASS_* constants

                int[] resp = (int[]) ar.result;

                if (resp != null && resp.length > 1) {

                    enabled = (resp[0] == 1)

                            && (resp[1] & SERVICE_CLASS_VOICE) == SERVICE_CLASS_VOICE;

                } else {

                    Rlog.e(LOG_TAG, "onGetCallWaitingDone unexpected response");

                }

            } else {

                Rlog.e(LOG_TAG, "onGetCallWaitingDone e=" + ar.exception);

            }

            if (enabled) {

                updateSyncState(true);

            } else {

                Rlog.i(LOG_TAG, "onGetCallWaitingDone enabling CW service in CS network");

                mPhone.mCi.setCallWaiting(true, SERVICE_CLASS_VOICE,

                        obtainMessage(EVENT_SET_CALL_WAITING_DONE));

            }

            unregisterForNetworkAttached();

            return;

        }



        if (!(ar.userObj instanceof Cw)) {

            // Unexpected state

            if (DBG) Rlog.d(LOG_TAG, "onGetCallWaitingDone unexpected result");

            return;

        }



        if (DBG) Rlog.d(LOG_TAG, "onGetCallWaitingDone");

        Cw cw = (Cw) ar.userObj;

        if (ar.exception == null) {

            int[] resp = (int[]) ar.result;

            //resp[0]: 1 if enabled, 0 otherwise

            //resp[1]: bitwise ORs of SERVICE_CLASS_

            if (resp != null && resp.length > 1) {

                boolean enabled =

                        resp[0] == 1 && (resp[1] & SERVICE_CLASS_VOICE) == SERVICE_CLASS_VOICE;
@@ -251,7 +314,6 @@ public class CallWaitingController extends Handler { 
        }

        sendToTarget(cw.mOnComplete, ar.result, ar.exception);

    }

    }



    private void sendToTarget(Message onComplete, Object result, Throwable exception) {

        if (onComplete != null) {
@@ -270,12 +332,22 @@ public class CallWaitingController extends Handler { 
        }

    }



    private void onRegisteredToNetwork() {

        if (mCsEnabled) return;



        if (DBG) Rlog.d(LOG_TAG, "onRegisteredToNetwork");



        mPhone.mCi.queryCallWaiting(SERVICE_CLASS_NONE,

                obtainMessage(EVENT_GET_CALL_WAITING_DONE));

    }



    private void onCarrierConfigChanged() {

        int subId = mPhone.getSubId();

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            Rlog.i(LOG_TAG, "onCarrierConfigChanged invalid subId=" + subId);



            mValidSubscription = false;

            unregisterForNetworkAttached();

            return;

        }
@@ -283,6 +355,14 @@ public class CallWaitingController extends Handler { 
        PersistableBundle b = configManager.getConfigForSubId(subId);



        updateCarrierConfig(subId, b, false);



        Rlog.i(LOG_TAG, "onCarrierConfigChanged cs_enabled=" + mCsEnabled);



        if (mSyncPreference == CALL_WAITING_SYNC_FIRST_POWER_UP) {

            if (!mCsEnabled) {

                registerForNetworkAttached();

            }

        }

    }



    /**
@@ -322,6 +402,9 @@ public class CallWaitingController extends Handler { 


        if (enforced) {

            desiredState = defaultState;

        } else if ((mLastSubId != subId)

                && (syncPreference == CALL_WAITING_SYNC_FIRST_POWER_UP)) {

            desiredState = defaultState;

        } else {

            if (defaultState == TERMINAL_BASED_NOT_SUPPORTED) {

                desiredState = TERMINAL_BASED_NOT_SUPPORTED;
@@ -365,6 +448,9 @@ public class CallWaitingController extends Handler { 
        mCallWaitingState = state;

        mLastSubId = subId;

        mSyncPreference = syncPreference;

        if (mLastSubId != subId) {

            mCsEnabled = false;

        }



        mPhone.setTerminalBasedCallWaitingStatus(mCallWaitingState);

    }
@@ -378,6 +464,40 @@ public class CallWaitingController extends Handler { 


        return state;

    }



    private void updateSyncState(boolean enabled) {

        int phoneId = mPhone.getPhoneId();



        Rlog.i(LOG_TAG, "updateSyncState phoneId=" + phoneId + ", enabled=" + enabled);



        mCsEnabled = enabled;

    }



    /**

     * @return whether the service is enabled in the CS network

     */

    @VisibleForTesting

    public boolean getSyncState() {

        return mCsEnabled;

    }



    private void registerForNetworkAttached() {

        Rlog.i(LOG_TAG, "registerForNetworkAttached");

        if (mRegisteredForNetworkAttach) return;



        mSST.registerForNetworkAttached(this, EVENT_REGISTERED_TO_NETWORK, null);

        mRegisteredForNetworkAttach = true;

    }



    private void unregisterForNetworkAttached() {

        Rlog.i(LOG_TAG, "unregisterForNetworkAttached");

        if (!mRegisteredForNetworkAttach) return;



        mSST.unregisterForNetworkAttached(this);

        removeMessages(EVENT_REGISTERED_TO_NETWORK);

        mRegisteredForNetworkAttach = false;

    }



    /**

     * Sets whether the device supports the terminal-based call waiting.

     * Only for test
@@ -398,4 +518,13 @@ public class CallWaitingController extends Handler { 
            updateState(TERMINAL_BASED_NOT_SUPPORTED);

        }

    }



    /**

     * Notifies that the UE has attached to the network

     * Only for test

     */

    @VisibleForTesting

    public void notifyRegisteredToNetwork() {

        sendEmptyMessage(EVENT_REGISTERED_TO_NETWORK);

    }

}

tests/telephonytests/src/com/android/internal/telephony/CallWaitingControllerTest.java

+18 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.internal.telephony;



import static android.telephony.CarrierConfigManager.ImsSs.CALL_WAITING_SYNC_FIRST_POWER_UP;

import static android.telephony.CarrierConfigManager.ImsSs.CALL_WAITING_SYNC_NONE;

import static android.telephony.CarrierConfigManager.ImsSs.CALL_WAITING_SYNC_USER_CHANGE;

import static android.telephony.CarrierConfigManager.ImsSs.KEY_TERMINAL_BASED_CALL_WAITING_DEFAULT_ENABLED_BOOL;
@@ -277,6 +278,23 @@ public class CallWaitingControllerTest extends TelephonyTest { 
        assertTrue(retrieveStatePreference(mPhone.getSubId()) == TERMINAL_BASED_NOT_ACTIVATED);

    }



    @Test

    @SmallTest

    public void testSyncFirstPowerUp() {

        mCWC.setTerminalBasedCallWaitingSupported(false);

        setPreference(mPhone.getPhoneId(), FAKE_SUB_ID,

                TERMINAL_BASED_NOT_ACTIVATED, CALL_WAITING_SYNC_FIRST_POWER_UP);

        mCWC.setTerminalBasedCallWaitingSupported(true);

        PersistableBundle bundle = getBundle(true, CALL_WAITING_SYNC_FIRST_POWER_UP, true);

        mCWC.updateCarrierConfig(FAKE_SUB_ID, bundle, true);

        assertFalse(mCWC.getSyncState());



        mCWC.notifyRegisteredToNetwork();

        mTestableLooper.processAllMessages();



        assertTrue(mCWC.getSyncState());

    }



    private PersistableBundle getBundle(boolean provisioned, int preference, boolean defaultState) {

        PersistableBundle bundle = new PersistableBundle();

        bundle.putIntArray(KEY_UT_TERMINAL_BASED_SERVICES_INT_ARRAY,