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

Commit e088187d authored by Joonhun Shin's avatar Joonhun Shin Committed by Automerger Merge Worker
Browse files

Merge "Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to... 

Merge "Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if the EAB provisioned." into tm-dev am: 8ccae767 am: 8779a622

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17864693



Change-Id: Idee726ac87006f493ecad5e211dc261131f1dabb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf74ac7d 8779a622

src/java/com/android/ims/rcs/uce/presence/publish/PublishProcessor.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -30,10 +30,10 @@ import android.util.LocalLog; 
import android.util.Log;

import android.util.Log;





import com.android.ims.RcsFeatureManager;

import com.android.ims.RcsFeatureManager;

import com.android.ims.rcs.uce.UceStatsWriter;

import com.android.ims.rcs.uce.presence.pidfparser.PidfParser;

import com.android.ims.rcs.uce.presence.pidfparser.PidfParser;

import com.android.ims.rcs.uce.presence.publish.PublishController.PublishControllerCallback;

import com.android.ims.rcs.uce.presence.publish.PublishController.PublishControllerCallback;

import com.android.ims.rcs.uce.presence.publish.PublishController.PublishTriggerType;

import com.android.ims.rcs.uce.presence.publish.PublishController.PublishTriggerType;

import com.android.ims.rcs.uce.UceStatsWriter;

import com.android.ims.rcs.uce.util.UceUtils;

import com.android.ims.rcs.uce.util.UceUtils;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;
@@ -199,7 +199,7 @@ public class PublishProcessor { 




        // Check if it has provisioned. When the provisioning changes, a new publish request will

        // Check if it has provisioned. When the provisioning changes, a new publish request will

        // be triggered.

        // be triggered.

        if (!UceUtils.isEabProvisioned(mContext, mSubId)) {

        if (!isEabProvisioned()) {

            logd("isPublishAllowed: NOT provisioned");

            logd("isPublishAllowed: NOT provisioned");

            return false;

            return false;

        }

        }
@@ -509,6 +509,11 @@ public class PublishProcessor { 
        mProcessorState = processorState;

        mProcessorState = processorState;

    }

    }





    @VisibleForTesting

    protected boolean isEabProvisioned() {

        return UceUtils.isEabProvisioned(mContext, mSubId);

    }



    private void logd(String log) {

    private void logd(String log) {

       Log.d(LOG_TAG, getLogPrefix().append(log).toString());

       Log.d(LOG_TAG, getLogPrefix().append(log).toString());

    }

    }

src/java/com/android/ims/rcs/uce/util/UceUtils.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -24,7 +24,9 @@ import android.preference.PreferenceManager; 
import android.provider.BlockedNumberContract;

import android.provider.BlockedNumberContract;

import android.telephony.CarrierConfigManager;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.telephony.ims.ImsRcsManager;

import android.telephony.ims.ProvisioningManager;

import android.telephony.ims.ProvisioningManager;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;
@@ -100,9 +102,9 @@ public class UceUtils { 
        }

        }

        try {

        try {

            ProvisioningManager manager = ProvisioningManager.createForSubscriptionId(subId);

            ProvisioningManager manager = ProvisioningManager.createForSubscriptionId(subId);

            isProvisioned = manager.getProvisioningIntValue(

            isProvisioned = manager.getRcsProvisioningStatusForCapability(

                    ProvisioningManager.KEY_EAB_PROVISIONING_STATUS)

                    ImsRcsManager.CAPABILITY_TYPE_PRESENCE_UCE,

                    == ProvisioningManager.PROVISIONING_VALUE_ENABLED;

                    ImsRegistrationImplBase.REGISTRATION_TECH_LTE);

        } catch (Exception e) {

        } catch (Exception e) {

            Log.w(LOG_TAG, "isEabProvisioned: exception=" + e.getMessage());

            Log.w(LOG_TAG, "isEabProvisioned: exception=" + e.getMessage());

        }

        }

tests/src/com/android/ims/rcs/uce/presence/publish/PublishProcessorTest.java

+17 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.ims.rcs.uce.presence.publish;

package com.android.ims.rcs.uce.presence.publish;





import static android.telephony.ims.RcsContactPresenceTuple.TUPLE_BASIC_STATUS_OPEN;

import static android.telephony.ims.RcsContactPresenceTuple.TUPLE_BASIC_STATUS_OPEN;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.ArgumentMatchers.anyLong;
@@ -25,6 +26,7 @@ import static org.mockito.Mockito.doReturn; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;





import android.content.Context;

import android.net.Uri;

import android.net.Uri;

import android.telephony.ims.RcsContactPresenceTuple;

import android.telephony.ims.RcsContactPresenceTuple;

import android.telephony.ims.RcsContactUceCapability;

import android.telephony.ims.RcsContactUceCapability;
@@ -58,6 +60,20 @@ public class PublishProcessorTest extends ImsTestBase { 
    private int mSub = 1;

    private int mSub = 1;

    private long mTaskId = 1L;

    private long mTaskId = 1L;





    public static class TestPublishProcessor extends PublishProcessor {

        public TestPublishProcessor(Context context, int subId,

                DeviceCapabilityInfo capabilityInfo,

                PublishControllerCallback publishCtrlCallback,

                UceStatsWriter instance) {

            super(context, subId, capabilityInfo, publishCtrlCallback, instance);

        }



        @Override

        protected boolean isEabProvisioned() {

            return true;

        }

    }



    @Before

    @Before

    public void setUp() throws Exception {

    public void setUp() throws Exception {

        super.setUp();

        super.setUp();
@@ -254,7 +270,7 @@ public class PublishProcessorTest extends ImsTestBase { 
    }

    }





    private PublishProcessor getPublishProcessor() {

    private PublishProcessor getPublishProcessor() {

        PublishProcessor publishProcessor = new PublishProcessor(mContext, mSub,

        PublishProcessor publishProcessor = new TestPublishProcessor(mContext, mSub,

                mDeviceCapabilities, mPublishCtrlCallback, mUceStatsWriter);

                mDeviceCapabilities, mPublishCtrlCallback, mUceStatsWriter);

        publishProcessor.setProcessorState(mProcessorState);

        publishProcessor.setProcessorState(mProcessorState);

        publishProcessor.onRcsConnected(mRcsFeatureManager);

        publishProcessor.onRcsConnected(mRcsFeatureManager);