Snap for 5558509 from 8cf47e729b92d734cfdfc0259fefb45765300780 to qt-release (cd17028c) · Commits · e / os / android_frameworks_opt_telephony

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

deleted100644 → 0

+0 −323

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony;

		import android.annotation.NonNull;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		import android.text.TextUtils;
		import android.util.LocalLog;
		import android.util.SparseArray;

		import com.android.internal.telephony.uicc.IccRecords;
		import com.android.internal.telephony.uicc.IccRecords.CarrierNameDisplayConditionBitmask;
		import com.android.internal.telephony.uicc.IccRecords.OperatorPlmnInfo;
		import com.android.internal.telephony.uicc.IccRecords.PlmnNetworkName;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.IndentingPrintWriter;

		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;

		/**
		* Use EF filed from various source according to the priority to resolve the service provider name
		* and PLMN network name.
		*/
		public class CarrierDisplayNameResolverImpl implements CarrierDisplayNameResolver {
		private static final boolean DBG = true;
		private static final String TAG = "CDNRImpl";

		/**
		* Only display SPN in home network, and PLMN network name in roaming network.
		*/
		@CarrierNameDisplayConditionBitmask
		private static final int DEFAULT_CARRIER_NAME_DISPLAY_CONDITION_BITMASK = 0;

		private final SparseArray<String> mServiceProviderNames = new SparseArray<>();
		private final SparseArray<List<String>> mSpdi = new SparseArray<>();
		private final SparseArray<CarrierDisplayNameConditionRule> mCarrierNameDisplayConditionRules =
		new SparseArray<>();
		private final SparseArray<List<PlmnNetworkName>> mPlmnNetworkNames = new SparseArray<>();
		private final SparseArray<List<OperatorPlmnInfo>> mOperatorPlmns = new SparseArray<>();
		private final SparseArray<List<String>> mEhplmns = new SparseArray<>();
		private final LocalLog mLocalLog;

		private ServiceState mServiceState;
		private boolean mShouldShowServiceProviderName;
		private boolean mShouldShowPlmnNetworkName;
		private String mServiceProviderName;
		private String mPlmnNetworkName;
		private String mHomePlmn;

		/** {@code True} if any item is changed after the previous carrier name resolved. */
		private boolean mItemChanged;

		/**
		* The priority of ef source. Lower index means higher priority.
		*
		* {@link CarrierDisplayNameResolver#EF_SOURCE_DEFAULT} should always be the lowest priority
		* source.
		*/
		private static final List<Integer> EF_SOURCE_PRIORITY =
		Arrays.asList(
		EF_SOURCE_CARRIER_API,
		EF_SOURCE_CARRIER_CONFIG,
		EF_SOURCE_ERI,
		EF_SOURCE_USIM,
		EF_SOURCE_SIM,
		EF_SOURCE_CSIM,
		EF_SOURCE_RUIM,
		EF_SOURCE_VOICE_OPERATOR_SIGNALLING,
		EF_SOURCE_DATA_OPERATOR_SIGNALLING,
		EF_SOURCE_MODEM_CONFIG,
		EF_SOURCE_DEFAULT);

		public CarrierDisplayNameResolverImpl(LocalLog localLog) {
		mLocalLog = localLog;
		int key = getSourcePriority(EF_SOURCE_DEFAULT);
		mServiceProviderNames.put(key, "");
		mSpdi.put(key, Collections.EMPTY_LIST);
		mCarrierNameDisplayConditionRules.put(key,
		new CarrierDisplayNameConditionRule(
		DEFAULT_CARRIER_NAME_DISPLAY_CONDITION_BITMASK));
		mPlmnNetworkNames.put(key, Collections.EMPTY_LIST);
		mOperatorPlmns.put(key, Collections.EMPTY_LIST);
		mEhplmns.put(key, Collections.EMPTY_LIST);
		}

		@Override
		public void updateServiceProviderName(@EFSource int source, String spn) {
		if (TextUtils.isEmpty(spn)) return;
		mServiceProviderNames.put(getSourcePriority(source), spn);
		mItemChanged = true;
		}

		@Override
		public void updateServiceProviderDisplayInformation(
		@EFSource int source, @NonNull List<String> spdi) {
		if (ArrayUtils.isEmpty(spdi)) return;
		mSpdi.put(getSourcePriority(source), spdi);
		mItemChanged = true;
		}

		@Override
		public void updateServiceProviderNameDisplayCondition(
		@EFSource int source, @CarrierNameDisplayConditionBitmask int condition) {
		if (condition == IccRecords.INVALID_CARRIER_NAME_DISPLAY_CONDITION_BITMASK) return;
		mCarrierNameDisplayConditionRules.put(getSourcePriority(source),
		new CarrierDisplayNameConditionRule(condition));
		mItemChanged = true;
		}

		@Override
		public void updatePlmnNetworkNameList(
		@EFSource int source, @NonNull List<PlmnNetworkName> pnnList) {
		if (ArrayUtils.isEmpty(pnnList)) return;
		mPlmnNetworkNames.put(getSourcePriority(source), pnnList);
		mItemChanged = true;
		}

		@Override
		public void updateEhplmnList(@EFSource int source, @NonNull List<String> ehplmns) {
		if (ArrayUtils.isEmpty(ehplmns)) return;
		mEhplmns.put(getSourcePriority(source), ehplmns);
		mItemChanged = true;
		}

		@Override
		public void updateServiceState(@NonNull ServiceState serviceState) {
		mServiceState = serviceState;
		mItemChanged = true;
		}

		@Override
		public void updateOperatorPlmnList(@EFSource int source, @NonNull List<OperatorPlmnInfo> opl) {
		if (ArrayUtils.isEmpty(opl)) return;
		mOperatorPlmns.put(getSourcePriority(source), opl);
		mItemChanged = true;
		}

		@Override
		public void updateHomePlmnNumeric(@NonNull String homePlmnNumeric) {
		mHomePlmn = homePlmnNumeric;
		mItemChanged = true;
		}

		@Override
		public boolean shouldShowPlmnNetworkName() {
		if (mItemChanged) resolveCarrierDisplayName();
		return mShouldShowPlmnNetworkName;
		}

		@Override
		public boolean shouldShowServiceProviderName() {
		if (mItemChanged) resolveCarrierDisplayName();
		return mShouldShowServiceProviderName;
		}

		@Override
		public String getPlmnNetworkName() {
		if (mItemChanged) resolveCarrierDisplayName();
		return mPlmnNetworkName;
		}

		@Override
		public String getServiceProviderName() {
		if (mItemChanged) resolveCarrierDisplayName();
		return mServiceProviderName;
		}

		private void resolveCarrierDisplayName() {
		if (mServiceState == null) return;

		CarrierDisplayNameConditionRule displayRule =
		mCarrierNameDisplayConditionRules.valueAt(0);

		String registeredPlmnNumeric = mServiceState.getOperatorNumeric();
		List<String> efSpdi = mSpdi.valueAt(0);

		// Currently use the roaming state from ServiceState.
		// EF_SPDI is only used when determine the service provider name and PLMN network name
		// display condition rule.
		// All the PLMNs will be considered HOME PLMNs if there is a brand override.
		boolean isRoaming = mServiceState.getRoaming() && !efSpdi.contains(registeredPlmnNumeric);
		mShouldShowServiceProviderName = displayRule.shouldShowSpn(isRoaming);
		mShouldShowPlmnNetworkName = displayRule.shouldShowPnn(isRoaming);

		mServiceProviderName = mServiceProviderNames.valueAt(0);

		// Resolve the PLMN network name
		mPlmnNetworkName = "";
		List<OperatorPlmnInfo> efOpl = mOperatorPlmns.valueAt(0);
		List<PlmnNetworkName> efPnn = mPlmnNetworkNames.valueAt(0);

		if (efOpl.isEmpty()) {
		// If the EF_OPL is not present, then the first record in EF_PNN is used for the
		// default network name when registered in the HPLMN or an EHPLMN(if the EHPLMN list
		// is present).
		mPlmnNetworkName = efPnn.isEmpty() ? "" : getPlmnNetworkName(efPnn.get(0));
		} else {
		// TODO: Check the TAC/LAC & registered PLMN numeric in OPL list to determine which
		// PLMN name should be used to override the current one.
		}

		// If no PLMN override is present, then the PLMN should be displayed numerically.
		if (mPlmnNetworkName.isEmpty()) {
		mPlmnNetworkName = registeredPlmnNumeric;
		}

		String logInfo = "isRoaming = " + isRoaming
		+ " ,registeredPLMN = " + registeredPlmnNumeric
		+ " ,displayRule = " + displayRule
		+ " ,shouldShowPlmn = " + mShouldShowPlmnNetworkName
		+ " ,plmn = " + mPlmnNetworkName
		+ " ,shouldShowSpn = " + mShouldShowServiceProviderName
		+ " ,spn = " + mServiceProviderName;
		if (DBG) Rlog.d(TAG, logInfo);
		mLocalLog.log(logInfo);

		mItemChanged = false;
		}

		@Override
		public String toString() {
		Boolean roamingFromSS = mServiceState != null ? mServiceState.getRoaming() : null;
		String registeredPLMN = mServiceState != null ? mServiceState.getOperatorNumeric() : null;
		return " { spnDisplayCondition = " + mCarrierNameDisplayConditionRules
		+ " ,roamingFromSS = " + roamingFromSS
		+ " ,registeredPLMN = " + registeredPLMN
		+ " ,homePLMN = " + mHomePlmn
		+ " ,spnList = " + mServiceProviderNames
		+ " ,spnCondition " + mCarrierNameDisplayConditionRules
		+ " ,spdiList = " + mSpdi
		+ " ,pnnList = " + mPlmnNetworkNames
		+ " ,oplList = " + mOperatorPlmns
		+ " ,ehplmn = " + mEhplmns
		+ " }";
		}

		/**
		* Dumps information for carrier display name resolver.
		* @param pw information printer.
		*/
		public void dump(IndentingPrintWriter pw) {
		pw.println("CDNRImpl");
		pw.increaseIndent();
		pw.println("fields = " + toString());
		pw.println("shouldShowPlmn = " + mShouldShowPlmnNetworkName);
		pw.println("plmn= " + mPlmnNetworkName);
		pw.println("showShowSpn = " + mShouldShowServiceProviderName);
		pw.println("spn = " + mServiceProviderName);
		pw.decreaseIndent();
		}

		/**
		* Get the PLMN network name from the {@link PlmnNetworkName} object.
		* @param name the {@link PlmnNetworkName} object may contain the full and short version of PLMN
		* network name.
		* @return full/short version PLMN network name if one of those is existed, otherwise return an
		* empty string.
		*/
		private static String getPlmnNetworkName(PlmnNetworkName name) {
		if (name == null) return "";
		if (!TextUtils.isEmpty(name.fullName)) return name.fullName;
		if (!TextUtils.isEmpty(name.shortName)) return name.shortName;
		return "";
		}

		/**
		* Get the priority of the source of ef object. If {@code source} is not in the priority list,
		* return {@link Integer#MAX_VALUE}.
		* @param source source of ef object.
		* @return the priority of the source of ef object.
		*/
		private static int getSourcePriority(@EFSource int source) {
		int priority = EF_SOURCE_PRIORITY.indexOf(source);
		if (priority == -1) priority = Integer.MAX_VALUE;
		return priority;
		}

		private static final class CarrierDisplayNameConditionRule {
		private int mDisplayConditionBitmask;

		CarrierDisplayNameConditionRule(int carrierDisplayConditionBitmask) {
		mDisplayConditionBitmask = carrierDisplayConditionBitmask;
		}

		boolean shouldShowSpn(boolean isRoaming) {
		return !isRoaming \|\| ((mDisplayConditionBitmask
		& IccRecords.CARRIER_NAME_DISPLAY_CONDITION_BITMASK_SPN)
		== IccRecords.CARRIER_NAME_DISPLAY_CONDITION_BITMASK_SPN);
		}

		boolean shouldShowPnn(boolean isRoaming) {
		return isRoaming \|\| ((mDisplayConditionBitmask
		& IccRecords.CARRIER_NAME_DISPLAY_CONDITION_BITMASK_PLMN)
		== IccRecords.CARRIER_NAME_DISPLAY_CONDITION_BITMASK_PLMN);
		}

		@Override
		public String toString() {
		return String.format("{ SPN_bit = %d, PLMN_bit = %d }",
		mDisplayConditionBitmask
		& IccRecords.CARRIER_NAME_DISPLAY_CONDITION_BITMASK_SPN,
		mDisplayConditionBitmask
		& IccRecords.CARRIER_NAME_DISPLAY_CONDITION_BITMASK_PLMN);
		}
		}
		}

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ public class GsmCdmaPhone extends Phone {
		private static final String VM_NUMBER_CDMA = "vm_number_key_cdma";
		public static final int RESTART_ECM_TIMER = 0; // restart Ecm timer
		public static final int CANCEL_ECM_TIMER = 1; // cancel Ecm timer
		private static final String PREFIX_WPS = "*272";
		private CdmaSubscriptionSourceManager mCdmaSSM;
		public int mCdmaSubscriptionSource = CdmaSubscriptionSourceManager.SUBSCRIPTION_SOURCE_UNKNOWN;
		private PowerManager.WakeLock mWakeLock;
		@@ -1178,11 +1179,17 @@ public class GsmCdmaPhone extends Phone {
		boolean alwaysTryImsForEmergencyCarrierConfig = configManager.getConfigForSubId(getSubId())
		.getBoolean(CarrierConfigManager.KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL);

		/** Check if the call is Wireless Priority Service call */
		boolean isWpsCall = dialString != null ? dialString.startsWith(PREFIX_WPS) : false;
		boolean allowWpsOverIms = configManager.getConfigForSubId(getSubId())
		.getBoolean(CarrierConfigManager.KEY_SUPPORT_WPS_OVER_IMS_BOOL);

		boolean useImsForCall = isImsUseEnabled()
		&& imsPhone != null
		&& (imsPhone.isVolteEnabled() \|\| imsPhone.isWifiCallingEnabled() \|\|
		(imsPhone.isVideoEnabled() && VideoProfile.isVideo(dialArgs.videoState)))
		&& (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE);
		&& (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)
		&& (isWpsCall ? allowWpsOverIms : true);

		boolean useImsForEmergency = imsPhone != null
		&& isEmergency
		@@ -1202,6 +1209,8 @@ public class GsmCdmaPhone extends Phone {
		+ ", useImsForEmergency=" + useImsForEmergency
		+ ", useImsForUt=" + useImsForUt
		+ ", isUt=" + isUt
		+ ", isWpsCall=" + isWpsCall
		+ ", allowWpsOverIms=" + allowWpsOverIms
		+ ", imsPhone=" + imsPhone
		+ ", imsPhone.isVolteEnabled()="
		+ ((imsPhone != null) ? imsPhone.isVolteEnabled() : "N/A")

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

+89 −363

File changed.

Preview size limit exceeded, changes collapsed.

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

+33 −3

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static com.android.internal.util.DumpUtils.checkDumpPermission;

		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.app.ActivityManager;
		import android.app.ActivityThread;
		import android.app.AppOpsManager;
		import android.app.PendingIntent;
		@@ -353,6 +354,16 @@ public class SmsController extends ISmsImplBase {
		@Override
		public boolean isSmsSimPickActivityNeeded(int subId) {
		final Context context = ActivityThread.currentApplication().getApplicationContext();
		ActivityManager am = context.getSystemService(ActivityManager.class);
		// Don't show the SMS SIM Pick activity if it is not foreground.
		boolean isCallingProcessForeground = am != null
		&& am.getUidImportance(Binder.getCallingUid())
		== ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
		if (!isCallingProcessForeground) {
		Rlog.d(LOG_TAG, "isSmsSimPickActivityNeeded: calling process not foreground. "
		+ "Suppressing activity.");
		return false;
		}
		TelephonyManager telephonyManager =
		(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
		List<SubscriptionInfo> subInfoList;
		@@ -409,14 +420,33 @@ public class SmsController extends ISmsImplBase {
		}

		/**
		* Get User preferred SMS subscription
		* Get preferred SMS subscription.
		*
		* @return User preferred SMS subscription
		* @return User-defined default SMS subscription. If there is no default, return the active
		* subscription if there is only one active. If no preference can be found, return
		* {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}.
		*/
		@UnsupportedAppUsage
		@Override
		public int getPreferredSmsSubscription() {
		return SubscriptionController.getInstance().getDefaultSmsSubId();
		// If there is a default, choose that one.
		int defaultSubId = SubscriptionController.getInstance().getDefaultSmsSubId();
		if (SubscriptionManager.isValidSubscriptionId(defaultSubId)) {
		return defaultSubId;
		}
		// No default, if there is only one sub active, choose that as the "preferred" sub id.
		long token = Binder.clearCallingIdentity();
		try {
		int[] activeSubs = SubscriptionController.getInstance()
		.getActiveSubIdList(true /visibleOnly/);
		if (activeSubs.length == 1) {
		return activeSubs[0];
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		// No preference can be found.
		return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		}

		/**

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

+12 −3

Original line number	Diff line number	Diff line
		@@ -1569,9 +1569,18 @@ public class SubscriptionController extends ISub.Stub {
		value.put(SubscriptionManager.NAME_SOURCE, nameSource);
		}
		if (DBG) logd("[setDisplayName]- mDisplayName:" + nameToSet + " set");
		// TODO(b/33075886): If this is an embedded subscription, we must also save the new name
		// to the eSIM itself. Currently it will be blown away the next time the subscription
		// list is updated.

		// Update the nickname on the eUICC chip if it's an embedded subscription.
		SubscriptionInfo sub = getSubscriptionInfo(subId);
		if (sub != null && sub.isEmbedded()) {
		// Ignore the result.
		if (DBG) logd("Updating embedded sub nickname.");
		EuiccManager euiccManager = (EuiccManager)
		mContext.getSystemService(Context.EUICC_SERVICE);
		euiccManager.updateSubscriptionNickname(subId, displayName,
		PendingIntent.getService(
		mContext, 0 /* requestCode /, new Intent(), 0 / flags */));
		}

		int result = mContext.getContentResolver().update(
		SubscriptionManager.getUriForSubscriptionId(subId), value, null, null);