commit 100fd75c3a43feaa2d564a2d0c0bc34ca77c55db
author Jayachandran C <jayachandranc@google.com> Mon Apr 18 21:08:24 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 18 21:08:24 2022 +0000
tree 437c2c96b7ef18412d6f1b2b6e659c1b1f85bc2a
parent 14589e61902d2300edbd8fdf038a0af2ee9458b2
parent 1c436d751a1959556ff1394bad18118e47ee7ddf

Merge "Disable change password for call barring when FDN is enabled."

src/com/android/phone/GsmUmtsCallBarringOptions.java

diff --git a/src/com/android/phone/GsmUmtsCallBarringOptions.java b/src/com/android/phone/GsmUmtsCallBarringOptions.java
index 30e9b5c..99dc92f 100644
--- a/src/com/android/phone/GsmUmtsCallBarringOptions.java
+++ b/src/com/android/phone/GsmUmtsCallBarringOptions.java
@@ -236,8 +236,13 @@
                                     "change password for call barring failed with exception: "
                                             + ar.exception);
                         }
-                        onException(mButtonChangePW, (CommandException) ar.exception);
-                        mButtonChangePW.setEnabled(true);
+                        CommandException commandException = (CommandException) ar.exception;
+                        onException(mButtonChangePW, commandException);
+                        if (commandException.getCommandError()
+                                != CommandException.Error.FDN_CHECK_FAILURE) {
+                            // Not a FDN_CHECK_FAILURE, enable mButtonChangePW
+                            mButtonChangePW.setEnabled(true);
+                        }
                     } else if (ar.userObj instanceof Throwable) {
                         onError(mButtonChangePW, RESPONSE_ERROR);
                     } else {