diff options
| author | Wink Saville <wink@google.com> | 2014-10-27 17:35:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-27 17:35:17 +0000 |
| commit | 9b95221e5d4efc1678f3342a15c05f293cc79a05 (patch) | |
| tree | 39e93afcffc2d5ee3e277e04dfabcedeb7ebaaef /src/com | |
| parent | 050d2d9e323fecb3b17a145bb95ec9d57b31df52 (diff) | |
| parent | 7d05ab1e4565d883f26b1831b470d5f5baede45f (diff) | |
| download | android_packages_apps_Bluetooth-9b95221e5d4efc1678f3342a15c05f293cc79a05.tar.gz android_packages_apps_Bluetooth-9b95221e5d4efc1678f3342a15c05f293cc79a05.tar.bz2 android_packages_apps_Bluetooth-9b95221e5d4efc1678f3342a15c05f293cc79a05.zip | |
Merge "Change subId to int from long" into lmp-mr1-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/bluetooth/hfp/HeadsetPhoneState.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java index 5d49dc1cc..a0b23c410 100644 --- a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java +++ b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java @@ -123,7 +123,7 @@ class HeadsetPhoneState extends BroadcastReceiver{ private void startListenForPhoneState() { if (!mListening && mSlcReady) { - long subId = SubscriptionManager.getDefaultSubId(); + int subId = SubscriptionManager.getDefaultSubId(); if (SubscriptionManager.isValidSubId(subId)) { mPhoneStateListener = getPhoneStateListener(subId); @@ -231,7 +231,7 @@ class HeadsetPhoneState extends BroadcastReceiver{ } } - private PhoneStateListener getPhoneStateListener(long subId) { + private PhoneStateListener getPhoneStateListener(int subId) { PhoneStateListener mPhoneStateListener = new PhoneStateListener(subId) { @Override public void onServiceStateChanged(ServiceState serviceState) { |