Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into... (a334a02c) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -377,7 +377,8 @@ public class SubscriptionController extends ISub.Stub {
		+ " carrierConfigAccessRules: " + Arrays.toString(carrierConfigAccessRules)
		+ " cardId:" + cardIdToPrint + " publicCardId:" + publicCardId
		+ " 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.
		@@ -3280,7 +3281,7 @@ public class SubscriptionController extends ISub.Stub {
		int subId = info.getSubscriptionId();
		return TelephonyPermissions.checkCallingOrSelfReadPhoneState(mContext, subId,
		callingPackage, "getSubscriptionsInGroup")
		\|\| (info.isEmbedded() && info.canManageSubscription(mContext, callingPackage));
		\|\| info.canManageSubscription(mContext, callingPackage);
		}).collect(Collectors.toList());
		}

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

+33 −38

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

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

		@@ -971,39 +969,35 @@ public class SubscriptionInfoUpdater extends Handler {
		return;
		}

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

		ContentValues cv = new ContentValues();
		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");
		}
		ParcelUuid groupUuid = null;

		// 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(
		CarrierConfigManager.KEY_CARRIER_CERTIFICATE_STRING_ARRAY);
		if (certs != null) {
		UiccAccessRule[] carrierConfigAccessRules = new UiccAccessRule[certs.length];
		try {
		for (int i = 0; i < certs.length; i++) {
		carrierConfigAccessRules[i] = new UiccAccessRule(
		MessageDigest.getInstance("SHA-256").digest(certs[i].getBytes()), null, 0);
		}
		} catch (NoSuchAlgorithmException e) {
		throw new RuntimeException("for setCarrierConfigAccessRules, SHA-256 must exist",
		e);
		carrierConfigAccessRules[i] = new UiccAccessRule(IccUtils.hexStringToBytes(
		certs[i]), null, 0);
		}
		cv.put(SubscriptionManager.ACCESS_RULES_FROM_CARRIER_CONFIGS,
		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 =
		config.getString(CarrierConfigManager.KEY_SUBSCRIPTION_GROUP_UUID_STRING, "");
		ParcelUuid groupUuid = null;
		if (!TextUtils.isEmpty(groupUuidString)) {
		try {
		// Update via a UUID Structure to ensure consistent formatting
		@@ -1025,6 +1019,7 @@ public class SubscriptionInfoUpdater extends Handler {
		loge("Invalid Group UUID=" + groupUuidString);
		}
		}
		}
		if (cv.size() > 0 && sContext.getContentResolver().update(SubscriptionManager
		.getUriForSubscriptionId(currentSubId), cv, null, null) > 0) {
		sc.refreshCachedActiveSubscriptionInfoList();

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

+2 −2

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

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

+2 −1

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

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

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

+6 −1

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

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

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