Merge "create a copy of some text util APIs" (307dec62) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -61,6 +61,7 @@ import com.android.internal.telephony.metrics.TelephonyMetrics;
	import com.android.internal.telephony.uicc.IccUtils;		import com.android.internal.telephony.uicc.IccUtils;
	import com.android.internal.telephony.uicc.UiccCard;		import com.android.internal.telephony.uicc.UiccCard;
	import com.android.internal.telephony.uicc.UiccController;		import com.android.internal.telephony.uicc.UiccController;
			import com.android.internal.telephony.util.TelephonyUtils;
	import com.android.internal.util.ArrayUtils;		import com.android.internal.util.ArrayUtils;

	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	@@ -3737,7 +3738,7 @@ public class SubscriptionController extends ISub.Stub {
	*/		*/
	@NonNull		@NonNull
	public String getDataEnabledOverrideRules(int subId) {		public String getDataEnabledOverrideRules(int subId) {
	return TextUtils.emptyIfNull(getSubscriptionProperty(subId,		return TelephonyUtils.emptyIfNull(getSubscriptionProperty(subId,
	SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES));		SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES));
	}		}

src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,7 @@ import com.android.internal.telephony.PhoneConstants;
	import com.android.internal.telephony.RIL;		import com.android.internal.telephony.RIL;
	import com.android.internal.telephony.RILConstants;		import com.android.internal.telephony.RILConstants;
	import com.android.internal.telephony.SmsResponse;		import com.android.internal.telephony.SmsResponse;
			import com.android.internal.telephony.util.TelephonyUtils;
	import com.android.internal.telephony.UUSInfo;		import com.android.internal.telephony.UUSInfo;
	import com.android.internal.telephony.imsphone.ImsPhoneCall;		import com.android.internal.telephony.imsphone.ImsPhoneCall;
	import com.android.internal.telephony.nano.TelephonyProto;		import com.android.internal.telephony.nano.TelephonyProto;
	@@ -2469,14 +2470,14 @@ public class TelephonyMetrics {
	}		}

	// fill in complete matching information from the SIM.		// fill in complete matching information from the SIM.
	carrierIdMatchingResult.mccmnc = TextUtils.emptyIfNull(simInfo.mccMnc);		carrierIdMatchingResult.mccmnc = TelephonyUtils.emptyIfNull(simInfo.mccMnc);
	carrierIdMatchingResult.spn = TextUtils.emptyIfNull(simInfo.spn);		carrierIdMatchingResult.spn = TelephonyUtils.emptyIfNull(simInfo.spn);
	carrierIdMatchingResult.pnn = TextUtils.emptyIfNull(simInfo.plmn);		carrierIdMatchingResult.pnn = TelephonyUtils.emptyIfNull(simInfo.plmn);
	carrierIdMatchingResult.gid1 = TextUtils.emptyIfNull(simInfo.gid1);		carrierIdMatchingResult.gid1 = TelephonyUtils.emptyIfNull(simInfo.gid1);
	carrierIdMatchingResult.gid2 = TextUtils.emptyIfNull(simInfo.gid2);		carrierIdMatchingResult.gid2 = TelephonyUtils.emptyIfNull(simInfo.gid2);
	carrierIdMatchingResult.imsiPrefix = TextUtils.emptyIfNull(simInfo.imsiPrefixPattern);		carrierIdMatchingResult.imsiPrefix = TelephonyUtils.emptyIfNull(simInfo.imsiPrefixPattern);
	carrierIdMatchingResult.iccidPrefix = TextUtils.emptyIfNull(simInfo.iccidPrefix);		carrierIdMatchingResult.iccidPrefix = TelephonyUtils.emptyIfNull(simInfo.iccidPrefix);
	carrierIdMatchingResult.preferApn = TextUtils.emptyIfNull(simInfo.apn);		carrierIdMatchingResult.preferApn = TelephonyUtils.emptyIfNull(simInfo.apn);
	if (simInfo.privilegeAccessRule != null) {		if (simInfo.privilegeAccessRule != null) {
	carrierIdMatchingResult.privilegeAccessRule =		carrierIdMatchingResult.privilegeAccessRule =
	simInfo.privilegeAccessRule.stream().toArray(String[]::new);		simInfo.privilegeAccessRule.stream().toArray(String[]::new);

src/java/com/android/internal/telephony/util/TelephonyUtils.java

0 → 100644

+28 −0

Original line number	Original line	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.util;

			import android.annotation.Nullable;

			/**
			* This class provides various util functions
			*/
			public final class TelephonyUtils {
			/** {@hide} */
			public static String emptyIfNull(@Nullable String str) {
			return str == null ? "" : str;
			}
			}