commit cbdb168fb01090eb9409a3230bbc5707b1e225d8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 14 04:39:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 14 04:39:24 2020 +0000
tree d97fcaebca580932b655e4e195b3b5a50a42869a
parent 19705ed6c4b5969eb30f78a3f594d808fd33f8e4
parent 5773d4c0116e42307ecd43c5bae92257a187a970

Merge "Remove dup code" am: cfee0efc86 am: 4baf8e93d4 am: 674abd1649 am: 5773d4c011

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1458159

Change-Id: Ied7a59bf5121ff922bd3f14cdf3c93dadc50b014

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 7793059..024de1f 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8045,11 +8045,9 @@
         try {
             for (Phone phone: PhoneFactory.getPhones()) {
                 if (phone.getEmergencyNumberTracker() != null
-                        && phone.getEmergencyNumberTracker() != null) {
-                    if (phone.getEmergencyNumberTracker().isEmergencyNumber(
-                            number, exactMatch)) {
-                        return true;
-                    }
+                        && phone.getEmergencyNumberTracker()
+                                .isEmergencyNumber(number, exactMatch)) {
+                    return true;
                 }
             }
             return false;