Merge changes I750aa18b,Ic008f6ee,Ib4268fc2 (e21ae530) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/MultiSimSettingController.java

+4 −1

src/java/com/android/internal/telephony/NetworkRegistrationManager.java

+45 −21

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@ import android.telephony.INetworkServiceCallback;
	import android.telephony.NetworkRegistrationInfo;		import android.telephony.NetworkRegistrationInfo;
	import android.telephony.NetworkService;		import android.telephony.NetworkService;
	import android.telephony.Rlog;		import android.telephony.Rlog;
			import android.telephony.SubscriptionManager;
	import android.text.TextUtils;		import android.text.TextUtils;

	import java.util.Hashtable;		import java.util.Hashtable;
	@@ -100,6 +101,9 @@ public class NetworkRegistrationManager extends Handler {
	intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);		intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
	phone.getContext().registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL,		phone.getContext().registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL,
	intentFilter, null, null);		intentFilter, null, null);
			PhoneConfigurationManager.registerForMultiSimConfigChange(
			this, EVENT_BIND_NETWORK_SERVICE, null);

	sendEmptyMessage(EVENT_BIND_NETWORK_SERVICE);		sendEmptyMessage(EVENT_BIND_NETWORK_SERVICE);
	}		}

	@@ -112,7 +116,7 @@ public class NetworkRegistrationManager extends Handler {
	public void handleMessage(Message msg) {		public void handleMessage(Message msg) {
	switch (msg.what) {		switch (msg.what) {
	case EVENT_BIND_NETWORK_SERVICE:		case EVENT_BIND_NETWORK_SERVICE:
	bindService();		rebindService();
	break;		break;
	default:		default:
	loge("Unhandled event " + msg.what);		loge("Unhandled event " + msg.what);
	@@ -231,15 +235,38 @@ public class NetworkRegistrationManager extends Handler {
	}		}
	}		}

	private void bindService() {		private void unbindService() {
	Intent intent = null;		if (mINetworkService != null && mINetworkService.asBinder().isBinderAlive()) {
	String packageName = getPackageName();		logd("unbinding service");
	String className = getClassName();		// Remove the network availability updater and then unbind the service.
			try {
			mINetworkService.removeNetworkServiceProvider(mPhone.getPhoneId());
			} catch (RemoteException e) {
			loge("Cannot remove data service provider. " + e);
			}
			}

			if (mServiceConnection != null) {
			mPhone.getContext().unbindService(mServiceConnection);
			}
			mINetworkService = null;
			mServiceConnection = null;
			mTargetBindingPackageName = null;
			}

			private void bindService(String packageName) {
			if (mPhone == null \|\| !SubscriptionManager.isValidPhoneId(mPhone.getPhoneId())) {
			loge("can't bindService with invalid phone or phoneId.");
			return;
			}

	if (TextUtils.isEmpty(packageName)) {		if (TextUtils.isEmpty(packageName)) {
	loge("Can't find the binding package");		loge("Can't find the binding package");
	return;		return;
	}		}

			Intent intent = null;
			String className = getClassName();
	if (TextUtils.isEmpty(className)) {		if (TextUtils.isEmpty(className)) {
	intent = new Intent(NetworkService.SERVICE_INTERFACE);		intent = new Intent(NetworkService.SERVICE_INTERFACE);
	intent.setPackage(packageName);		intent.setPackage(packageName);
	@@ -248,22 +275,6 @@ public class NetworkRegistrationManager extends Handler {
	intent = new Intent(NetworkService.SERVICE_INTERFACE).setComponent(cm);		intent = new Intent(NetworkService.SERVICE_INTERFACE).setComponent(cm);
	}		}

	if (TextUtils.equals(packageName, mTargetBindingPackageName)) {
	logd("Service " + packageName + " already bound or being bound.");
	return;
	}

	if (mINetworkService != null && mINetworkService.asBinder().isBinderAlive()) {
	// Remove the network availability updater and then unbind the service.
	try {
	mINetworkService.removeNetworkServiceProvider(mPhone.getPhoneId());
	} catch (RemoteException e) {
	loge("Cannot remove data service provider. " + e);
	}

	mPhone.getContext().unbindService(mServiceConnection);
	}

	try {		try {
	// We bind this as a foreground service because it is operating directly on the SIM,		// We bind this as a foreground service because it is operating directly on the SIM,
	// and we do not want it subjected to power-savings restrictions while doing so.		// and we do not want it subjected to power-savings restrictions while doing so.
	@@ -281,6 +292,19 @@ public class NetworkRegistrationManager extends Handler {
	}		}
	}		}

			private void rebindService() {
			String packageName = getPackageName();
			// Do nothing if no need to rebind.
			if (SubscriptionManager.isValidPhoneId(mPhone.getPhoneId())
			&& TextUtils.equals(packageName, mTargetBindingPackageName)) {
			logd("Service " + packageName + " already bound or being bound.");
			return;
			}

			unbindService();
			bindService(packageName);
			}

	private String getPackageName() {		private String getPackageName() {
	String packageName;		String packageName;
	int resourceId;		int resourceId;

src/java/com/android/internal/telephony/PhoneFactory.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,7 @@ public class PhoneFactory {

	Rlog.i(LOG_TAG, "Creating SubInfoRecordUpdater ");		Rlog.i(LOG_TAG, "Creating SubInfoRecordUpdater ");
	sSubInfoRecordUpdater = new SubscriptionInfoUpdater(		sSubInfoRecordUpdater = new SubscriptionInfoUpdater(
	BackgroundThread.get().getLooper(), context, sPhones, sCommandsInterfaces);		BackgroundThread.get().getLooper(), context, sCommandsInterfaces);
	sc.updatePhonesAvailability(sPhones);		sc.updatePhonesAvailability(sPhones);

	// Only bring up IMS if the device supports having an IMS stack.		// Only bring up IMS if the device supports having an IMS stack.

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+15 −19

Original line number	Original line	Diff line number	Diff line
	@@ -101,8 +101,6 @@ public class SubscriptionInfoUpdater extends Handler {
	// Key used to read/write the current IMSI. Updated on SIM_STATE_CHANGED - LOADED.		// Key used to read/write the current IMSI. Updated on SIM_STATE_CHANGED - LOADED.
	public static final String CURR_SUBID = "curr_subid";		public static final String CURR_SUBID = "curr_subid";

	@UnsupportedAppUsage
	private static Phone[] sPhones;
	@UnsupportedAppUsage		@UnsupportedAppUsage
	private static Context sContext = null;		private static Context sContext = null;
	@UnsupportedAppUsage		@UnsupportedAppUsage
	@@ -138,19 +136,17 @@ public class SubscriptionInfoUpdater extends Handler {
	// TODO: The SubscriptionController instance should be passed in here from PhoneFactory		// TODO: The SubscriptionController instance should be passed in here from PhoneFactory
	// rather than invoking the static getter all over the place.		// rather than invoking the static getter all over the place.
	public SubscriptionInfoUpdater(		public SubscriptionInfoUpdater(
	Looper looper, Context context, Phone[] phone, CommandsInterface[] ci) {		Looper looper, Context context, CommandsInterface[] ci) {
	this(looper, context, phone, ci,		this(looper, context, ci, IPackageManager.Stub.asInterface(
	IPackageManager.Stub.asInterface(ServiceManager.getService("package")));		ServiceManager.getService("package")));
	}		}

	@VisibleForTesting public SubscriptionInfoUpdater(		@VisibleForTesting public SubscriptionInfoUpdater(Looper looper, Context context,
	Looper looper, Context context, Phone[] phone,
	CommandsInterface[] ci, IPackageManager packageMgr) {		CommandsInterface[] ci, IPackageManager packageMgr) {
	logd("Constructor invoked");		logd("Constructor invoked");
	mBackgroundHandler = new Handler(looper);		mBackgroundHandler = new Handler(looper);

	sContext = context;		sContext = context;
	sPhones = phone;
	mSubscriptionManager = SubscriptionManager.from(sContext);		mSubscriptionManager = SubscriptionManager.from(sContext);
	mEuiccManager = (EuiccManager) sContext.getSystemService(Context.EUICC_SERVICE);		mEuiccManager = (EuiccManager) sContext.getSystemService(Context.EUICC_SERVICE);
	mPackageManager = packageMgr;		mPackageManager = packageMgr;
	@@ -254,7 +250,7 @@ public class SubscriptionInfoUpdater extends Handler {
	if (ar.exception == null && ar.result != null) {		if (ar.exception == null && ar.result != null) {
	int[] modes = (int[])ar.result;		int[] modes = (int[])ar.result;
	if (modes[0] == 1) { // Manual mode.		if (modes[0] == 1) { // Manual mode.
	sPhones[slotId].setNetworkSelectionModeAutomatic(null);		PhoneFactory.getPhone(slotId).setNetworkSelectionModeAutomatic(null);
	}		}
	} else {		} else {
	logd("EVENT_GET_NETWORK_SELECTION_MODE_DONE: error getting network mode.");		logd("EVENT_GET_NETWORK_SELECTION_MODE_DONE: error getting network mode.");
	@@ -365,7 +361,7 @@ public class SubscriptionInfoUpdater extends Handler {

	String iccId = sIccId[slotId];		String iccId = sIccId[slotId];
	if (iccId == null) {		if (iccId == null) {
	IccCard iccCard = sPhones[slotId].getIccCard();		IccCard iccCard = PhoneFactory.getPhone(slotId).getIccCard();
	if (iccCard == null) {		if (iccCard == null) {
	logd("handleSimLocked: IccCard null");		logd("handleSimLocked: IccCard null");
	return;		return;
	@@ -412,7 +408,7 @@ public class SubscriptionInfoUpdater extends Handler {
	private void handleSimNotReady(int slotId) {		private void handleSimNotReady(int slotId) {
	logd("handleSimNotReady: slotId: " + slotId);		logd("handleSimNotReady: slotId: " + slotId);

	IccCard iccCard = sPhones[slotId].getIccCard();		IccCard iccCard = PhoneFactory.getPhone(slotId).getIccCard();
	if (iccCard.isEmptyProfile()) {		if (iccCard.isEmptyProfile()) {
	// ICC_NOT_READY is a terminal state for an eSIM on the boot profile. At this		// ICC_NOT_READY is a terminal state for an eSIM on the boot profile. At this
	// phase, the subscription list is accessible. Treating NOT_READY		// phase, the subscription list is accessible. Treating NOT_READY
	@@ -434,7 +430,7 @@ public class SubscriptionInfoUpdater extends Handler {
	// removed or a refresh RESET that the IccRecords could be null. The right behavior is to		// removed or a refresh RESET that the IccRecords could be null. The right behavior is to
	// not broadcast the SIM loaded.		// not broadcast the SIM loaded.
	int loadedSlotId = slotId;		int loadedSlotId = slotId;
	IccCard iccCard = sPhones[slotId].getIccCard();		IccCard iccCard = PhoneFactory.getPhone(slotId).getIccCard();
	if (iccCard == null) { // Possibly a race condition.		if (iccCard == null) { // Possibly a race condition.
	logd("handleSimLoaded: IccCard null");		logd("handleSimLoaded: IccCard null");
	return;		return;
	@@ -504,7 +500,7 @@ public class SubscriptionInfoUpdater extends Handler {

	if (storedSubId != subId) {		if (storedSubId != subId) {
	int networkType = Settings.Global.getInt(		int networkType = Settings.Global.getInt(
	sPhones[slotId].getContext().getContentResolver(),		PhoneFactory.getPhone(slotId).getContext().getContentResolver(),
	Settings.Global.PREFERRED_NETWORK_MODE + subId,		Settings.Global.PREFERRED_NETWORK_MODE + subId,
	-1 /* invalid network mode */);		-1 /* invalid network mode */);

	@@ -519,16 +515,16 @@ public class SubscriptionInfoUpdater extends Handler {
	+ "Settings.Global.PREFERRED_NETWORK_MODE");		+ "Settings.Global.PREFERRED_NETWORK_MODE");
	}		}
	Settings.Global.putInt(		Settings.Global.putInt(
	sPhones[slotId].getContext().getContentResolver(),		PhoneFactory.getPhone(slotId).getContext().getContentResolver(),
	Global.PREFERRED_NETWORK_MODE + subId,		Global.PREFERRED_NETWORK_MODE + subId,
	networkType);		networkType);
	}		}

	// Set the modem network mode		// Set the modem network mode
	sPhones[slotId].setPreferredNetworkType(networkType, null);		PhoneFactory.getPhone(slotId).setPreferredNetworkType(networkType, null);

	// Only support automatic selection mode on SIM change.		// Only support automatic selection mode on SIM change.
	sPhones[slotId].getNetworkSelectionMode(		PhoneFactory.getPhone(slotId).getNetworkSelectionMode(
	obtainMessage(EVENT_GET_NETWORK_SELECTION_MODE_DONE,		obtainMessage(EVENT_GET_NETWORK_SELECTION_MODE_DONE,
	new Integer(slotId)));		new Integer(slotId)));

	@@ -568,8 +564,8 @@ public class SubscriptionInfoUpdater extends Handler {
	}		}

	private void updateSubscriptionCarrierId(int slotId, String simState) {		private void updateSubscriptionCarrierId(int slotId, String simState) {
	if (sPhones != null && sPhones[slotId] != null) {		if (PhoneFactory.getPhone(slotId) != null) {
	sPhones[slotId].resolveSubscriptionCarrierId(simState);		PhoneFactory.getPhone(slotId).resolveSubscriptionCarrierId(simState);
	}		}
	}		}

	@@ -1098,7 +1094,7 @@ public class SubscriptionInfoUpdater extends Handler {
	boolean isUnknownToNotReady =		boolean isUnknownToNotReady =
	(sSimApplicationState[phoneId] == TelephonyManager.SIM_STATE_UNKNOWN		(sSimApplicationState[phoneId] == TelephonyManager.SIM_STATE_UNKNOWN
	&& state == TelephonyManager.SIM_STATE_NOT_READY);		&& state == TelephonyManager.SIM_STATE_NOT_READY);
	IccCard iccCard = sPhones[phoneId].getIccCard();		IccCard iccCard = PhoneFactory.getPhone(phoneId).getIccCard();
	boolean emptyProfile = iccCard != null && iccCard.isEmptyProfile();		boolean emptyProfile = iccCard != null && iccCard.isEmptyProfile();
	if (state != sSimApplicationState[phoneId] && (!isUnknownToNotReady \|\| emptyProfile)) {		if (state != sSimApplicationState[phoneId] && (!isUnknownToNotReady \|\| emptyProfile)) {
	sSimApplicationState[phoneId] = state;		sSimApplicationState[phoneId] = state;

src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java

+50 −26

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,7 @@ import android.telephony.AccessNetworkConstants.TransportType;
	import android.telephony.AnomalyReporter;		import android.telephony.AnomalyReporter;
	import android.telephony.CarrierConfigManager;		import android.telephony.CarrierConfigManager;
	import android.telephony.Rlog;		import android.telephony.Rlog;
			import android.telephony.SubscriptionManager;
	import android.telephony.data.DataCallResponse;		import android.telephony.data.DataCallResponse;
	import android.telephony.data.DataProfile;		import android.telephony.data.DataProfile;
	import android.telephony.data.DataService;		import android.telephony.data.DataService;
	@@ -53,6 +54,7 @@ import android.telephony.data.IDataServiceCallback;
	import android.text.TextUtils;		import android.text.TextUtils;

	import com.android.internal.telephony.Phone;		import com.android.internal.telephony.Phone;
			import com.android.internal.telephony.PhoneConfigurationManager;

	import java.util.HashSet;		import java.util.HashSet;
	import java.util.List;		import java.util.List;
	@@ -285,8 +287,10 @@ public class DataServiceManager extends Handler {

	IntentFilter intentFilter = new IntentFilter();		IntentFilter intentFilter = new IntentFilter();
	intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);		intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
	phone.getContext().registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL,
	intentFilter, null, null);		PhoneConfigurationManager.registerForMultiSimConfigChange(
			this, EVENT_BIND_DATA_SERVICE, null);

	sendEmptyMessage(EVENT_BIND_DATA_SERVICE);		sendEmptyMessage(EVENT_BIND_DATA_SERVICE);
	}		}

	@@ -299,7 +303,7 @@ public class DataServiceManager extends Handler {
	public void handleMessage(Message msg) {		public void handleMessage(Message msg) {
	switch (msg.what) {		switch (msg.what) {
	case EVENT_BIND_DATA_SERVICE:		case EVENT_BIND_DATA_SERVICE:
	bindDataService();		rebindDataService();
	break;		break;
	case EVENT_WATCHDOG_TIMEOUT:		case EVENT_WATCHDOG_TIMEOUT:
	handleRequestUnresponded((CellularDataServiceCallback) msg.obj);		handleRequestUnresponded((CellularDataServiceCallback) msg.obj);
	@@ -320,41 +324,48 @@ public class DataServiceManager extends Handler {
	message);		message);
	}		}

	private void bindDataService() {		private void unbindDataService() {
	Intent intent = null;
	String packageName = getDataServicePackageName();
	String className = getDataServiceClassName();
	if (TextUtils.isEmpty(packageName)) {
	loge("Can't find the binding package");
	return;
	}

	if (TextUtils.isEmpty(className)) {
	intent = new Intent(DataService.SERVICE_INTERFACE);
	intent.setPackage(packageName);
	} else {
	ComponentName cm = new ComponentName(packageName, className);
	intent = new Intent(DataService.SERVICE_INTERFACE).setComponent(cm);
	}

	if (TextUtils.equals(packageName, mTargetBindingPackageName)) {
	if (DBG) log("Service " + packageName + " already bound or being bound.");
	return;
	}

	// Start by cleaning up all packages that shouldn't have permissions.		// Start by cleaning up all packages that shouldn't have permissions.
	revokePermissionsFromUnusedDataServices();		revokePermissionsFromUnusedDataServices();

	if (mIDataService != null && mIDataService.asBinder().isBinderAlive()) {		if (mIDataService != null && mIDataService.asBinder().isBinderAlive()) {
			log("unbinding service");
	// Remove the network availability updater and then unbind the service.		// Remove the network availability updater and then unbind the service.
	try {		try {
	mIDataService.removeDataServiceProvider(mPhone.getPhoneId());		mIDataService.removeDataServiceProvider(mPhone.getPhoneId());
	} catch (RemoteException e) {		} catch (RemoteException e) {
	loge("Cannot remove data service provider. " + e);		loge("Cannot remove data service provider. " + e);
	}		}
			}

			if (mServiceConnection != null) {
	mPhone.getContext().unbindService(mServiceConnection);		mPhone.getContext().unbindService(mServiceConnection);
	}		}
			mIDataService = null;
			mServiceConnection = null;
			mTargetBindingPackageName = null;
			mBound = false;
			}

			private void bindDataService(String packageName) {
			if (mPhone == null \|\| !SubscriptionManager.isValidPhoneId(mPhone.getPhoneId())) {
			loge("can't bindDataService with invalid phone or phoneId.");
			return;
			}

			if (TextUtils.isEmpty(packageName)) {
			loge("Can't find the binding package");
			return;
			}

			Intent intent = null;
			String className = getDataServiceClassName();
			if (TextUtils.isEmpty(className)) {
			intent = new Intent(DataService.SERVICE_INTERFACE);
			intent.setPackage(packageName);
			} else {
			ComponentName cm = new ComponentName(packageName, className);
			intent = new Intent(DataService.SERVICE_INTERFACE).setComponent(cm);
			}

	// Then pre-emptively grant the permissions to the package we will bind.		// Then pre-emptively grant the permissions to the package we will bind.
	grantPermissionsToService(packageName);		grantPermissionsToService(packageName);
	@@ -372,6 +383,19 @@ public class DataServiceManager extends Handler {
	}		}
	}		}

			private void rebindDataService() {
			String packageName = getDataServicePackageName();
			// Do nothing if no need to rebind.
			if (SubscriptionManager.isValidPhoneId(mPhone.getPhoneId())
			&& TextUtils.equals(packageName, mTargetBindingPackageName)) {
			if (DBG) log("Service " + packageName + " already bound or being bound.");
			return;
			}

			unbindDataService();
			bindDataService(packageName);
			}

	@NonNull		@NonNull
	private Set<String> getAllDataServicePackageNames() {		private Set<String> getAllDataServicePackageNames() {
	// Cowardly using the public PackageManager interface here.		// Cowardly using the public PackageManager interface here.

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_WARNING_T
	import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA;		import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA;
	import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE;		import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE;
	import static android.telephony.TelephonyManager.EXTRA_SUBSCRIPTION_ID;		import static android.telephony.TelephonyManager.EXTRA_SUBSCRIPTION_ID;
			import static android.telephony.TelephonyManager.MODEM_COUNT_SINGLE_MODEM;

	import android.annotation.IntDef;		import android.annotation.IntDef;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	@@ -473,7 +474,9 @@ public class MultiSimSettingController extends Handler {
	// Otherwise, if user just inserted their first SIM, or there's one primary and one		// Otherwise, if user just inserted their first SIM, or there's one primary and one
	// opportunistic subscription active (activeSubInfos.size() > 1), we automatically		// opportunistic subscription active (activeSubInfos.size() > 1), we automatically
	// set the primary to be default SIM and return.		// set the primary to be default SIM and return.
	if (mPrimarySubList.size() == 1 && change != PRIMARY_SUB_REMOVED) {		if (mPrimarySubList.size() == 1 && (change != PRIMARY_SUB_REMOVED
			\|\| ((TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE))
			.getActiveModemCount() == MODEM_COUNT_SINGLE_MODEM)) {
	int subId = mPrimarySubList.get(0);		int subId = mPrimarySubList.get(0);
	if (DBG) log("[updateDefaultValues] to only primary sub " + subId);		if (DBG) log("[updateDefaultValues] to only primary sub " + subId);
	mSubController.setDefaultDataSubId(subId);		mSubController.setDefaultDataSubId(subId);