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

Commit 3330c68a authored by calvinpan's avatar calvinpan Committed by Automerger Merge Worker
Browse files

Use non RCS capabilities cache expiration when result is not found am: 11c88cfd am: fe0bf137 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia46280e7b75c3540dc7c0a6ab957cc01373faab1
parents 62bdc697 fe0bf137

src/java/com/android/ims/rcs/uce/eab/EabControllerImpl.java

+40 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.ims.rcs.uce.eab; 


import static android.telephony.ims.RcsContactUceCapability.CAPABILITY_MECHANISM_OPTIONS;

import static android.telephony.ims.RcsContactUceCapability.CAPABILITY_MECHANISM_PRESENCE;

import static android.telephony.ims.RcsContactUceCapability.REQUEST_RESULT_NOT_FOUND;

import static android.telephony.ims.RcsContactUceCapability.SOURCE_TYPE_CACHED;



import android.annotation.NonNull;
@@ -26,6 +27,8 @@ import android.content.Context; 
import android.database.Cursor;

import android.net.Uri;

import android.os.Looper;

import android.os.PersistableBundle;

import android.telephony.CarrierConfigManager;

import android.telephony.ims.ProvisioningManager;

import android.telephony.ims.RcsContactPresenceTuple;

import android.telephony.ims.RcsContactPresenceTuple.ServiceCapabilities;
@@ -46,6 +49,7 @@ import java.util.ArrayList; 
import java.util.GregorianCalendar;

import java.util.List;

import java.util.Objects;

import java.util.TimeZone;

import java.util.function.Predicate;



/**
@@ -358,20 +362,34 @@ public class EabControllerImpl implements EabController { 
    private boolean isCapabilityExpired(Cursor cursor) {

        boolean expired = false;

        String requestTimeStamp = getRequestTimestamp(cursor);

        int capabilityCacheExpiration;



        if (isNonRcsCapability(cursor)) {

            capabilityCacheExpiration = getNonRcsCapabilityCacheExpiration(mSubId);

        } else {

            capabilityCacheExpiration = getCapabilityCacheExpiration(mSubId);

        }



        if (requestTimeStamp != null) {

            Instant expiredTimestamp = Instant

                    .ofEpochSecond(Long.parseLong(requestTimeStamp))

                    .plus(getCapabilityCacheExpiration(mSubId), ChronoUnit.SECONDS);

                    .plus(capabilityCacheExpiration, ChronoUnit.SECONDS);

            expired = expiredTimestamp.isBefore(Instant.now());

            Log.d(TAG, "Capability expiredTimestamp: "

                    + expiredTimestamp.getEpochSecond() + ", expired:" + expired);

            Log.d(TAG, "Capability expiredTimestamp: " + expiredTimestamp.getEpochSecond() +

                    ", isNonRcsCapability: " +  isNonRcsCapability(cursor) +

                    ", capabilityCacheExpiration: " + capabilityCacheExpiration +

                    ", expired:" + expired);

        } else {

            Log.d(TAG, "Capability requestTimeStamp is null");

        }

        return expired;

    }



    private boolean isNonRcsCapability(Cursor cursor) {

        int result = getIntValue(cursor, EabProvider.EabCommonColumns.REQUEST_RESULT);

        return result == REQUEST_RESULT_NOT_FOUND;

    }



    private boolean isAvailabilityExpired(Cursor cursor) {

        boolean expired = false;

        String requestTimeStamp = getRequestTimestamp(cursor);
@@ -402,8 +420,24 @@ public class EabControllerImpl implements EabController { 
        return expiredTimestamp;

    }



    protected static long getCapabilityCacheExpiration(int subId) {

        long value = -1;

    private int getNonRcsCapabilityCacheExpiration(int subId) {

        int value;

        PersistableBundle carrierConfig =

                mContext.getSystemService(CarrierConfigManager.class).getConfigForSubId(subId);



        if (carrierConfig != null) {

            value = carrierConfig.getInt(

                    CarrierConfigManager.Ims.KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT);

        } else {

            value = DEFAULT_CAPABILITY_CACHE_EXPIRATION_SEC;

            Log.e(TAG, "getNonRcsCapabilityCacheExpiration: " +

                    "CarrierConfig is null, returning default");

        }

        return value;

    }



    protected static int getCapabilityCacheExpiration(int subId) {

        int value = -1;

        try {

            ProvisioningManager pm = ProvisioningManager.createForSubscriptionId(subId);

            value = pm.getProvisioningIntValue(
@@ -508,6 +542,7 @@ public class EabControllerImpl implements EabController { 
                    GregorianCalendar date = new GregorianCalendar(

                            time.year, time.month, time.monthDay,

                            time.hour, time.minute, time.second);

                    date.setTimeZone(TimeZone.getTimeZone("UTC"));

                    timestamp = date.getTime().getTime() / 1000;

                } catch (TimeFormatException ex) {

                    Log.d(TAG, "Fail on parsing the timestamp. "

tests/src/com/android/ims/rcs/uce/eab/EabControllerTest.java

+83 −4
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


package com.android.ims.rcs.uce.eab;



import static android.telephony.CarrierConfigManager.Ims.KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT;

import static android.telephony.ims.RcsContactUceCapability.REQUEST_RESULT_FOUND;

import static android.telephony.ims.RcsContactUceCapability.REQUEST_RESULT_NOT_FOUND;

import static android.telephony.ims.RcsContactUceCapability.SOURCE_TYPE_NETWORK;



import static com.android.ims.rcs.uce.eab.EabProvider.CONTACT_URI;
@@ -24,6 +26,7 @@ import static com.android.ims.rcs.uce.eab.EabProvider.CONTACT_URI; 
import android.content.ContentValues;

import android.net.Uri;

import android.os.Looper;

import android.os.PersistableBundle;

import android.telephony.ims.RcsContactPresenceTuple;

import android.telephony.ims.RcsContactUceCapability;

import android.test.mock.MockContentResolver;
@@ -44,11 +47,13 @@ import java.util.ArrayList; 
import java.util.Calendar;

import java.util.GregorianCalendar;

import java.util.List;

import java.util.TimeZone;



@RunWith(AndroidJUnit4.class)

public class EabControllerTest extends ImsTestBase {

    EabProviderTestable mEabProviderTestable = new EabProviderTestable();

    EabControllerImpl mEabController;

    PersistableBundle mBundle;



    private static final int TEST_SUB_ID = 1;

    private static final String TEST_PHONE_NUMBER = "16661234567";
@@ -72,6 +77,8 @@ public class EabControllerTest extends ImsTestBase { 
        insertContactInfoToDB();

        mEabController = new EabControllerImpl(

                mContext, TEST_SUB_ID, null, Looper.getMainLooper());



        mBundle = mContextFixture.getTestCarrierConfigBundle();

    }



    @After
@@ -125,16 +132,69 @@ public class EabControllerTest extends ImsTestBase { 
                mEabController.getCapabilities(contactUriList).get(0).getStatus());

    }



    @Test

    @SmallTest

    public void testNonRcsCapability() {

        // Set non-rcs capabilities expiration to 121 days

        mBundle.putInt(KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT, 121 * 24 * 60 * 60);

        // Set timestamp to 120 days age

        GregorianCalendar date = new GregorianCalendar();

        date.setTimeZone(TimeZone.getTimeZone("UTC"));

        date.add(Calendar.DATE, -120);

        String timestamp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX")

                .format(date.getTime());



        List<RcsContactUceCapability> contactList = new ArrayList<>();

        contactList.add(createPresenceNonRcsCapability(timestamp));



        mEabController.saveCapabilities(contactList);



        List<Uri> contactUriList = new ArrayList<>();

        contactUriList.add(TEST_CONTACT_URI);



        // Verify result is not expired

        Assert.assertEquals(1,

                mEabController.getCapabilities(contactUriList).size());

        Assert.assertEquals(EabCapabilityResult.EAB_QUERY_SUCCESSFUL,

                mEabController.getCapabilities(contactUriList).get(0).getStatus());

    }



    @Test

    @SmallTest

    public void testNonRcsCapabilityExpired() {

        // Set non-rcs capabilities expiration to 119 days

        mBundle.putInt(KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT, 119 * 24 * 60 * 60);

        // Set timestamp to 120 days age

        GregorianCalendar date = new GregorianCalendar();

        date.setTimeZone(TimeZone.getTimeZone("UTC"));

        date.add(Calendar.DATE, -120);

        String timestamp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX")

                .format(date.getTime());



        List<RcsContactUceCapability> contactList = new ArrayList<>();

        contactList.add(createPresenceNonRcsCapability(timestamp));

        mEabController.saveCapabilities(contactList);



        // Verify result is expired

        List<Uri> contactUriList = new ArrayList<>();

        contactUriList.add(TEST_CONTACT_URI);

        Assert.assertEquals(1,

                mEabController.getCapabilities(contactUriList).size());

        Assert.assertEquals(EabCapabilityResult.EAB_CONTACT_EXPIRED_FAILURE,

                mEabController.getCapabilities(contactUriList).get(0).getStatus());

    }



    private RcsContactUceCapability createPresenceCapability(boolean isExpired) {

        String timeStamp;

        String timestamp;

        GregorianCalendar date = new GregorianCalendar();

        date.setTimeZone(TimeZone.getTimeZone("UTC"));

        if (isExpired) {

            date.add(Calendar.DATE, -120);

        } else {

            date.add(Calendar.DATE, 120);

        }



        timeStamp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX")

        timestamp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX")

                .format(date.getTime());



        RcsContactPresenceTuple.ServiceCapabilities.Builder serviceCapabilitiesBuilder =
@@ -146,7 +206,7 @@ public class EabControllerTest extends ImsTestBase { 
                        .setServiceDescription(TEST_SERVICE_DESCRIPTION)

                        .setContactUri(TEST_CONTACT_URI)

                        .setServiceCapabilities(serviceCapabilitiesBuilder.build())

                        .setTimestamp(String.valueOf(timeStamp))

                        .setTimestamp(timestamp)

                        .build();



        RcsContactPresenceTuple tupleWithEmptyServiceCapabilities =
@@ -154,7 +214,7 @@ public class EabControllerTest extends ImsTestBase { 
                        TEST_SERVICE_VERSION)

                        .setServiceDescription(TEST_SERVICE_DESCRIPTION)

                        .setContactUri(TEST_CONTACT_URI)

                        .setTimestamp(String.valueOf(timeStamp))

                        .setTimestamp(timestamp)

                        .build();



        RcsContactUceCapability.PresenceBuilder builder =
@@ -165,6 +225,25 @@ public class EabControllerTest extends ImsTestBase { 
        return builder.build();

    }



    private RcsContactUceCapability createPresenceNonRcsCapability(String timestamp) {

        RcsContactPresenceTuple.ServiceCapabilities.Builder serviceCapabilitiesBuilder =

                new RcsContactPresenceTuple.ServiceCapabilities.Builder(false, false);

        RcsContactPresenceTuple tupleWithServiceCapabilities =

                new RcsContactPresenceTuple.Builder(TEST_SERVICE_STATUS, TEST_SERVICE_SERVICE_ID,

                        TEST_SERVICE_VERSION)

                        .setServiceDescription(TEST_SERVICE_DESCRIPTION)

                        .setContactUri(TEST_CONTACT_URI)

                        .setServiceCapabilities(serviceCapabilitiesBuilder.build())

                        .setTimestamp(timestamp)

                        .build();



        RcsContactUceCapability.PresenceBuilder builder =

                new RcsContactUceCapability.PresenceBuilder(

                        TEST_CONTACT_URI, SOURCE_TYPE_NETWORK, REQUEST_RESULT_NOT_FOUND);

        builder.addCapabilityTuple(tupleWithServiceCapabilities);

        return builder.build();

    }



    private void insertContactInfoToDB() {

        ContentValues data = new ContentValues();

        data.put(EabProvider.ContactColumns.PHONE_NUMBER, TEST_PHONE_NUMBER);