Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ccb8ac2 authored by Gil Cukierman's avatar Gil Cukierman Committed by Android (Google) Code Review
Browse files

Merge "Return Bool From isNullCipherAndIntegrityPreferenceEnabled"

parents a8fcf131 74a4a5fe

telephony/java/android/telephony/TelephonyManager.java

+3 −2
Original line number Diff line number Diff line
@@ -17808,11 +17808,11 @@ public class TelephonyManager { 
     * @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 @@ public class TelephonyManager { 
            Rlog.e(TAG, "isNullCipherAndIntegrityPreferenceEnabled RemoteException", ex);

            ex.rethrowFromSystemServer();

        }

        return true;

    }

}