commit 3b1c36b524ee21fbc4dd812a93747a468625d28b
author Joonhun Shin <joonhunshin@google.com> Mon Jan 29 22:54:20 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 29 22:54:20 2024 +0000
tree 68fc0cdcc93764a7fcfc9e4a80cb4e24a16e9bb8
parent 51efbb42fdb42a3a738aef8d6f90bdbfc1a291f8
parent 4f4fa98dcfb9c762a97cfece6046a369d6ee61c9

Merge "Fix presubmit error 10% flake rate" into main

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

diff --git a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
index b00a750..df1091f 100644
--- a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
+++ b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
@@ -488,14 +488,11 @@
 
     @Test
     @EnableCompatChanges({TelephonyManager.ENABLE_FEATURE_MAPPING})
-    public void testTelephonyFeatureAndCompatChanges() {
-        doNothing().when(mPhoneInterfaceManager).enforceModifyPermission();
-        mPhoneInterfaceManager.setFeatureFlags(mFeatureFlags);
+    public void testWithTelephonyFeatureAndCompatChanges() throws Exception {
         doReturn(true).when(mFeatureFlags).enforceTelephonyFeatureMappingForPublicApis();
-        mPhoneInterfaceManager.setPackageManager(mPackageManager);
-        doReturn(true).when(mPackageManager).hasSystemFeature(anyString());
+        mPhoneInterfaceManager.setFeatureFlags(mFeatureFlags);
+        doNothing().when(mPhoneInterfaceManager).enforceModifyPermission();
 
-        // Enabled FeatureFlags and ENABLE_FEATURE_MAPPING, telephony features are defined
         try {
             // FEATURE_TELEPHONY_CALLING
             mPhoneInterfaceManager.handlePinMmiForSubscriber(1, "123456789");
@@ -505,9 +502,21 @@
         } catch (Exception e) {
             fail("Not expect exception " + e.getMessage());
         }
+    }
 
+    @Test
+    @EnableCompatChanges({TelephonyManager.ENABLE_FEATURE_MAPPING})
+    public void testWithoutTelephonyFeatureAndCompatChanges() throws Exception {
         // telephony features is not defined, expect UnsupportedOperationException.
-        doReturn(false).when(mPackageManager).hasSystemFeature(anyString());
+        doReturn(false).when(mPackageManager).hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CALLING);
+        doReturn(false).when(mPackageManager).hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS);
+        mPhoneInterfaceManager.setPackageManager(mPackageManager);
+        doReturn(true).when(mFeatureFlags).enforceTelephonyFeatureMappingForPublicApis();
+        mPhoneInterfaceManager.setFeatureFlags(mFeatureFlags);
+        doNothing().when(mPhoneInterfaceManager).enforceModifyPermission();
+
         assertThrows(UnsupportedOperationException.class,
                 () -> mPhoneInterfaceManager.handlePinMmiForSubscriber(1, "123456789"));
         assertThrows(UnsupportedOperationException.class,