Merge "Rename featureId -> attributionTag" into rvc-dev-plus-aosp am: 6cba6e866b (f00c5432) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -406,7 +406,7 @@ public class MultiSimSettingController extends Handler {
		if (DBG) log("onSubscriptionGroupChanged");

		List<SubscriptionInfo> infoList = mSubController.getSubscriptionsInGroup(
		groupUuid, mContext.getOpPackageName(), mContext.getFeatureId());
		groupUuid, mContext.getOpPackageName(), mContext.getAttributionTag());
		if (infoList == null \|\| infoList.isEmpty()) return;

		// Get a reference subscription to copy settings from.
		@@ -470,7 +470,7 @@ public class MultiSimSettingController extends Handler {

		List<SubscriptionInfo> activeSubInfos = mSubController
		.getActiveSubscriptionInfoList(mContext.getOpPackageName(),
		mContext.getFeatureId());
		mContext.getAttributionTag());

		if (ArrayUtils.isEmpty(activeSubInfos)) {
		mPrimarySubList.clear();
		@@ -644,7 +644,7 @@ public class MultiSimSettingController extends Handler {
		if (phone != null && phone.isCdmaSubscriptionAppPresent()) {
		cdmaPhoneCount++;
		String simName = mSubController.getActiveSubscriptionInfo(
		subId, mContext.getOpPackageName(), mContext.getFeatureId())
		subId, mContext.getOpPackageName(), mContext.getAttributionTag())
		.getDisplayName().toString();
		if (TextUtils.isEmpty(simName)) {
		// Fall back to carrier name.
		@@ -702,7 +702,7 @@ public class MultiSimSettingController extends Handler {
		log("setUserDataEnabledForGroup subId " + subId + " enable " + enable);
		List<SubscriptionInfo> infoList = mSubController.getSubscriptionsInGroup(
		mSubController.getGroupUuid(subId), mContext.getOpPackageName(),
		mContext.getFeatureId());
		mContext.getAttributionTag());

		if (infoList == null) return;

		@@ -733,7 +733,7 @@ public class MultiSimSettingController extends Handler {
		SubscriptionController subController = SubscriptionController.getInstance();
		List<SubscriptionInfo> infoList = subController.getSubscriptionsInGroup(
		mSubController.getGroupUuid(subId), mContext.getOpPackageName(),
		mContext.getFeatureId());
		mContext.getAttributionTag());

		if (infoList == null) return;

		@@ -781,7 +781,7 @@ public class MultiSimSettingController extends Handler {
		if (!SubscriptionInfoUpdater.isSubInfoInitialized()) return;

		List<SubscriptionInfo> opptSubList = mSubController.getOpportunisticSubscriptions(
		mContext.getOpPackageName(), mContext.getFeatureId());
		mContext.getOpPackageName(), mContext.getAttributionTag());

		if (ArrayUtils.isEmpty(opptSubList)) return;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ public final class NetworkScanRequestTracker {
		try {
		return SubscriptionController.getInstance()
		.getAvailableSubscriptionInfoList(context.getOpPackageName(),
		context.getFeatureId()).stream()
		context.getAttributionTag()).stream()
		.flatMap(NetworkScanRequestTracker::getAllowableMccMncsFromSubscriptionInfo)
		.collect(Collectors.toSet());
		} finally {

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -4125,7 +4125,7 @@ public class ServiceStateTracker extends Handler {

		SubscriptionInfo info = mSubscriptionController
		.getActiveSubscriptionInfo(mPhone.getSubId(), context.getOpPackageName(),
		context.getFeatureId());
		context.getAttributionTag());

		//if subscription is part of a group and non-primary, suppress all notifications
		if (info == null \|\| (info.isOpportunistic() && info.getGroupUuid() != null)) {
		@@ -4970,7 +4970,7 @@ public class ServiceStateTracker extends Handler {

		List<SubscriptionInfo> subInfoList = SubscriptionController.getInstance()
		.getActiveSubscriptionInfoList(mPhone.getContext().getOpPackageName(),
		mPhone.getContext().getFeatureId());
		mPhone.getContext().getAttributionTag());
		for (SubscriptionInfo info : subInfoList) {
		// If we have an active opportunistic subscription whose data is IN_SERVICE, we needs
		// to get signal strength to decide data switching threshold. In this case, we poll

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

+12 −11

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ public class SubscriptionController extends ISub.Stub {
		List<SubscriptionInfo> subList;
		try {
		subList = getActiveSubscriptionInfoList(
		mContext.getOpPackageName(), mContext.getFeatureId());
		mContext.getOpPackageName(), mContext.getAttributionTag());
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		@@ -598,7 +598,7 @@ public class SubscriptionController extends ISub.Stub {
		final long identity = Binder.clearCallingIdentity();
		try {
		List<SubscriptionInfo> subList = getActiveSubscriptionInfoList(
		mContext.getOpPackageName(), mContext.getFeatureId());
		mContext.getOpPackageName(), mContext.getAttributionTag());
		if (subList != null) {
		for (SubscriptionInfo si : subList) {
		if (iccId.equals(si.getIccId())) {
		@@ -648,7 +648,7 @@ public class SubscriptionController extends ISub.Stub {
		List<SubscriptionInfo> subList;
		try {
		subList = getActiveSubscriptionInfoList(
		mContext.getOpPackageName(), mContext.getFeatureId());
		mContext.getOpPackageName(), mContext.getAttributionTag());
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		@@ -1397,7 +1397,7 @@ public class SubscriptionController extends ISub.Stub {
		int newDefault = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		SubscriptionInfo info = null;
		final List<SubscriptionInfo> records = getActiveSubscriptionInfoList(
		mContext.getOpPackageName(), mContext.getFeatureId());
		mContext.getOpPackageName(), mContext.getAttributionTag());
		if (!records.isEmpty()) {
		// yes, we have more subscriptions. pick the first one.
		// FIXME do we need a policy to figure out which one is to be next default
		@@ -1451,7 +1451,7 @@ public class SubscriptionController extends ISub.Stub {
		ContentResolver resolver = mContext.getContentResolver();
		ContentValues value = new ContentValues();
		value.put(SubscriptionManager.ICC_ID, uniqueId);
		int color = getUnusedColor(mContext.getOpPackageName(), mContext.getFeatureId());
		int color = getUnusedColor(mContext.getOpPackageName(), mContext.getAttributionTag());
		// default SIM color differs between slots
		value.put(SubscriptionManager.COLOR, color);
		value.put(SubscriptionManager.SIM_SLOT_INDEX, slotIndex);
		@@ -1852,7 +1852,7 @@ public class SubscriptionController extends ISub.Stub {
		// TODO: replace all updates with this helper method.
		private int updateDatabase(ContentValues value, int subId, boolean updateEntireGroup) {
		List<SubscriptionInfo> infoList = getSubscriptionsInGroup(getGroupUuid(subId),
		mContext.getOpPackageName(), mContext.getFeatureId());
		mContext.getOpPackageName(), mContext.getAttributionTag());
		if (!updateEntireGroup \|\| infoList == null \|\| infoList.size() == 0) {
		// Only update specified subscriptions.
		return mContext.getContentResolver().update(
		@@ -2479,7 +2479,7 @@ public class SubscriptionController extends ISub.Stub {
		*/
		public boolean isOpportunistic(int subId) {
		SubscriptionInfo info = getActiveSubscriptionInfo(subId, mContext.getOpPackageName(),
		mContext.getFeatureId());
		mContext.getAttributionTag());
		return (info != null) && info.isOpportunistic();
		}

		@@ -2849,7 +2849,7 @@ public class SubscriptionController extends ISub.Stub {
		pw.println("++++++++++++++++++++++++++++++++");

		List<SubscriptionInfo> sirl = getActiveSubscriptionInfoList(
		mContext.getOpPackageName(), mContext.getFeatureId());
		mContext.getOpPackageName(), mContext.getAttributionTag());
		if (sirl != null) {
		pw.println(" ActiveSubInfoList:");
		for (SubscriptionInfo entry : sirl) {
		@@ -2861,7 +2861,7 @@ public class SubscriptionController extends ISub.Stub {
		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");

		sirl = getAllSubInfoList(mContext.getOpPackageName(), mContext.getFeatureId());
		sirl = getAllSubInfoList(mContext.getOpPackageName(), mContext.getAttributionTag());
		if (sirl != null) {
		pw.println(" AllSubInfoList:");
		for (SubscriptionInfo entry : sirl) {
		@@ -3408,7 +3408,8 @@ public class SubscriptionController extends ISub.Stub {
		List<SubscriptionInfo> subInfoList;

		try {
		subInfoList = getAllSubInfoList(mContext.getOpPackageName(), mContext.getFeatureId());
		subInfoList = getAllSubInfoList(mContext.getOpPackageName(),
		mContext.getAttributionTag());
		if (groupUuid == null \|\| subInfoList == null \|\| subInfoList.isEmpty()) {
		return new ArrayList<>();
		}
		@@ -3469,7 +3470,7 @@ public class SubscriptionController extends ISub.Stub {
		if (enable == isActiveSubscriptionId(subId)) return true;

		SubscriptionInfo info = SubscriptionController.getInstance()
		.getAllSubInfoList(mContext.getOpPackageName(), mContext.getFeatureId())
		.getAllSubInfoList(mContext.getOpPackageName(), mContext.getAttributionTag())
		.stream()
		.filter(subInfo -> subInfo.getSubscriptionId() == subId)
		.findFirst()

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -455,7 +455,7 @@ public class DataEnabledSettings {

		private static boolean isStandAloneOpportunistic(int subId, Context context) {
		SubscriptionInfo info = SubscriptionController.getInstance().getActiveSubscriptionInfo(
		subId, context.getOpPackageName(), context.getFeatureId());
		subId, context.getOpPackageName(), context.getAttributionTag());
		return (info != null) && info.isOpportunistic() && info.getGroupUuid() == null;
		}