diff options
| author | Evan Charlton <evanc@google.com> | 2014-11-25 15:26:01 -0800 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-12-05 15:22:44 -0800 |
| commit | 7b2c6e230ef6df2ae7863dc61b632a25393707ee (patch) | |
| tree | 6d9326809740c43e3f55bc848b2224899259a9e5 /sip/src/com/android/services/telephony/sip/SipUtil.java | |
| parent | acdd149662c99e9fbaeddf52ec4644547ee6aa45 (diff) | |
| download | android_packages_services_Telephony-7b2c6e230ef6df2ae7863dc61b632a25393707ee.tar.gz android_packages_services_Telephony-7b2c6e230ef6df2ae7863dc61b632a25393707ee.tar.bz2 android_packages_services_Telephony-7b2c6e230ef6df2ae7863dc61b632a25393707ee.zip | |
Start the configure intent with the right user
When opening the ConnectionService's CONFIGURE activity, make sure
to direct it to the correct user.
Additionally, register SIM/SIP PhoneAccounts as MULTI_USER so that
secondary users can use them.
Finally, differentiate between work profile PhoneAccounts so that
they can be correctly identified by the user.
Bug: 17421902
Bug: 17421044
Bug: 18278824
Change-Id: I673904a7ae038c88688bba62642e93174e55c308
Diffstat (limited to 'sip/src/com/android/services/telephony/sip/SipUtil.java')
| -rw-r--r-- | sip/src/com/android/services/telephony/sip/SipUtil.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sip/src/com/android/services/telephony/sip/SipUtil.java b/sip/src/com/android/services/telephony/sip/SipUtil.java index 54bdc1e92..ea5ea46f4 100644 --- a/sip/src/com/android/services/telephony/sip/SipUtil.java +++ b/sip/src/com/android/services/telephony/sip/SipUtil.java @@ -116,7 +116,8 @@ public class SipUtil { } PhoneAccount.Builder builder = PhoneAccount.builder(accountHandle, profile.getDisplayName()) - .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER) + .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER + | PhoneAccount.CAPABILITY_MULTI_USER) .setAddress(Uri.parse(profile.getUriString())) .setShortDescription(profile.getDisplayName()) .setIcon(context, R.drawable.ic_dialer_sip_black_24dp) |