commit 5ccb8ac2dee15a365d4296f7ea19bdefc1ca9681
author Gil Cukierman <cukie@google.com> Wed Dec 14 17:51:08 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 14 17:51:08 2022 +0000
tree 06f7a5605d110ef1ff09724f789dc25c24b36fa3
parent a8fcf131782e00e65446161ccdaf706280bef661
parent 74a4a5fe857121eca74657621733c2dd98c3b9b2

Merge "Return Bool From isNullCipherAndIntegrityPreferenceEnabled"

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index c926a23..5d49413 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -17808,11 +17808,11 @@
      * @hide
      */
     @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
-    public void isNullCipherAndIntegrityPreferenceEnabled() {
+    public boolean isNullCipherAndIntegrityPreferenceEnabled() {
         try {
             ITelephony telephony = getITelephony();
             if (telephony != null) {
-                telephony.isNullCipherAndIntegrityPreferenceEnabled();
+                return telephony.isNullCipherAndIntegrityPreferenceEnabled();
             } else {
                 throw new IllegalStateException("telephony service is null.");
             }
@@ -17820,5 +17820,6 @@
             Rlog.e(TAG, "isNullCipherAndIntegrityPreferenceEnabled RemoteException", ex);
             ex.rethrowFromSystemServer();
         }
+        return true;
     }
 }