commit 733fdf620bf584bb68f1b39c9efe8a993b25f4b4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 09 23:28:43 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 09 23:28:43 2020 +0000
tree 2a8dab8f37e08bd161a94763c0205b2535a19be9
parent a9c2a1d2382be53e6df672bc2801ba09da137eb6
parent df76ab31a2ce6bf0821a62b7ce1645380d8b72d7

Merge "Modify methods in PhoneInterfaceManager to integrate  resetOtaEmergencyNumberDbFilePath and updateOtaEmergencyNumberDbFilePath" into rvc-dev am: df76ab31a2

Change-Id: Ie9179beef942f47384704688b0806526dfb37380

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 {