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

Commit 6d6f78ab authored by Collin Fijalkovich's avatar Collin Fijalkovich
Browse files

Setup getDefaultSmsSubscriptionId cache invalidation 

Instrument SubscriptionController to trigger
invalidation of getDefaultDataSubscriptionId caches when necessary.
Bug: 151953109
Test: atest SubscriptionControllerTest
Test: atest android.telephony.cts.SubscriptionManagerTest

Change-Id: I7b79132063dba4dea15561289ca18e1f80243b3a
parent cd6d420f

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

+12 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ public class SubscriptionController extends ISub.Stub { 
        // Initial invalidate activates caching.

        invalidateDefaultSubIdCaches();

        invalidateDefaultDataSubIdCaches();

        invalidateDefaultSmsSubIdCaches();

        invalidateActiveDataSubIdCaches();



        if (DBG) logdl("[SubscriptionController] init by Context");
@@ -4070,6 +4071,8 @@ public class SubscriptionController extends ISub.Stub { 
            invalidateDefaultSubIdCaches();

        } else if (name == Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION) {

            invalidateDefaultSubIdCaches();

        } else if (name == Settings.Global.MULTI_SIM_SMS_SUBSCRIPTION) {

            invalidateDefaultSmsSubIdCaches();

        }

    }
@@ -4091,6 +4094,15 @@ public class SubscriptionController extends ISub.Stub { 
        }

    }



    /**

     * @hide

     */

    private static void invalidateDefaultSmsSubIdCaches() {

        if (sCachingEnabled) {

            SubscriptionManager.invalidateDefaultSmsSubIdCaches();

        }

    }



    /**

     * @hide

     */