commit d1b41daa78079701940f0201437d8656552ffbc4
author Roman Kiryanov <rkir@google.com> Thu Oct 10 14:22:19 2019 -0700
committer Roman Kiryanov <rkir@google.com> Fri Oct 11 09:30:29 2019 -0700
tree 245a244bfe2533d1a8f4a316c843a81cffc4d3da
parent 754c3eb64199b70fca0465b5d214a4f0ab1be6f5

Fix typo in GoldfishAddressSpaceBlockProvider for subdevice checking

Bug: 141385612
Test: build, boot
Change-Id: Ib0d189c8602cbacac1ff4f69613e59fca583dcfa
Signed-off-by: Roman Kiryanov <rkir@google.com>

shared/OpenglCodecCommon/goldfish_address_space_android.impl

diff --git a/shared/OpenglCodecCommon/goldfish_address_space_android.impl b/shared/OpenglCodecCommon/goldfish_address_space_android.impl
index f0abf04..d6fb618 100644
--- a/shared/OpenglCodecCommon/goldfish_address_space_android.impl
+++ b/shared/OpenglCodecCommon/goldfish_address_space_android.impl
@@ -97,7 +97,7 @@
 GoldfishAddressSpaceBlockProvider::GoldfishAddressSpaceBlockProvider(uint64_t subdevice)
   : m_handle(create_address_space_fd())
 {
-    if ((subdevice != SUBDEVICE_TYPE_HOST_MEMORY_ALLOCATOR_ID) && is_opened()) {
+    if ((subdevice != SUBDEVICE_TYPE_NO_SUBDEVICE_ID) && is_opened()) {
         const long ret = set_address_space_subdevice_type(m_handle, subdevice);
         if (ret) {
             ALOGE("%s: set_address_space_subdevice_type failed for device_type=%lu, ret=%ld",

shared/OpenglCodecCommon/goldfish_address_space_host.impl

diff --git a/shared/OpenglCodecCommon/goldfish_address_space_host.impl b/shared/OpenglCodecCommon/goldfish_address_space_host.impl
index 99e1b0c..a25b795 100644
--- a/shared/OpenglCodecCommon/goldfish_address_space_host.impl
+++ b/shared/OpenglCodecCommon/goldfish_address_space_host.impl
@@ -37,7 +37,7 @@
 GoldfishAddressSpaceBlockProvider::GoldfishAddressSpaceBlockProvider(uint64_t subdevice)
     : m_handle(HostAddressSpaceDevice::get()->open())
 {
-    if ((subdevice != SUBDEVICE_TYPE_HOST_MEMORY_ALLOCATOR_ID) && is_opened()) {
+    if ((subdevice != SUBDEVICE_TYPE_NO_SUBDEVICE_ID) && is_opened()) {
         AddressSpaceDevicePingInfo request;
         ::memset(&request, 0, sizeof(request));
         request.metadata = subdevice;