commit 1c436d751a1959556ff1394bad18118e47ee7ddf
author Aishwarya Mallampati <amallampati@google.com> Mon Apr 11 20:21:23 2022 +0000
committer Aishwarya Mallampati <amallampati@google.com> Mon Apr 11 22:25:46 2022 +0000
tree a0abd40c4c76fe24e05d2920cbb3ba8a3bfea574
parent 823521126d1646132cd766dffbde2a0a7c99c087

Disable change password for call barring when FDN
is enabled.

Bug: 224481021
Test: FDN is enabled, triggered PWD change request and verified the UI
after receiving FDN_CHECK_FAILURE

Change-Id: Ic4e948197122f5565690037ac71293ea5169d4b2

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 {