commit c5e7ad8cfcb9fdab85f4819c9c176069620ff950
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 01 22:12:18 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 01 22:12:18 2022 +0000
tree 0098ecd0c55801104ba2ef9bd6d78e6daa7260cc
parent 68e9cfeb66a5532a4a8c89f986fa947886fa1682
parent 189b10a381f6d494e2b3e67468c6ba20069c30a9

Merge "Fix flaky NotificationMgrTests"

tests/src/com/android/phone/NotificationMgrTest.java

diff --git a/tests/src/com/android/phone/NotificationMgrTest.java b/tests/src/com/android/phone/NotificationMgrTest.java
index bd5ca1d..6d979d6 100644
--- a/tests/src/com/android/phone/NotificationMgrTest.java
+++ b/tests/src/com/android/phone/NotificationMgrTest.java
@@ -73,6 +73,7 @@
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.data.DataConfigManager;
 import com.android.internal.telephony.data.DataNetworkController;
 import com.android.internal.telephony.data.DataSettingsManager;
 import com.android.internal.telephony.util.NotificationChannelController;
@@ -118,6 +119,7 @@
     @Mock CarrierConfigManager mCarrierConfigManager;
     @Mock DataNetworkController mDataNetworkController;
     @Mock DataSettingsManager mDataSettingsManager;
+    @Mock DataConfigManager mDataConfigManager;
 
     private Phone[] mPhones;
     private NotificationMgr mNotificationMgr;
@@ -134,6 +136,7 @@
         when(mPhone.getDataNetworkController()).thenReturn(mDataNetworkController);
         when(mDataNetworkController.getInternetDataDisallowedReasons()).thenReturn(
                 Collections.emptyList());
+        when(mDataNetworkController.getDataConfigManager()).thenReturn(mDataConfigManager);
         when(mPhone.getDataSettingsManager()).thenReturn(mDataSettingsManager);
         when(mDataSettingsManager.isDataEnabledForReason(anyInt())).thenReturn(true);
         when(mApp.getSharedPreferences(anyString(), anyInt())).thenReturn(mSharedPreferences);