Swap Functions To Resolve Merge Conflicts

Swapping updateModemStateMetrics() and
getSlotsMapping() to resolve merge conflicts.

Bug: 124523892
Test: compilation (no functional change)
Change-Id: I0387fddc409f3fe8a2f24664201421dae97cc7c6
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index bd824c4..b8d7d36 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6649,6 +6649,12 @@
         }
     }
 
+    private void updateModemStateMetrics() {
+        TelephonyMetrics metrics = TelephonyMetrics.getInstance();
+        // TODO: check the state for each modem if the api is ready.
+        metrics.updateEnabledModemBitmap((1 << TelephonyManager.from(mApp).getPhoneCount()) - 1);
+    }
+
     @Override
     public int[] getSlotsMapping() {
         enforceReadPrivilegedPermission("getSlotsMapping");
@@ -6669,11 +6675,4 @@
             Binder.restoreCallingIdentity(identity);
         }
     }
-
-    private void updateModemStateMetrics() {
-        TelephonyMetrics metrics = TelephonyMetrics.getInstance();
-        // TODO: check the state for each modem if the api is ready.
-        metrics.updateEnabledModemBitmap((1 << TelephonyManager.from(mApp).getPhoneCount()) - 1);
-    }
-
 }