LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[TNU05.1] Address aosp/1237036 leftover comments" am: 14fb7f6fac

Browse Source 
Change-Id: I9276b698b97d317ba465ab162d191c05841593e0
This commit is contained in:
Paul Hu
2020-04-16 08:39:20 +00:00
committed by Automerger Merge Worker
parent d7269fc22b 14fb7f6fac
commit a91e5e5da6
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Tethering/src/com/android/networkstack/tethering/TetheringNotificationUpdater.java
View File

@@ -50,9 +50,6 @@ import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import java.util.Arrays;
import java.util.List;
/** /**
* A class to display tethering-related notifications. * A class to display tethering-related notifications.
* *
@@ -89,6 +86,9 @@ public class TetheringNotificationUpdater {
static final int NO_ICON_ID = 0; static final int NO_ICON_ID = 0;
@VisibleForTesting @VisibleForTesting
static final int DOWNSTREAM_NONE = 0; static final int DOWNSTREAM_NONE = 0;
// Refer to TelephonyManager#getSimCarrierId for more details about carrier id.
@VisibleForTesting
static final int VERIZON_CARRIER_ID = 1839;
private final Context mContext; private final Context mContext;
private final NotificationManager mNotificationManager; private final NotificationManager mNotificationManager;
private final NotificationChannel mChannel; private final NotificationChannel mChannel;
@@ -114,11 +114,11 @@ public class TetheringNotificationUpdater {
@interface NotificationId {} @interface NotificationId {}
private static final class MccMncOverrideInfo { private static final class MccMncOverrideInfo {
public final List<String> visitedMccMncs; public final String visitedMccMnc;
public final int homeMcc; public final int homeMcc;
public final int homeMnc; public final int homeMnc;
MccMncOverrideInfo(List<String> visitedMccMncs, int mcc, int mnc) { MccMncOverrideInfo(String visitedMccMnc, int mcc, int mnc) {
this.visitedMccMncs = visitedMccMncs; this.visitedMccMnc = visitedMccMnc;
this.homeMcc = mcc; this.homeMcc = mcc;
this.homeMnc = mnc; this.homeMnc = mnc;
} }
@@ -127,9 +127,7 @@ public class TetheringNotificationUpdater {
private static final SparseArray<MccMncOverrideInfo> sCarrierIdToMccMnc = new SparseArray<>(); private static final SparseArray<MccMncOverrideInfo> sCarrierIdToMccMnc = new SparseArray<>();
static { static {
// VZW sCarrierIdToMccMnc.put(VERIZON_CARRIER_ID, new MccMncOverrideInfo("20404", 311, 480));
sCarrierIdToMccMnc.put(
1839, new MccMncOverrideInfo(Arrays.asList(new String[] {"20404"}), 311, 480));
} }
public TetheringNotificationUpdater(@NonNull final Context context, public TetheringNotificationUpdater(@NonNull final Context context,
@@ -200,7 +198,7 @@ public class TetheringNotificationUpdater {
final int carrierId = tm.getSimCarrierId(); final int carrierId = tm.getSimCarrierId();
final String mccmnc = tm.getSimOperator(); final String mccmnc = tm.getSimOperator();
final MccMncOverrideInfo overrideInfo = sCarrierIdToMccMnc.get(carrierId); final MccMncOverrideInfo overrideInfo = sCarrierIdToMccMnc.get(carrierId);
if (overrideInfo != null && overrideInfo.visitedMccMncs.contains(mccmnc)) { if (overrideInfo != null && overrideInfo.visitedMccMnc.equals(mccmnc)) {
// Re-configure MCC/MNC value to specific carrier to get right resources. // Re-configure MCC/MNC value to specific carrier to get right resources.
final Configuration config = res.getConfiguration(); final Configuration config = res.getConfiguration();
config.mcc = overrideInfo.homeMcc; config.mcc = overrideInfo.homeMcc;

3
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringNotificationUpdaterTest.kt
View File

@@ -39,6 +39,7 @@ import com.android.networkstack.tethering.TetheringNotificationUpdater.ENABLE_NO
import com.android.networkstack.tethering.TetheringNotificationUpdater.EVENT_SHOW_NO_UPSTREAM import com.android.networkstack.tethering.TetheringNotificationUpdater.EVENT_SHOW_NO_UPSTREAM
import com.android.networkstack.tethering.TetheringNotificationUpdater.NO_UPSTREAM_NOTIFICATION_ID import com.android.networkstack.tethering.TetheringNotificationUpdater.NO_UPSTREAM_NOTIFICATION_ID
import com.android.networkstack.tethering.TetheringNotificationUpdater.RESTRICTED_NOTIFICATION_ID import com.android.networkstack.tethering.TetheringNotificationUpdater.RESTRICTED_NOTIFICATION_ID
import com.android.networkstack.tethering.TetheringNotificationUpdater.VERIZON_CARRIER_ID
import com.android.testutils.waitForIdle import com.android.testutils.waitForIdle
import org.junit.After import org.junit.After
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
@@ -417,7 +418,7 @@ class TetheringNotificationUpdaterTest {
assertEquals(config.mcc, res.configuration.mcc) assertEquals(config.mcc, res.configuration.mcc)
assertEquals(config.mnc, res.configuration.mnc) assertEquals(config.mnc, res.configuration.mnc)
doReturn(1839).`when`(telephonyManager).getSimCarrierId() doReturn(VERIZON_CARRIER_ID).`when`(telephonyManager).getSimCarrierId()
res = notificationUpdater.getResourcesForSubId(context, subId) res = notificationUpdater.getResourcesForSubId(context, subId)
assertEquals(config.mcc, res.configuration.mcc) assertEquals(config.mcc, res.configuration.mcc)
assertEquals(config.mnc, res.configuration.mnc) assertEquals(config.mnc, res.configuration.mnc)