commit 2a7c110aa0391bcac2ba634e957959d04b224b3c
author Michael Groover <mpgroover@google.com> Tue Jan 30 16:09:03 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 30 16:09:03 2024 +0000
tree 4976cef97584ffb6620be952f2baeb7c98cbfac3
parent 2f3229a285dfc47eabd37421c9e73aa7321f8d2c
parent ae447b261b1512aab090ab28e6fa6289adfaeac0

Merge "Update null cipher notification mutator to remain consistent with API" into main

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 30621ff..43011e8 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -13837,7 +13837,7 @@
      * @hide
      */
     @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
-    public void setEnableNullCipherNotifications(boolean enable) {
+    public void setNullCipherNotificationsEnabled(boolean enable) {
         enforceModifyPermission();
         checkForNullCipherNotificationSupport();
 

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 df1091f..2d338f2 100644
--- a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
+++ b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
@@ -294,59 +294,59 @@
     }
 
     @Test
-    public void setEnableNullCipherNotifications_allReqsMet_successfullyEnabled() {
+    public void setNullCipherNotificationsEnabled_allReqsMet_successfullyEnabled() {
         setModemSupportsNullCipherNotification(true);
         doNothing().when(mPhoneInterfaceManager).enforceModifyPermission();
         doReturn(202).when(mPhoneInterfaceManager).getHalVersion(anyInt());
         assertFalse(mSharedPreferences.contains(Phone.PREF_NULL_CIPHER_NOTIFICATIONS_ENABLED));
 
-        mPhoneInterfaceManager.setEnableNullCipherNotifications(true);
+        mPhoneInterfaceManager.setNullCipherNotificationsEnabled(true);
 
         assertTrue(
                 mSharedPreferences.getBoolean(Phone.PREF_NULL_CIPHER_NOTIFICATIONS_ENABLED, false));
     }
 
     @Test
-    public void setEnableNullCipherNotifications_allReqsMet_successfullyDisabled() {
+    public void setNullCipherNotificationsEnabled_allReqsMet_successfullyDisabled() {
         setModemSupportsNullCipherNotification(true);
         doNothing().when(mPhoneInterfaceManager).enforceModifyPermission();
         doReturn(202).when(mPhoneInterfaceManager).getHalVersion(anyInt());
         assertFalse(mSharedPreferences.contains(Phone.PREF_NULL_CIPHER_NOTIFICATIONS_ENABLED));
 
-        mPhoneInterfaceManager.setEnableNullCipherNotifications(false);
+        mPhoneInterfaceManager.setNullCipherNotificationsEnabled(false);
 
         assertFalse(
                 mSharedPreferences.getBoolean(Phone.PREF_NULL_CIPHER_NOTIFICATIONS_ENABLED, true));
     }
 
     @Test
-    public void setEnableNullCipherNotifications_lackingNecessaryHal_throwsException() {
+    public void setNullCipherNotificationsEnabled_lackingNecessaryHal_throwsException() {
         setModemSupportsNullCipherNotification(true);
         doNothing().when(mPhoneInterfaceManager).enforceModifyPermission();
         doReturn(102).when(mPhoneInterfaceManager).getHalVersion(anyInt());
 
         assertThrows(UnsupportedOperationException.class,
-                () -> mPhoneInterfaceManager.setEnableNullCipherNotifications(true));
+                () -> mPhoneInterfaceManager.setNullCipherNotificationsEnabled(true));
     }
 
     @Test
-    public void setEnableNullCipherNotifications_lackingModemSupport_throwsException() {
+    public void setNullCipherNotificationsEnabled_lackingModemSupport_throwsException() {
         setModemSupportsNullCipherNotification(false);
         doNothing().when(mPhoneInterfaceManager).enforceModifyPermission();
         doReturn(202).when(mPhoneInterfaceManager).getHalVersion(anyInt());
 
         assertThrows(UnsupportedOperationException.class,
-                () -> mPhoneInterfaceManager.setEnableNullCipherNotifications(true));
+                () -> mPhoneInterfaceManager.setNullCipherNotificationsEnabled(true));
     }
 
     @Test
-    public void setEnableNullCipherNotifications_lackingPermissions_throwsException() {
+    public void setNullCipherNotificationsEnabled_lackingPermissions_throwsException() {
         setModemSupportsNullCipherNotification(true);
         doReturn(202).when(mPhoneInterfaceManager).getHalVersion(anyInt());
         doThrow(SecurityException.class).when(mPhoneInterfaceManager).enforceModifyPermission();
 
         assertThrows(SecurityException.class, () ->
-                mPhoneInterfaceManager.setEnableNullCipherNotifications(true));
+                mPhoneInterfaceManager.setNullCipherNotificationsEnabled(true));
     }
 
     @Test