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

Commit 737f144d authored by Piotr Wilczyński's avatar Piotr Wilczyński
Browse files

VirtualDisplayAdapter remove unnecessary owner uids from map and null check 

Bug: 261791612
Bug: 383400124
Flag: com.android.server.display.feature.flags.virtual_display_limit
Test: atest VirtualDisplayAdapterTest
Test: atest CtsInputTestCases:android.input.cts.PointerIconTest
Change-Id: I416141a700aed2aa06df003b15356172566d1152
parent 3fd36128

services/core/java/com/android/server/display/VirtualDisplayAdapter.java

+8 −7
Original line number Diff line number Diff line
@@ -307,15 +307,16 @@ public class VirtualDisplayAdapter extends DisplayAdapter { 


    private VirtualDisplayDevice removeVirtualDisplayDeviceLocked(IBinder appToken) {

        if (getFeatureFlags().isVirtualDisplayLimitEnabled()) {

            int ownerUid = mOwnerUids.get(appToken);

            Integer ownerUid = mOwnerUids.remove(appToken);

            if (ownerUid != null) {

                int noOfDevices = mNoOfDevicesPerPackage.get(ownerUid, /* valueIfKeyNotFound= */ 0);

                if (noOfDevices <= 1) {

                    mNoOfDevicesPerPackage.delete(ownerUid);

                mOwnerUids.remove(appToken);

                } else {

                    mNoOfDevicesPerPackage.put(ownerUid, noOfDevices - 1);

                }

            }

        }

        return mVirtualDisplayDevices.remove(appToken);

    }