Snap for 10109327 from c855e85292dd6f730bf60080596c9275906d6adf to udc-qpr1-release (f981a597) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/DatagramReceiver.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -404,6 +404,7 @@ public class DatagramReceiver extends Handler {
		deleteDatagram(argument.datagramId);
		sInstance.mPendingAckCountHashMap.remove(argument.datagramId);
		}
		break;
		}

		default:

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -671,7 +671,6 @@ public class SatelliteController extends Handler {
		if (mNeedsSatellitePointing) {
		mPointingAppController.startPointingUI(false);
		}

		evaluateToSendSatelliteEnabledSuccess();
		} else {
		synchronized (mSatelliteEnabledRequestLock) {
		@@ -687,9 +686,12 @@ public class SatelliteController extends Handler {
		resetSatelliteEnabledRequest();

		setSettingsKeyForSatelliteMode(SATELLITE_MODE_ENABLED_FALSE);
		setDemoModeEnabled(argument.enableDemoMode);
		synchronized (mIsSatelliteEnabledLock) {
		mIsSatelliteEnabled = argument.enableSatellite;
		}
		// If satellite is disabled, send success to callback immediately
		argument.callback.accept(error);
		setIsDemoModeEnabled(argument.enableDemoMode);
		updateSatelliteEnabledState(
		argument.enableSatellite, "EVENT_SET_SATELLITE_ENABLED_DONE");
		}
		@@ -2187,6 +2189,8 @@ public class SatelliteController extends Handler {
		logd("handleEventSatelliteModemStateChanged: state=" + state);
		if (state == SatelliteManager.SATELLITE_MODEM_STATE_OFF
		\|\| state == SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE) {
		setSettingsKeyForSatelliteMode(SATELLITE_MODE_ENABLED_FALSE);
		setDemoModeEnabled(false);
		updateSatelliteEnabledState(
		false, "handleEventSatelliteModemStateChanged");
		cleanUpResources(state);
		@@ -2223,10 +2227,14 @@ public class SatelliteController extends Handler {
		if (areAllRadiosDisabled() && (mSatelliteEnabledRequest != null)
		&& mWaitingForRadioDisabled) {
		logd("Sending success to callback that sent enable satellite request");
		setIsDemoModeEnabled(mSatelliteEnabledRequest.enableDemoMode);
		updateSatelliteEnabledState(mSatelliteEnabledRequest.enableSatellite,
		"EVENT_SET_SATELLITE_ENABLED_DONE");
		setDemoModeEnabled(mSatelliteEnabledRequest.enableDemoMode);
		synchronized (mIsSatelliteEnabledLock) {
		mIsSatelliteEnabled = mSatelliteEnabledRequest.enableSatellite;
		}
		mSatelliteEnabledRequest.callback.accept(SatelliteManager.SATELLITE_ERROR_NONE);
		updateSatelliteEnabledState(
		mSatelliteEnabledRequest.enableSatellite,
		"EVENT_SET_SATELLITE_ENABLED_DONE");
		mSatelliteEnabledRequest = null;
		mWaitingForRadioDisabled = false;
		}
		@@ -2254,7 +2262,7 @@ public class SatelliteController extends Handler {
		}
		}

		private void setIsDemoModeEnabled(boolean enabled) {
		private void setDemoModeEnabled(boolean enabled) {
		mIsDemoModeEnabled = enabled;
		mDatagramController.setDemoMode(mIsDemoModeEnabled);
		}

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -257,6 +257,8 @@ public abstract class IccRecords extends Handler implements IccConstants {
		// call back received on this upon EF_SMSS record update.
		public static final int EVENT_SET_SMSS_RECORD_DONE = 201;

		private static final int EVENT_GET_FDN_DONE = 202;

		/**
		* There are two purposes for this class. First, each instance of AuthAsyncResponse acts as a
		* lock to for calling thead to wait in getIccSimChallengeResponse(). Second, pass the IMS
		@@ -999,6 +1001,15 @@ public abstract class IccRecords extends Handler implements IccConstants {
		}
		break;

		case EVENT_GET_FDN_DONE:
		ar = (AsyncResult) msg.obj;
		if (ar.exception != null) {
		loge("Failed to read USIM EF_FDN field error=" + ar.exception);
		} else {
		log("EF_FDN read successfully");
		}
		break;

		default:
		super.handleMessage(msg);
		}
		@@ -1674,4 +1685,12 @@ public abstract class IccRecords extends Handler implements IccConstants {
		return mMsg;
		}
		}

		public void loadFdnRecords() {
		if (mParentApp != null) {
		log("Loading FdnRecords");
		mAdnCache.requestLoadAllAdnLike(IccConstants.EF_FDN, EF_EXT2,
		obtainMessage(EVENT_GET_FDN_DONE));
		}
		}
		}

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -191,7 +191,6 @@ public class SIMRecords extends IccRecords {
		private static final int EVENT_SET_FPLMN_DONE = 43 + SIM_RECORD_EVENT_BASE;
		protected static final int EVENT_GET_SMSS_RECORD_DONE = 46 + SIM_RECORD_EVENT_BASE;
		protected static final int EVENT_GET_PSISMSC_DONE = 47 + SIM_RECORD_EVENT_BASE;
		protected static final int EVENT_GET_FDN_DONE = 48 + SIM_RECORD_EVENT_BASE;

		// ***** Constructor

		@@ -1360,15 +1359,6 @@ public class SIMRecords extends IccRecords {
		}
		break;

		case EVENT_GET_FDN_DONE:
		ar = (AsyncResult) msg.obj;
		if (ar.exception != null) {
		loge("Failed to read USIM EF_FDN field error=" + ar.exception);
		} else {
		log("EF_FDN read successfully");
		}
		break;

		default:
		super.handleMessage(msg); // IccRecords handles generic record load responses
		}
		@@ -2194,15 +2184,6 @@ public class SIMRecords extends IccRecords {
		log("[CSP] Value Added Service Group (0xC0), not found!");
		}

		public void loadFdnRecords() {
		if (mParentApp != null && mParentApp.getIccFdnEnabled()
		&& mParentApp.getIccFdnAvailable()) {
		log("Loading FdnRecords");
		mAdnCache.requestLoadAllAdnLike(IccConstants.EF_FDN, getExtFromEf(IccConstants.EF_FDN),
		obtainMessage(EVENT_GET_FDN_DONE));
		}
		}

		@VisibleForTesting
		public void setMailboxIndex(int mailboxIndex) {
		mMailboxIndex = mailboxIndex;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -271,7 +271,7 @@ public class UiccCardApplication {
		loge("Bogus facility lock response");
		}
		if (mIccFdnEnabled && mIccFdnAvailable) {
		((SIMRecords) mIccRecords).loadFdnRecords();
		mIccRecords.loadFdnRecords();
		}
		}
		}