summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorxinhe <xinhe@google.com>2014-09-26 20:43:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-26 20:43:58 +0000
commit5ee3f511f26e8215df59fde6af7b62d458ab95d8 (patch)
treed2645e1c514719d56d07404ba82623489de55271 /telephony/java/android
parent19471a664b6da9b664279c8a197e97c06c72c8e2 (diff)
parent31a5a1c15cc1e177693f84c29fe301c5b0ecbc54 (diff)
downloadframeworks_base-5ee3f511f26e8215df59fde6af7b62d458ab95d8.zip
frameworks_base-5ee3f511f26e8215df59fde6af7b62d458ab95d8.tar.gz
frameworks_base-5ee3f511f26e8215df59fde6af7b62d458ab95d8.tar.bz2
am 753044d3: am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev
* commit '753044d3d77489417716076443c11a27c90377db': Support multiple SIM/Subscription on telephony registration
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/PhoneStateListener.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java
index b1b63df..bb3e058 100644
--- a/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@ -229,7 +229,7 @@ public class PhoneStateListener {
* own non-null looper use PhoneStateListener(Looper looper) below.
*/
public PhoneStateListener() {
- this(SubscriptionManager.getDefaultSubId(), Looper.myLooper());
+ this(SubscriptionManager.DEFAULT_SUB_ID, Looper.myLooper());
}
/**