Merge "Check aid against empty string for SIM_REFRESH" (1795d401) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java

+10 −11

Original line number	Diff line number	Diff line
		@@ -16,13 +16,18 @@

		package com.android.internal.telephony.uicc;

		import static com.android.internal.telephony.uicc.IccConstants.EF_DOMAIN;
		import static com.android.internal.telephony.uicc.IccConstants.EF_IMPI;
		import static com.android.internal.telephony.uicc.IccConstants.EF_IMPU;
		import static com.android.internal.telephony.uicc.IccConstants.EF_IST;
		import static com.android.internal.telephony.uicc.IccConstants.EF_PCSCF;

		import android.content.Context;
		import android.content.Intent;
		import android.os.AsyncResult;
		import android.os.Handler;
		import android.os.Message;
		import android.telephony.Rlog;
		import android.content.Intent;

		import android.text.TextUtils;

		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.gsm.SimTlv;
		@@ -34,12 +39,6 @@ import java.nio.charset.Charset;
		import java.util.ArrayList;
		import java.util.Arrays;

		import static com.android.internal.telephony.uicc.IccConstants.EF_DOMAIN;
		import static com.android.internal.telephony.uicc.IccConstants.EF_IMPI;
		import static com.android.internal.telephony.uicc.IccConstants.EF_IMPU;
		import static com.android.internal.telephony.uicc.IccConstants.EF_IST;
		import static com.android.internal.telephony.uicc.IccConstants.EF_PCSCF;

		/**
		* {@hide}
		*/
		@@ -349,8 +348,8 @@ public class IsimUiccRecords extends IccRecords implements IsimRecords {
		return;
		}

		if (refreshResponse.aid != null &&
		!refreshResponse.aid.equals(mParentApp.getAid())) {
		if (!TextUtils.isEmpty(refreshResponse.aid)
		&& !refreshResponse.aid.equals(mParentApp.getAid())) {
		// This is for different app. Ignore.
		if (DBG) log("handleIsimRefresh received different app");
		return;

src/java/com/android/internal/telephony/uicc/RuimRecords.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -18,31 +18,31 @@ package com.android.internal.telephony.uicc;

		import static com.android.internal.telephony.TelephonyProperties.PROPERTY_TEST_CSIM;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Locale;
		import android.content.Context;
		import android.content.res.Resources;
		import android.os.AsyncResult;
		import android.os.Message;
		import android.os.SystemProperties;
		import android.telephony.Rlog;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.Rlog;
		import android.text.TextUtils;
		import android.util.Log;
		import android.content.res.Resources;

		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.GsmAlphabet;
		import com.android.internal.telephony.MccTable;
		import com.android.internal.telephony.SubscriptionController;

		import com.android.internal.telephony.cdma.sms.UserData;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
		import com.android.internal.util.BitwiseInputStream;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Locale;

		/**
		* {@hide}
		*/
		@@ -918,8 +918,8 @@ public class RuimRecords extends IccRecords {
		return;
		}

		if (refreshResponse.aid != null &&
		!refreshResponse.aid.equals(mParentApp.getAid())) {
		if (!TextUtils.isEmpty(refreshResponse.aid)
		&& !refreshResponse.aid.equals(mParentApp.getAid())) {
		// This is for different app. Ignore.
		return;
		}

src/java/com/android/internal/telephony/uicc/SIMRecords.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1438,8 +1438,8 @@ public class SIMRecords extends IccRecords {
		return;
		}

		if (refreshResponse.aid != null &&
		!refreshResponse.aid.equals(mParentApp.getAid())) {
		if (!TextUtils.isEmpty(refreshResponse.aid)
		&& !refreshResponse.aid.equals(mParentApp.getAid())) {
		// This is for different app. Ignore.
		return;
		}

src/java/com/android/internal/telephony/uicc/UiccCard.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -44,18 +44,16 @@ import android.text.TextUtils;
		import android.util.LocalLog;
		import android.view.WindowManager;

		import com.android.internal.R;
		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.CommandsInterface.RadioState;
		import com.android.internal.telephony.cat.CatService;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
		import com.android.internal.telephony.uicc.IccCardStatus.CardState;
		import com.android.internal.telephony.uicc.IccCardStatus.PinState;
		import com.android.internal.telephony.cat.CatService;

		import com.android.internal.R;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

		import java.util.Arrays;
		import java.util.HashSet;
		import java.util.List;
		@@ -562,8 +560,8 @@ public class UiccCard {
		synchronized (mLock) {
		boolean changed = false;
		for (int i = 0; i < mUiccApplications.length; i++) {
		if (mUiccApplications[i] != null &&
		(aid == null \|\| aid.equals(mUiccApplications[i].getAid()))) {
		if (mUiccApplications[i] != null
		&& (TextUtils.isEmpty(aid) \|\| aid.equals(mUiccApplications[i].getAid()))) {
		// Delete removed applications
		mUiccApplications[i].dispose();
		mUiccApplications[i] = null;