summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-10-13 14:56:45 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-10-13 14:56:45 -0700
commitaf47bf57671b8847dc8a72ce2bee38c92b9ff5b8 (patch)
tree0d239ec51ac322fcdf2dabc6c25b3fe2195b386b
parent1c6d9d680d7d3717038019c11a30d8e4c7811120 (diff)
parent06b05f66dec7fe5042b4636aaa882a7464baa936 (diff)
downloadframeworks_base-af47bf57671b8847dc8a72ce2bee38c92b9ff5b8.zip
frameworks_base-af47bf57671b8847dc8a72ce2bee38c92b9ff5b8.tar.gz
frameworks_base-af47bf57671b8847dc8a72ce2bee38c92b9ff5b8.tar.bz2
Merge "Modify getSimCount api to get the sim count dynamically."
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 97ffb70..4799753 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3383,13 +3383,7 @@ public class TelephonyManager {
/** @hide */
public int getSimCount() {
- // FIXME Need to get it from Telephony Dev Controller when that gets implemented!
- // and then this method shouldn't be used at all!
- if(isMultiSimEnabled()) {
- return 2;
- } else {
- return 1;
- }
+ return getPhoneCount();
}
/**