Merge "Setup getDefaultSmsSubscriptionId cache invalidation" (59a31c5f) · Commits · e / os / android_frameworks_opt_telephony

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");
		@@ -4066,6 +4067,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();
		}
		}

		@@ -4087,6 +4090,15 @@ public class SubscriptionController extends ISub.Stub {
		}
		}

		/**
		* @hide
		*/
		private static void invalidateDefaultSmsSubIdCaches() {
		if (sCachingEnabled) {
		SubscriptionManager.invalidateDefaultSmsSubIdCaches();
		}
		}

		/**
		* @hide
		*/