DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master (6cc3fe19) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -377,7 +377,8 @@ public class SubscriptionController extends ISub.Stub {
	+ " carrierConfigAccessRules: " + Arrays.toString(carrierConfigAccessRules)		+ " carrierConfigAccessRules: " + Arrays.toString(carrierConfigAccessRules)
	+ " cardId:" + cardIdToPrint + " publicCardId:" + publicCardId		+ " cardId:" + cardIdToPrint + " publicCardId:" + publicCardId
	+ " isOpportunistic:" + isOpportunistic + " groupUUID:" + groupUUID		+ " isOpportunistic:" + isOpportunistic + " groupUUID:" + groupUUID
	+ " profileClass:" + profileClass + " subscriptionType: " + subType);		+ " profileClass:" + profileClass + " subscriptionType: " + subType
			+ " carrierConfigAccessRules:" + carrierConfigAccessRules);
	}		}

	// If line1number has been set to a different number, use it instead.		// If line1number has been set to a different number, use it instead.
	@@ -3280,7 +3281,7 @@ public class SubscriptionController extends ISub.Stub {
	int subId = info.getSubscriptionId();		int subId = info.getSubscriptionId();
	return TelephonyPermissions.checkCallingOrSelfReadPhoneState(mContext, subId,		return TelephonyPermissions.checkCallingOrSelfReadPhoneState(mContext, subId,
	callingPackage, "getSubscriptionsInGroup")		callingPackage, "getSubscriptionsInGroup")
	\|\| (info.isEmbedded() && info.canManageSubscription(mContext, callingPackage));		\|\| info.canManageSubscription(mContext, callingPackage);
	}).collect(Collectors.toList());		}).collect(Collectors.toList());
	}		}

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

+33 −38

Original line number	Original line	Diff line number	Diff line
	@@ -66,8 +66,6 @@ import com.android.internal.telephony.uicc.UiccSlot;

	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.security.MessageDigest;
	import java.security.NoSuchAlgorithmException;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;

	@@ -970,39 +968,35 @@ public class SubscriptionInfoUpdater extends Handler {
	return;		return;
	}		}

	if (!isCarrierServicePackage(phoneId, configPackageName)) {
	loge("Cannot manage subId=" + currentSubId + ", carrierPackage=" + configPackageName);
	return;
	}

	ContentValues cv = new ContentValues();		ContentValues cv = new ContentValues();
	boolean isOpportunistic = config.getBoolean(		ParcelUuid groupUuid = null;
	CarrierConfigManager.KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL, false);
	if (currentSubInfo.isOpportunistic() != isOpportunistic) {
	if (DBG) logd("Set SubId=" + currentSubId + " isOpportunistic=" + isOpportunistic);
	cv.put(SubscriptionManager.IS_OPPORTUNISTIC, isOpportunistic ? "1" : "0");
	}

			// carrier certificates are not subscription-specific, so we want to load them even if
			// this current package is not a CarrierServicePackage
	String[] certs = config.getStringArray(		String[] certs = config.getStringArray(
	CarrierConfigManager.KEY_CARRIER_CERTIFICATE_STRING_ARRAY);		CarrierConfigManager.KEY_CARRIER_CERTIFICATE_STRING_ARRAY);
	if (certs != null) {		if (certs != null) {
	UiccAccessRule[] carrierConfigAccessRules = new UiccAccessRule[certs.length];		UiccAccessRule[] carrierConfigAccessRules = new UiccAccessRule[certs.length];
	try {
	for (int i = 0; i < certs.length; i++) {		for (int i = 0; i < certs.length; i++) {
	carrierConfigAccessRules[i] = new UiccAccessRule(		carrierConfigAccessRules[i] = new UiccAccessRule(IccUtils.hexStringToBytes(
	MessageDigest.getInstance("SHA-256").digest(certs[i].getBytes()), null, 0);		certs[i]), null, 0);
	}
	} catch (NoSuchAlgorithmException e) {
	throw new RuntimeException("for setCarrierConfigAccessRules, SHA-256 must exist",
	e);
	}		}
	cv.put(SubscriptionManager.ACCESS_RULES_FROM_CARRIER_CONFIGS,		cv.put(SubscriptionManager.ACCESS_RULES_FROM_CARRIER_CONFIGS,
	UiccAccessRule.encodeRules(carrierConfigAccessRules));		UiccAccessRule.encodeRules(carrierConfigAccessRules));
	}		}

			if (!isCarrierServicePackage(phoneId, configPackageName)) {
			loge("Cannot manage subId=" + currentSubId + ", carrierPackage=" + configPackageName);
			} else {
			boolean isOpportunistic = config.getBoolean(
			CarrierConfigManager.KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL, false);
			if (currentSubInfo.isOpportunistic() != isOpportunistic) {
			if (DBG) logd("Set SubId=" + currentSubId + " isOpportunistic=" + isOpportunistic);
			cv.put(SubscriptionManager.IS_OPPORTUNISTIC, isOpportunistic ? "1" : "0");
			}

	String groupUuidString =		String groupUuidString =
	config.getString(CarrierConfigManager.KEY_SUBSCRIPTION_GROUP_UUID_STRING, "");		config.getString(CarrierConfigManager.KEY_SUBSCRIPTION_GROUP_UUID_STRING, "");
	ParcelUuid groupUuid = null;
	if (!TextUtils.isEmpty(groupUuidString)) {		if (!TextUtils.isEmpty(groupUuidString)) {
	try {		try {
	// Update via a UUID Structure to ensure consistent formatting		// Update via a UUID Structure to ensure consistent formatting
	@@ -1024,6 +1018,7 @@ public class SubscriptionInfoUpdater extends Handler {
	loge("Invalid Group UUID=" + groupUuidString);		loge("Invalid Group UUID=" + groupUuidString);
	}		}
	}		}
			}
	if (cv.size() > 0 && mContext.getContentResolver().update(SubscriptionManager		if (cv.size() > 0 && mContext.getContentResolver().update(SubscriptionManager
	.getUriForSubscriptionId(currentSubId), cv, null, null) > 0) {		.getUriForSubscriptionId(currentSubId), cv, null, null) > 0) {
	sc.refreshCachedActiveSubscriptionInfoList();		sc.refreshCachedActiveSubscriptionInfoList();

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -83,8 +83,8 @@ public class ApnSettingUtils {
	*/		*/
	public static boolean mvnoMatches(IccRecords r, int mvnoType, String mvnoMatchData) {		public static boolean mvnoMatches(IccRecords r, int mvnoType, String mvnoMatchData) {
	if (mvnoType == ApnSetting.MVNO_TYPE_SPN) {		if (mvnoType == ApnSetting.MVNO_TYPE_SPN) {
	if ((r.getServiceProviderName() != null)		String spn = r.getServiceProviderNameWithBrandOverride();
	&& r.getServiceProviderName().equalsIgnoreCase(mvnoMatchData)) {		if ((spn != null) && spn.equalsIgnoreCase(mvnoMatchData)) {
	return true;		return true;
	}		}
	} else if (mvnoType == ApnSetting.MVNO_TYPE_IMSI) {		} else if (mvnoType == ApnSetting.MVNO_TYPE_IMSI) {

src/java/com/android/internal/telephony/euicc/EuiccController.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1228,7 +1228,8 @@ public class EuiccController extends IEuiccController.Stub {

	final PackageInfo info;		final PackageInfo info;
	try {		try {
	info = mPackageManager.getPackageInfo(callingPackage, PackageManager.GET_SIGNATURES);		info = mPackageManager.getPackageInfo(callingPackage,
			PackageManager.GET_SIGNING_CERTIFICATES);
	} catch (PackageManager.NameNotFoundException e) {		} catch (PackageManager.NameNotFoundException e) {
	Log.e(TAG, "Calling package valid but gone");		Log.e(TAG, "Calling package valid but gone");
	return false;		return false;

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2776,8 +2776,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
	}		}
	foregroundImsPhoneCall.merge(peerImsPhoneCall, ImsPhoneCall.State.ACTIVE);		foregroundImsPhoneCall.merge(peerImsPhoneCall, ImsPhoneCall.State.ACTIVE);

	try {
	final ImsPhoneConnection conn = findConnection(call);		final ImsPhoneConnection conn = findConnection(call);
			try {
	log("onCallMerged: ImsPhoneConnection=" + conn);		log("onCallMerged: ImsPhoneConnection=" + conn);
	log("onCallMerged: CurrentVideoProvider=" + conn.getVideoProvider());		log("onCallMerged: CurrentVideoProvider=" + conn.getVideoProvider());
	setVideoCallProvider(conn, call);		setVideoCallProvider(conn, call);
	@@ -2805,6 +2805,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
	// Reset the flag.		// Reset the flag.
	call.resetIsMergeRequestedByConf(false);		call.resetIsMergeRequestedByConf(false);
	}		}

			// Notify completion of merge
			if (conn != null) {
			conn.handleMergeComplete();
			}
	logState();		logState();
	}		}