commit b15c6befe99675586d4e12de33e92073080d3816
author Shuo Qian <shuoq@google.com> Thu Mar 05 17:55:34 2020 -0800
committer Shuo Qian <shuoq@google.com> Wed Mar 11 00:01:59 2020 +0000
tree b107d86fe23add3edb8cc42ba132837d32eb2f1c
parent d9ee8537ed8178ef29396ea8b46877972ddd3af9

Modify methods in PhoneInterfaceManager to integrate
 resetOtaEmergencyNumberDbFilePath and updateOtaEmergencyNumberDbFilePath

Test: atest TelephonyHostTest#testEmergencyNumberDb
Bug: 147805285
Change-Id: I430b0210d06fcc15f7392f1c373e0a9d3228d301
Merged-In: I430b0210d06fcc15f7392f1c373e0a9d3228d301
(cherry picked from commit c373f118d7dccdba161a4e37c916bebaeb8ed6f3)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 408131e..623e41a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -45,6 +45,7 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.ParcelFileDescriptor;
 import android.os.ParcelUuid;
 import android.os.PersistableBundle;
 import android.os.Process;
@@ -7849,7 +7850,7 @@
     }
 
     @Override
-    public void updateTestOtaEmergencyNumberDbFilePath(String otaFilePath) {
+    public void updateOtaEmergencyNumberDbFilePath(ParcelFileDescriptor otaParcelFileDescriptor) {
         enforceActiveEmergencySessionPermission();
 
         final long identity = Binder.clearCallingIdentity();
@@ -7857,7 +7858,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 {