commit 674abd1649c11362ccd3f09cd2f8d7b9c3bbeca1
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 14 04:11:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 14 04:11:12 2020 +0000
tree 52fe51e8e1a5cac186cb8ee7d271da2a8e023cd1
parent 81d456213b01399f1311ee0ee953281a32c69bdb
parent 4baf8e93d496a69bfaa3451915741036e79bc5ab

Merge "Remove dup code" am: cfee0efc86 am: 4baf8e93d4

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

Change-Id: I5839fef7ac2e7d9a27e029af3133ddec3c081660

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d07be41..a28130d 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7874,11 +7874,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;