Snap for 7072549 from df5c23cb27012c8452922c339a7f747500ff62b8 to rvc-qpr3-release (58acd988) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/euicc/EuiccConnector.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -404,6 +404,8 @@ public class EuiccConnector extends StateMachine implements ServiceConnection {

		start();

		// All app package changes could trigger the package monitor receiver. It is not limited to
		// apps extended from EuiccService.
		mPackageMonitor.register(mContext, null /* thread /, null / user */);
		mContext.registerReceiver(
		mUserUnlockedReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
		@@ -555,10 +557,10 @@ public class EuiccConnector extends StateMachine implements ServiceConnection {
		mSelectedComponent = findBestComponent();
		if (mSelectedComponent != null) {
		transitionTo(mAvailableState);
		updateSubscriptionInfoListForAllAccessibleEuiccs();
		} else if (getCurrentState() != mUnavailableState) {
		transitionTo(mUnavailableState);
		}
		updateSubscriptionInfoListForAllAccessibleEuiccs();
		return HANDLED;
		} else if (isEuiccCommand(message.what)) {
		BaseEuiccCommandCallback callback = getCallback(message);
		@@ -651,11 +653,16 @@ public class EuiccConnector extends StateMachine implements ServiceConnection {
		if (bestComponent == null) {
		isSameComponent = mSelectedComponent != null;
		} else {
		// Checks whether the bound component is the same as the best component. If it
		// is not, set isSameComponent to false and the connector will bind the best
		// component instead.
		isSameComponent = mSelectedComponent == null
		\|\| Objects.equals(new ComponentName(bestComponent.packageName,
		bestComponent.name),
		new ComponentName(mSelectedComponent.packageName, mSelectedComponent.name));
		}
		// Checks whether the bound component is impacted by the package changes. If it is,
		// change the forceRebind to true so the connector will re-bind the component.
		boolean forceRebind = bestComponent != null
		&& Objects.equals(bestComponent.packageName, affectedPackage);
		if (!isSameComponent \|\| forceRebind) {
		@@ -666,8 +673,8 @@ public class EuiccConnector extends StateMachine implements ServiceConnection {
		} else {
		transitionTo(mBindingState);
		}
		}
		updateSubscriptionInfoListForAllAccessibleEuiccs();
		}
		return HANDLED;
		} else if (message.what == CMD_CONNECT_TIMEOUT) {
		transitionTo(mAvailableState);