commit 4336d92e7580f577fc45d624c6b4a0039abdfb82
author Deqiang Chen <deqiangc@google.com> Wed Jun 05 20:02:12 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 05 20:02:12 2019 +0000
tree c158018d2435d1c81558fea922dd2d28cc734af3
parent 87f964936f09702f9a9ace6202c777334a14fb74
parent d6f0e8372dbcec9ee0eb6406d4ee4b1171dea9cf

Merge "When adding bluetooth phone account as emergency capable, also list it for multi user"

src/com/android/bluetooth/hfpclient/connserv/HfpClientConnectionService.java

diff --git a/src/com/android/bluetooth/hfpclient/connserv/HfpClientConnectionService.java b/src/com/android/bluetooth/hfpclient/connserv/HfpClientConnectionService.java
index 2abff9c..0a02ce1 100644
--- a/src/com/android/bluetooth/hfpclient/connserv/HfpClientConnectionService.java
+++ b/src/com/android/bluetooth/hfpclient/connserv/HfpClientConnectionService.java
@@ -335,6 +335,10 @@
                 .hfp_client_connection_service_support_emergency_call)) {
             // Need to have an emergency call capability to place emergency call
             capabilities |= PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS;
+            // Emergency call is processed in user 0 context in multi-user setting
+            // even if caller is from another user. Declare multi user
+            // capability for the account to be chosen.
+            capabilities |= PhoneAccount.CAPABILITY_MULTI_USER;
         }
 
         PhoneAccount account =