commit c373f118d7dccdba161a4e37c916bebaeb8ed6f3
author Shuo Qian <shuoq@google.com> Thu Mar 05 17:55:34 2020 -0800
committer Shuo Qian <shuoq@google.com> Fri Mar 06 22:56:55 2020 +0000
tree 31f45cd04e4fe3bdf61b0b2bc56a76c552faa2aa
parent aab5deae4c346a26da1aa4c091a1dda6bcabedf2

Modify methods in PhoneInterfaceManager to integrate
 resetOtaEmergencyNumberDbFilePath and updateOtaEmergencyNumberDbFilePath

Test: atest TelephonyHostTest#testEmergencyNumberDb
Bug: 147805285
Change-Id: I430b0210d06fcc15f7392f1c373e0a9d3228d301
Merged-In: I430b0210d06fcc15f7392f1c373e0a9d3228d301

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ce4f188..d882ab2 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7884,7 +7884,7 @@
     }
 
     @Override
-    public void updateTestOtaEmergencyNumberDbFilePath(String otaFilePath) {
+    public void updateOtaEmergencyNumberDbFilePath(ParcelFileDescriptor otaParcelFileDescriptor) {
         enforceActiveEmergencySessionPermission();
 
         final long identity = Binder.clearCallingIdentity();
@@ -7892,7 +7892,24 @@
             for (Phone phone: PhoneFactory.getPhones()) {
                 EmergencyNumberTracker tracker = phone.getEmergencyNumberTracker();
                 if (tracker != null) {
-                    tracker.updateTestOtaEmergencyNumberDbFilePath(otaFilePath);
+                    tracker.updateOtaEmergencyNumberDbFilePath(otaParcelFileDescriptor);
+                }
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void resetOtaEmergencyNumberDbFilePath() {
+        enforceActiveEmergencySessionPermission();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            for (Phone phone: PhoneFactory.getPhones()) {
+                EmergencyNumberTracker tracker = phone.getEmergencyNumberTracker();
+                if (tracker != null) {
+                    tracker.resetOtaEmergencyNumberDbFilePath();
                 }
             }
         } finally {