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

Commit 51de64bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Bugfix] avoid deadLock caused by onAuthenticationPrompt()" into main... 

Merge "[Bugfix] avoid deadLock caused by onAuthenticationPrompt()" into main am: 82690ce8 am: bc5db82f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3432081



Change-Id: I73ec62cea6f1ca3b5cf392eaa72d9961bd4674f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eedfb41e bc5db82f

services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java

+6 −7
Original line number Diff line number Diff line
@@ -820,15 +820,14 @@ public class VirtualDeviceManagerService extends SystemService { 


        @Override

        public void onAuthenticationPrompt(int uid) {

            synchronized (mVirtualDeviceManagerLock) {

                for (int i = 0; i < mVirtualDevices.size(); i++) {

                    VirtualDeviceImpl device = mVirtualDevices.valueAt(i);

            ArrayList<VirtualDeviceImpl> virtualDevicesSnapshot = getVirtualDevicesSnapshot();

            for (int i = 0; i < virtualDevicesSnapshot.size(); i++) {

                VirtualDeviceImpl device = virtualDevicesSnapshot.get(i);

                device.showToastWhereUidIsRunning(uid,

                        R.string.app_streaming_blocked_message_for_fingerprint_dialog,

                        Toast.LENGTH_LONG, Looper.getMainLooper());

            }

        }

        }



        @Override

        public int getBaseVirtualDisplayFlags(IVirtualDevice virtualDevice) {