commit 17eabae30e6e5a25eb1ba33d0813fe3ef2d8f51f
author Joonhun Shin <joonhunshin@google.com> Wed Feb 21 23:35:07 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 21 23:35:07 2024 +0000
tree f9ff26b39263ab9e6c0e1b5bc47192008aebcf03
parent 97be2861693a68bbea8f03b948f497b8b0c84e12
parent ad2dea7ce472d6a33e61db99b92e8af66e4247e2

Merge "Fix unit test when the FLAG_ENFORCE_TELEPHONY_FEATURE_MAPPING_FOR_PUBLIC_APIS enabled" into main

tests/src/com/android/phone/security/SafetySourceReceiverTest.java

diff --git a/tests/src/com/android/phone/security/SafetySourceReceiverTest.java b/tests/src/com/android/phone/security/SafetySourceReceiverTest.java
index de1f101..305e698 100644
--- a/tests/src/com/android/phone/security/SafetySourceReceiverTest.java
+++ b/tests/src/com/android/phone/security/SafetySourceReceiverTest.java
@@ -60,12 +60,16 @@
         MockitoAnnotations.initMocks(this);
         SafetySourceReceiver receiver = new SafetySourceReceiver();
         mSafetySourceReceiver = spy(receiver);
+
+        when(mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY)).thenReturn(true);
     }
 
     @Test
     public void testOnReceive() {
         mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS,
-                Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
+                Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS,
+                Flags.FLAG_ENFORCE_TELEPHONY_FEATURE_MAPPING_FOR_PUBLIC_APIS);
         Phone mockPhone = mock(Phone.class);
         when(mSafetySourceReceiver.getDefaultPhone()).thenReturn(mockPhone);
 
@@ -80,7 +84,8 @@
     public void testOnReceive_featureFlagsOff() {
         mSetFlagsRule.disableFlags(
                 Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS,
-                Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
+                Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS,
+                Flags.FLAG_ENFORCE_TELEPHONY_FEATURE_MAPPING_FOR_PUBLIC_APIS);
 
         Intent intent = new Intent(ACTION_REFRESH_SAFETY_SOURCES);
         intent.putExtra(EXTRA_REFRESH_SAFETY_SOURCES_BROADCAST_ID, "aBroadcastId");
@@ -96,9 +101,6 @@
                 Flags.FLAG_ENFORCE_TELEPHONY_FEATURE_MAPPING_FOR_PUBLIC_APIS);
         when(mSafetySourceReceiver.getDefaultPhone()).thenReturn(null);
 
-        when(mContext.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_TELEPHONY)).thenReturn(true);
-
         Intent intent = new Intent(ACTION_REFRESH_SAFETY_SOURCES);
         intent.putExtra(EXTRA_REFRESH_SAFETY_SOURCES_BROADCAST_ID, "aBroadcastId");
 
@@ -125,5 +127,4 @@
 
         verify(mockPhone, never()).refreshSafetySources(any());
     }
-
 }