Revert "Fix issues around GoldfishAddressSpaceBlockProvider::open"
This reverts commit be31206b746f7632690686302dc6379d9ed10c4e.
Bug: 151752077
Bug: 149254427
Test: none
Signed-off-by: Roman Kiryanov <rkir@google.com>
Merged-In: I11f8492aca9c2b0a29074307ae1fec90c665f189
Change-Id: I69e85a425fbeee370b1308b4f7da373a650e5894
diff --git a/shared/OpenglCodecCommon/goldfish_address_space_android.impl b/shared/OpenglCodecCommon/goldfish_address_space_android.impl
index 55b4a04..96194bd 100644
--- a/shared/OpenglCodecCommon/goldfish_address_space_android.impl
+++ b/shared/OpenglCodecCommon/goldfish_address_space_android.impl
@@ -108,7 +108,6 @@
} // namespace
GoldfishAddressSpaceBlockProvider::GoldfishAddressSpaceBlockProvider(GoldfishAddressSpaceSubdeviceType subdevice)
- : m_handle(-1)
{
open(subdevice);
}
diff --git a/shared/OpenglCodecCommon/goldfish_address_space_fuchsia.impl b/shared/OpenglCodecCommon/goldfish_address_space_fuchsia.impl
index a264fe4..cb2ce93 100644
--- a/shared/OpenglCodecCommon/goldfish_address_space_fuchsia.impl
+++ b/shared/OpenglCodecCommon/goldfish_address_space_fuchsia.impl
@@ -70,11 +70,6 @@
{
}
-bool GoldfishAddressSpaceBlockProvider::open(GoldfishAddressSpaceSubdeviceType subdevice) {
- ALOGE("%s: not implemented\n", __func__);
- abort();
-}
-
bool GoldfishAddressSpaceBlockProvider::is_opened() const
{
return m_device.is_bound();
diff --git a/shared/OpenglCodecCommon/goldfish_address_space_host.impl b/shared/OpenglCodecCommon/goldfish_address_space_host.impl
index 1cf6fa7..5a5ee75 100644
--- a/shared/OpenglCodecCommon/goldfish_address_space_host.impl
+++ b/shared/OpenglCodecCommon/goldfish_address_space_host.impl
@@ -37,17 +37,8 @@
using android::emulation::AddressSpaceDevicePingInfo;
GoldfishAddressSpaceBlockProvider::GoldfishAddressSpaceBlockProvider(GoldfishAddressSpaceSubdeviceType subdevice)
- : m_handle(0)
+ : m_handle(HostAddressSpaceDevice::get()->open())
{
- open(subdevice);
-}
-
-bool GoldfishAddressSpaceBlockProvider::open(GoldfishAddressSpaceSubdeviceType subdevice)
-{
- close();
-
- m_handle = HostAddressSpaceDevice::get()->open();
-
if ((subdevice != GoldfishAddressSpaceSubdeviceType::NoSubdevice) && is_opened()) {
AddressSpaceDevicePingInfo request;
::memset(&request, 0, sizeof(request));
@@ -55,8 +46,6 @@
HostAddressSpaceDevice::get()->ping(m_handle, &request);
}
-
- return is_opened();
}
GoldfishAddressSpaceBlockProvider::~GoldfishAddressSpaceBlockProvider()
