From 993ed46715e53e930df30411a48855137e000026 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Mon, 20 Jan 2020 22:05:27 -0800 Subject: [PATCH] [DO NOT MERGE] Update CellIdentityGsm Constructor Add a dummy parameter to the CellIdentityGsm constructor for backwards compatibility. As this code doesn't exist in goog/master, add a shim but don't merge it. Bug: 135921133 Test: compilation Change-Id: I707bb4d2b90bfecd5825c25f9a1f92dbd9ccf41b --- src/com/android/settings/network/telephony/CellInfoUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/network/telephony/CellInfoUtil.java b/src/com/android/settings/network/telephony/CellInfoUtil.java index def81a10c64..7ea2ae445c8 100644 --- a/src/com/android/settings/network/telephony/CellInfoUtil.java +++ b/src/com/android/settings/network/telephony/CellInfoUtil.java @@ -33,6 +33,7 @@ import android.util.Log; import com.android.internal.telephony.OperatorInfo; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -150,7 +151,7 @@ public final class CellInfoUtil { mcc, mnc, operatorInfo.getOperatorAlphaLong(), - operatorInfo.getOperatorAlphaShort()); + operatorInfo.getOperatorAlphaShort(), Collections.emptyList()); CellInfoGsm ci = new CellInfoGsm(); ci.setCellIdentity(cig);