Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remoe usage of CollectionUtils as it's not exposed to mainline modules."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-28 19:16:34 +00:00
committed by Android (Google) Code Review
parent 6308b5e2ad 55e9590016
commit 0bca6e5df7
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/common/com/android/internal/telephony/util/TelephonyUtils.java
View File

@@ -28,6 +28,8 @@ import android.os.RemoteException;
import android.os.SystemProperties;
import java.io.PrintWriter;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
@@ -61,6 +63,11 @@ public final class TelephonyUtils {
return str == null ? "" : str;
}
/** Returns an empty list if the input is {@code null}. */
public static @NonNull <T> List<T> emptyIfNull(@Nullable List<T> cur) {
return cur == null ? Collections.emptyList() : cur;
}
/** Throws a {@link RuntimeException} that wrapps the {@link RemoteException}. */
public static RuntimeException rethrowAsRuntimeException(RemoteException remoteException) {
throw new RuntimeException(remoteException);

16
telephony/java/android/telephony/PhoneCapability.java
View File

@@ -25,7 +25,7 @@ import android.telephony.AccessNetworkConstants.AccessNetworkType;
import android.telephony.AccessNetworkConstants.RadioAccessNetworkType;
import android.telephony.TelephonyManager.NetworkTypeBitMask;
import com.android.internal.util.CollectionUtils;
import com.android.internal.telephony.util.TelephonyUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -181,13 +181,13 @@ public final class PhoneCapability implements Parcelable {
this.mEutranUeCategoryUl = eutranUeCategoryUl;
this.mPsDataConnectionLingerTimeMillis = psDataConnectionLingerTimeMillis;
this.mSupportedRats = supportedRats;
this.mGeranBands = CollectionUtils.emptyIfNull(geranBands);
this.mUtranBands = CollectionUtils.emptyIfNull(utranBands);
this.mEutranBands = CollectionUtils.emptyIfNull(eutranBands);
this.mNgranBands = CollectionUtils.emptyIfNull(ngranBands);
this.mLogicalModemUuids = CollectionUtils.emptyIfNull(logicalModemUuids);
this.mSimSlotCapabilities = CollectionUtils.emptyIfNull(simSlotCapabilities);
this.mConcurrentFeaturesSupport = CollectionUtils.emptyIfNull(concurrentFeaturesSupport);
this.mGeranBands = TelephonyUtils.emptyIfNull(geranBands);
this.mUtranBands = TelephonyUtils.emptyIfNull(utranBands);
this.mEutranBands = TelephonyUtils.emptyIfNull(eutranBands);
this.mNgranBands = TelephonyUtils.emptyIfNull(ngranBands);
this.mLogicalModemUuids = TelephonyUtils.emptyIfNull(logicalModemUuids);
this.mSimSlotCapabilities = TelephonyUtils.emptyIfNull(simSlotCapabilities);
this.mConcurrentFeaturesSupport = TelephonyUtils.emptyIfNull(concurrentFeaturesSupport);
}
private PhoneCapability(Parcel in) {