Merge "Clean up UiccPort/Profile on carrier privileges rule load registration" am: 9df7f40a12 (fc0c5ca9) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −33

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.content.Context;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.Signature;
		import android.os.Handler;
		import android.os.Message;
		import android.telephony.TelephonyManager;

		@@ -30,7 +29,6 @@ import com.android.telephony.Rlog;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.List;

		public class UiccPort {
		protected static final String LOG_TAG = "UiccPort";
		@@ -96,37 +94,6 @@ public class UiccPort {
		if (DBG) log("UiccPort finalized");
		}

		/**
		* Notifies handler when carrier privilege rules are loaded.
		* @deprecated Please use
		* {@link UiccProfile#registerForCarrierPrivilegeRulesLoaded(Handler, int, Object)} instead.
		*/
		@Deprecated
		public void registerForCarrierPrivilegeRulesLoaded(Handler h, int what, Object obj) {
		synchronized (mLock) {
		if (mUiccProfile != null) {
		mUiccProfile.registerForCarrierPrivilegeRulesLoaded(h, what, obj);
		} else {
		loge("registerForCarrierPrivilegeRulesLoaded Failed!");
		}
		}
		}

		/**
		* @deprecated Please use
		* {@link UiccProfile#unregisterForCarrierPrivilegeRulesLoaded(Handler)} instead.
		*/
		@Deprecated
		public void unregisterForCarrierPrivilegeRulesLoaded(Handler h) {
		synchronized (mLock) {
		if (mUiccProfile != null) {
		mUiccProfile.unregisterForCarrierPrivilegeRulesLoaded(h);
		} else {
		loge("unregisterForCarrierPrivilegeRulesLoaded Failed!");
		}
		}
		}

		/**
		* @deprecated Please use
		* {@link UiccProfile#isApplicationOnIcc(IccCardApplicationStatus.AppType)} instead.

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

+0 −41

Original line number	Diff line number	Diff line
		@@ -117,7 +117,6 @@ public class UiccProfile extends IccCard {
		private UiccCarrierPrivilegeRules mTestOverrideCarrierPrivilegeRules;
		private boolean mDisposed = false;

		private RegistrantList mCarrierPrivilegeRegistrants = new RegistrantList();
		private RegistrantList mOperatorBrandOverrideRegistrants = new RegistrantList();

		private final int mPhoneId;
		@@ -1271,36 +1270,6 @@ public class UiccProfile extends IccCard {
		}
		}

		/**
		* Registers the handler when carrier privilege rules are loaded.
		*
		* @param h Handler for notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		public void registerForCarrierPrivilegeRulesLoaded(Handler h, int what, Object obj) {
		synchronized (mLock) {
		Registrant r = new Registrant(h, what, obj);

		mCarrierPrivilegeRegistrants.add(r);

		if (areCarrierPrivilegeRulesLoaded()) {
		r.notifyRegistrant();
		}
		}
		}

		/**
		* Unregister for notifications when carrier privilege rules are loaded.
		*
		* @param h Handler to be removed from the registrant list.
		*/
		public void unregisterForCarrierPrivilegeRulesLoaded(Handler h) {
		synchronized (mLock) {
		mCarrierPrivilegeRegistrants.remove(h);
		}
		}

		/**
		* Unregister for notifications when operator brand name is overriden.
		*
		@@ -1350,7 +1319,6 @@ public class UiccProfile extends IccCard {
		InstallCarrierAppUtils.unregisterPackageInstallReceiver(mContext);

		synchronized (mLock) {
		mCarrierPrivilegeRegistrants.notifyRegistrants();
		boolean isProvisioned = isProvisioned();
		boolean isUnlocked = isUserUnlocked();
		// Only show dialog if the phone is through with Setup Wizard and is unlocked.
		@@ -1885,10 +1853,6 @@ public class UiccProfile extends IccCard {
		pw.println("UiccProfile:");
		pw.println(" mCi=" + mCi);
		pw.println(" mCatService=" + mCatService);
		for (int i = 0; i < mCarrierPrivilegeRegistrants.size(); i++) {
		pw.println(" mCarrierPrivilegeRegistrants[" + i + "]="
		+ ((Registrant) mCarrierPrivilegeRegistrants.get(i)).getHandler());
		}
		for (int i = 0; i < mOperatorBrandOverrideRegistrants.size(); i++) {
		pw.println(" mOperatorBrandOverrideRegistrants[" + i + "]="
		+ ((Registrant) mOperatorBrandOverrideRegistrants.get(i)).getHandler());
		@@ -1936,11 +1900,6 @@ public class UiccProfile extends IccCard {
		+ mTestOverrideCarrierPrivilegeRules);
		mTestOverrideCarrierPrivilegeRules.dump(fd, pw, args);
		}
		pw.println(" mCarrierPrivilegeRegistrants: size=" + mCarrierPrivilegeRegistrants.size());
		for (int i = 0; i < mCarrierPrivilegeRegistrants.size(); i++) {
		pw.println(" mCarrierPrivilegeRegistrants[" + i + "]="
		+ ((Registrant) mCarrierPrivilegeRegistrants.get(i)).getHandler());
		}
		pw.flush();

		pw.println(" mNetworkLockedRegistrants: size=" + mNetworkLockedRegistrants.size());

tests/telephonytests/src/com/android/internal/telephony/uicc/UiccProfileTest.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -211,19 +211,6 @@ public class UiccProfileTest extends TelephonyTest {
		mUiccProfile.getUniversalPinState());
		}

		@Test
		@SmallTest
		public void testCarrierPriviledgeLoadedListener() {
		mUiccProfile.registerForCarrierPrivilegeRulesLoaded(mMockedHandler,
		UICCPROFILE_CARRIER_PRIVILEGE_LOADED_EVENT, null);
		ArgumentCaptor<Message> mCaptorMessage = ArgumentCaptor.forClass(Message.class);
		ArgumentCaptor<Long> mCaptorLong = ArgumentCaptor.forClass(Long.class);
		testUpdateUiccProfile();
		verify(mMockedHandler, atLeast(1)).sendMessageDelayed(mCaptorMessage.capture(),
		mCaptorLong.capture());
		assertEquals(UICCPROFILE_CARRIER_PRIVILEGE_LOADED_EVENT, mCaptorMessage.getValue().what);
		}

		@Test
		@SmallTest
		public void testInitialCardState() {