Move getPhoneCount implementation back to TelephonyManager.
Moving it inside iTelephony creates problems. Some components call
getPhoneCount during initialization while iTelephony service is not
even running, which will cause phone process to crash.
Bug: 123667461
Test: manual
Change-Id: Ie13f6222caa1b23b0a537edc014cccd143194b38
Merged-In: Ie13f6222caa1b23b0a537edc014cccd143194b38
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 13accc9..b2da3a1 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6611,19 +6611,6 @@
}
/**
- * Get how many sims have been activated on the phone
- */
- @Override
- public int getNumOfActiveSims() {
- final long identity = Binder.clearCallingIdentity();
- try {
- return mPhoneConfigurationManager.getNumOfActiveSims();
- } finally {
- Binder.restoreCallingIdentity(identity);
- }
- }
-
- /**
* Get whether reboot is required or not after making changes to modem configurations.
* Return value defaults to true
*/