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

Commit 9c112de7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22957517



Change-Id: Ib9c0b0f1642ae73ad7a67f3ab31a6ce2be609a5c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3adc1614 f5548354

src/com/android/server/telecom/ConnectionServiceWrapper.java

+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)) {