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

Commit 1cfdb2ae authored by Collin Fijalkovich's avatar Collin Fijalkovich
Browse files

Cache getActiveDataSubscriptionId Binder calls 

Use PropertyInvalidatedCache to avoid redundant
calls to SubscriptionController.getActiveDataSubscriptionId.
Bug: 151953109
Test: Verified cache operated correctly when phone process is killed.
Test: atest SubscriptionControllerTest
Test: atest android.telephony.cts.SubscriptionManagerTest

Change-Id: I45d1abf15e4b105c966d4a786a4dc33aa67b20aa
parent 23e8293d

telephony/java/android/telephony/SubscriptionManager.java

+22 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ public class SubscriptionManager { 
    public static final String CACHE_KEY_DEFAULT_DATA_SUB_ID_PROPERTY =

            "cache_key.telephony.get_default_data_sub_id";



    /** @hide */

    public static final String CACHE_KEY_ACTIVE_DATA_SUB_ID_PROPERTY =

            "cache_key.telephony.get_active_data_sub_id";



    private static final int MAX_CACHE_SIZE = 4;



    private static PropertyInvalidatedCache<Void, Integer> sDefaultSubIdCache =
@@ -157,6 +161,14 @@ public class SubscriptionManager { 
                return getDefaultDataSubscriptionIdInternal();

            }};



    private static PropertyInvalidatedCache<Void, Integer> sActiveDataSubIdCache =

            new PropertyInvalidatedCache<Void, Integer>(

                    MAX_CACHE_SIZE, CACHE_KEY_ACTIVE_DATA_SUB_ID_PROPERTY) {

            @Override

            protected Integer recompute(Void query) {

                return getActiveDataSubscriptionIdInternal();

            }};



    /**

     * Generates a content {@link Uri} used to receive updates on simInfo change

     * on the given subscriptionId
@@ -3289,6 +3301,10 @@ public class SubscriptionManager { 
     * SubscriptionManager.INVALID_SUBSCRIPTION_ID if not.

     */

    public static int getActiveDataSubscriptionId() {

        return sActiveDataSubIdCache.query(null);

    }



    private static int getActiveDataSubscriptionIdInternal() {

        try {

            ISub iSub = TelephonyManager.getSubscriptionService();

            if (iSub != null) {
@@ -3324,6 +3340,11 @@ public class SubscriptionManager { 
        PropertyInvalidatedCache.invalidateCache(CACHE_KEY_DEFAULT_DATA_SUB_ID_PROPERTY);

    }



    /** @hide */

    public static void invalidateActiveDataSubIdCaches() {

        PropertyInvalidatedCache.invalidateCache(CACHE_KEY_ACTIVE_DATA_SUB_ID_PROPERTY);

    }



    /**

     * Allows a test process to disable client-side caching operations.

     *
@@ -3332,5 +3353,6 @@ public class SubscriptionManager { 
    public static void disableCaching() {

        sDefaultSubIdCache.disableLocal();

        sDefaultDataSubIdCache.disableLocal();

        sActiveDataSubIdCache.disableLocal();

    }

}

telephony/java/android/telephony/TelephonyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -13091,6 +13091,7 @@ public class TelephonyManager { 
                sISub = null;

                SubscriptionManager.invalidateDefaultSubIdCaches();

                SubscriptionManager.invalidateDefaultDataSubIdCaches();

                SubscriptionManager.invalidateActiveDataSubIdCaches();

            }

            if (sISms != null) {

                sISms.asBinder().unlinkToDeath(sServiceDeath, 0);