Merge "Move VDM initialization from PermissionManager constructor to the caller" into main (9d2a1061) · Commits · e / os / android_frameworks_base

core/java/android/permission/PermissionManager.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -247,8 +247,6 @@ public final class PermissionManager {

		private final LegacyPermissionManager mLegacyPermissionManager;

		private final VirtualDeviceManager mVirtualDeviceManager;

		private final ArrayMap<PackageManager.OnPermissionsChangedListener,
		IOnPermissionsChangeListener> mPermissionListeners = new ArrayMap<>();
		private PermissionUsageHelper mUsageHelper;
		@@ -269,7 +267,6 @@ public final class PermissionManager {
		mPermissionManager = IPermissionManager.Stub.asInterface(ServiceManager.getServiceOrThrow(
		"permissionmgr"));
		mLegacyPermissionManager = context.getSystemService(LegacyPermissionManager.class);
		mVirtualDeviceManager = context.getSystemService(VirtualDeviceManager.class);
		}

		/**
		@@ -1918,7 +1915,10 @@ public final class PermissionManager {
		if (deviceId == Context.DEVICE_ID_DEFAULT) {
		persistentDeviceId = VirtualDeviceManager.PERSISTENT_DEVICE_ID_DEFAULT;
		} else if (android.companion.virtual.flags.Flags.vdmPublicApis()) {
		VirtualDevice virtualDevice = mVirtualDeviceManager.getVirtualDevice(deviceId);
		VirtualDeviceManager virtualDeviceManager = mContext.getSystemService(
		VirtualDeviceManager.class);
		if (virtualDeviceManager != null) {
		VirtualDevice virtualDevice = virtualDeviceManager.getVirtualDevice(deviceId);
		if (virtualDevice == null) {
		Slog.e(LOG_TAG, "Virtual device is not found with device Id " + deviceId);
		return null;
		@@ -1927,6 +1927,7 @@ public final class PermissionManager {
		if (persistentDeviceId == null) {
		Slog.e(LOG_TAG, "Cannot find persistent device Id for " + deviceId);
		}
		}
		} else {
		Slog.e(LOG_TAG, "vdmPublicApis flag is not enabled when device Id " + deviceId
		+ "is not default.");