Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5548354 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix conference log history for work profiles." into udc-dev

parents 7ecba734 3e11111b
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -919,6 +919,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
                        callingPhoneAccountHandle.getComponentName().getPackageName());
            }

            boolean hasCrossUserAccess = mContext.checkCallingOrSelfPermission(
                    android.Manifest.permission.INTERACT_ACROSS_USERS)
                    == PackageManager.PERMISSION_GRANTED;
            long token = Binder.clearCallingIdentity();
            try {
                synchronized (mLock) {
@@ -930,7 +933,7 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
                    // an emergency call.
                            mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null /*uriScheme*/,
                            false /*includeDisabledAccounts*/, userHandle, 0 /*capabilities*/,
                            0 /*excludedCapabilities*/, false);
                            0 /*excludedCapabilities*/, hasCrossUserAccess);
                    PhoneAccountHandle phoneAccountHandle = null;
                    for (PhoneAccountHandle accountHandle : accountHandles) {
                        if(accountHandle.equals(callingPhoneAccountHandle)) {