commit bddddd2674a1ca533aae4bef78177e8ee2603b2e
author pengfeix <quic_pengfeix@quicinc.com> Fri Nov 01 16:33:27 2019 +0800
committer Pengfei Xiao <quic_pengfeix@quicinc.com> Wed Nov 20 16:02:44 2019 +0800
tree d6899a5d74d89ac4ea7619a0950f6add9c252539
parent e4eb69216911ac41de49c243e1f4d332807025b9

IMS: Avoid to set CLIR after click cancel
Fixes: 131474029
Change-Id: I55aa18685746145fc478a5b03d8b887cfbc1281d

src/com/android/phone/CLIRListPreference.java

diff --git a/src/com/android/phone/CLIRListPreference.java b/src/com/android/phone/CLIRListPreference.java
index 5c6132b..d8a9041 100755
--- a/src/com/android/phone/CLIRListPreference.java
+++ b/src/com/android/phone/CLIRListPreference.java
@@ -47,10 +47,15 @@
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
 
-        mPhone.setOutgoingCallerIdDisplay(convertValueToCLIRMode(getValue()),
-                mHandler.obtainMessage(MyHandler.MESSAGE_SET_CLIR));
-        if (mTcpListener != null) {
-            mTcpListener.onStarted(this, false);
+        if (positiveResult && (getValue() != null)) {
+            mPhone.setOutgoingCallerIdDisplay(convertValueToCLIRMode(getValue()),
+                    mHandler.obtainMessage(MyHandler.MESSAGE_SET_CLIR));
+            if (mTcpListener != null) {
+                mTcpListener.onStarted(this, false);
+            }
+        } else {
+            Log.d(LOG_TAG, String.format("onDialogClosed: positiveResult=%b value=%s -- do nothing",
+                        positiveResult, getValue()));
         }
     }