telephony: Cleanup after QCRIL merge (f77bd8eb) · Commits · e / os / android_frameworks_base

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -375,10 +375,6 @@ public class KeyguardUpdateMonitor {
		}
		} else if (IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR.equals(stateExtra)) {
		state = IccCardConstants.State.CARD_IO_ERROR;
		} else if (IccCardConstants.INTENT_VALUE_LOCKED_NETWORK.equals(stateExtra)) {
		state = IccCardConstants.State.NETWORK_LOCKED;
		} else if (IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR.equals(stateExtra)) {
		state = IccCardConstants.State.CARD_IO_ERROR;
		} else if (IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(stateExtra)
		\|\| IccCardConstants.INTENT_VALUE_ICC_IMSI.equals(stateExtra)) {
		// This is required because telephony doesn't return to "READY" after

+0 −12

Original line number	Diff line number	Diff line
		@@ -195,18 +195,6 @@ public class MSimNetworkController extends NetworkController {
		mLastSimIconId = mMSimLastSimIconId[mDefaultSubscription];
		}

		@Override
		protected void createWifiHandler() {
		// wifi
		mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
		Handler handler = new MSimWifiHandler();
		mWifiChannel = new AsyncChannel();
		Messenger wifiMessenger = mWifiManager.getWifiServiceMessenger();
		if (wifiMessenger != null) {
		mWifiChannel.connect(mContext, handler, wifiMessenger);
		}
		}

		@Override
		protected void registerPhoneStateListener(Context context) {
		// telephony

+1 −2

Original line number	Diff line number	Diff line
		@@ -228,8 +228,6 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
		com.android.internal.R.string.lockscreen_carrier_default);
		mNetworkName = mNetworkNameDefault;

		createWifiHandler();

		// broadcasts
		IntentFilter filter = new IntentFilter();
		filter.addAction(WifiManager.RSSI_CHANGED_ACTION);
		@@ -293,6 +291,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {

		public void addDataTypeIconView(ImageView v) {
		mDataTypeIconViews.add(v);
		}

		protected void registerPhoneStateListener(Context context) {
		// telephony

+0 −18

Original line number	Diff line number	Diff line
		@@ -151,24 +151,6 @@ interface ITelephony {
		*/
		boolean supplyPin(String pin);

		/**
		* Supply a pin to unlock the SIM. Blocks until a result is determined.
		* Returns a specific success/error code.
		* @param pin The pin to check.
		* @return Phone.PIN_RESULT_SUCCESS on success. Otherwise error code
		*/
		int supplyPinReportResult(String pin);

		/**
		* Supply puk to unlock the SIM and set SIM pin to new pin.
		* Blocks until a result is determined.
		* Returns a specific success/error code.
		* @param puk The puk to check
		* pin The pin to check.
		* @return Phone.PIN_RESULT_SUCCESS on success. Otherwise error code
		*/
		int supplyPukReportResult(String puk, String pin);

		/**
		* Gets the number of attempts remaining for PIN1/PUK1 unlock.
		*/

+21 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,27 @@ interface ITelephonyMSim {
		*/
		boolean supplyPuk(String puk, String pin, int subscription);

		/**
		* Supply a pin to unlock the SIM. Blocks until a result is determined.
		* Returns a specific success/error code.
		* @param pin The pin to check.
		* @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code
		* retValue[1] = number of attempts remaining if known otherwise -1
		*/
		int[] supplyPinReportResult(String pin, int subscription);

		/**
		* Supply puk to unlock the SIM and set SIM pin to new pin.
		* Blocks until a result is determined.
		* Returns a specific success/error code
		* @param puk The puk to check
		* pin The pin to check.
		* @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code
		* retValue[1] = number of attempts remaining if known otherwise -1
		*/
		int[] supplyPukReportResult(String puk, String pin, int subscription);


		/**
		* Gets the number of attempts remaining for PIN1/PUK1 unlock.
		* @param subscription for which attempts remaining is required.