[automerger skipped] Merge "Added new testNotifyCellLocationForSubscriberByUserSwitched" am: 93cc1d5336 am: 062a26cd3e am: 340e9f6ddd -s ours am: 76bab01323 -s ours
am skip reason: skip tag Change-Id I111eb3569b6f30d0ca5bb50a9e04770a1f04fdd7 with SHA-1 6121a24c3e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1552066
Change-Id: I19afe772f3f95b8e8f1c622e485aa60d8039ee2c
diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index 1044169..a12a41a 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -3192,8 +3192,8 @@
case SubscriptionManager.GROUP_UUID:
case SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES:
case SubscriptionManager.ALLOWED_NETWORK_TYPES:
- case SubscriptionManager.VOIMS_OPT_IN_STATUS:
case SubscriptionManager.D2D_STATUS_SHARING:
+ case SubscriptionManager.VOIMS_OPT_IN_STATUS:
case SubscriptionManager.D2D_STATUS_SHARING_SELECTED_CONTACTS:
resultValue = cursor.getString(0);
break;
diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
index 4796a97..a1714a3 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
@@ -364,6 +364,7 @@
verifySmsFiltersInvoked(times(1));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testNewSmsFromBlockedNumber_noBroadcastsSent() {
@@ -381,6 +382,7 @@
verifySmsFiltersInvoked(times(1));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testNewSmsWithUserLocked_notificationShown() {
@@ -407,6 +409,7 @@
any(Notification.class));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testNewSmsFromBlockedNumberWithUserLocked_noNotificationShown() {
@@ -436,6 +439,7 @@
any(Notification.class));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testNewSms_filterInvoked_noBroadcastsSent() {
@@ -461,6 +465,7 @@
anyBoolean(), anyBoolean(), Mockito.<List<InboundSmsHandler.SmsFilter>>any());
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testNewSms_filterChaining_noBroadcastsSent() {
@@ -511,6 +516,7 @@
assertEquals("IdleState", getCurrentState().getName());
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testClass0Sms() {
@@ -542,6 +548,7 @@
verifySmsFiltersInvoked(times(1));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testBroadcastSms() {
@@ -643,6 +650,7 @@
InboundSmsHandler.SOURCE_NOT_INJECTED);
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testMultiPartSmsWithIncompleteWAP() {
@@ -782,6 +790,7 @@
assertEquals("IdleState", getCurrentState().getName());
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testMultiPartIncompleteSms() {
@@ -846,6 +855,7 @@
verifySmsFiltersInvoked(never());
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testMultiPartSmsWithInvalidSeqNumber() {
@@ -905,6 +915,7 @@
verifySmsFiltersInvoked(never());
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testMultipartSmsFromBlockedNumber_noBroadcastsSent() {
@@ -943,6 +954,7 @@
verifySmsFiltersInvoked(times(1));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testMultipartSmsFromBlockedEmail_noBroadcastsSent() {
@@ -998,6 +1010,7 @@
verifySmsFiltersInvoked(times(1));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testMultipartSms_filterInvoked_noBroadcastsSent() {
@@ -1047,6 +1060,7 @@
anyBoolean(), anyBoolean(), Mockito.<List<InboundSmsHandler.SmsFilter>>any());
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testBroadcastUndeliveredUserLocked() throws Exception {
@@ -1087,6 +1101,7 @@
verifySmsFiltersInvoked(times(1));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testBroadcastUndeliveredUserUnlocked() throws Exception {
@@ -1108,6 +1123,7 @@
verifySmsFiltersInvoked(times(1));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testBroadcastUndeliveredDeleted() throws Exception {
@@ -1175,6 +1191,7 @@
verifySmsFiltersInvoked(times(1));
}
+ @FlakyTest // temporarily disabled, see b/182498318
@Test
@MediumTest
public void testBroadcastUndeliveredMultiSim() throws Exception {