Merge "Release lock before return" into main (d81c81b8) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/euicc/apdu/ApduSender.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -233,9 +233,17 @@ public class ApduSender {
		if (channel == IccOpenLogicalChannelResponse.INVALID_CHANNEL
		\|\| status != IccOpenLogicalChannelResponse.STATUS_NO_ERROR) {
		mChannelOpened = false;
		resultCallback.onException(
		new ApduException("Failed to open logical channel for AID: "
		+ mAid + ", with status: " + status));
		returnRespnseOrException(
		channel,
		/* closeChannelImmediately= */ false,
		/* response= */ null,
		new ApduException(
		"Failed to open logical channel for AID: "
		+ mAid
		+ ", with status: "
		+ status),
		resultCallback,
		handler);
		return;
		}
		PreferenceManager.getDefaultSharedPreferences(mContext)