Merge "VirtualDisplayAdapter remove unnecessary owner uids from map and null check" into main (5968e1ad) · Commits · e / os / android_frameworks_base

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);
		}