Merge cherrypicks of [7817250, 7817416] into qt-release (c4040664) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -699,6 +699,13 @@ public class SubscriptionInfoUpdater extends Handler {
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
		public void updateEmbeddedSubscriptions(List<Integer> cardIds,
		@Nullable UpdateEmbeddedSubsCallback callback) {
		// Do nothing if eUICCs are disabled. (Previous entries may remain in the cache, but they
		// are filtered out of list calls as long as EuiccManager.isEnabled returns false).
		if (!mEuiccManager.isEnabled()) {
		callback.run(false /* hasChanges */);
		return;
		}

		mBackgroundHandler.post(() -> {
		List<GetEuiccProfileInfoListResult> results = new ArrayList<>();
		for (int cardId : cardIds) {
		@@ -735,11 +742,6 @@ public class SubscriptionInfoUpdater extends Handler {
		*/
		private boolean updateEmbeddedSubscriptionsCache(GetEuiccProfileInfoListResult result) {
		if (DBG) logd("updateEmbeddedSubscriptionsCache");
		// Do nothing if eUICCs are disabled. (Previous entries may remain in the cache, but they
		// are filtered out of list calls as long as EuiccManager.isEnabled returns false).
		if (!mEuiccManager.isEnabled()) {
		return false;
		}

		if (result == null) {
		// IPC to the eUICC controller failed.