commit c4d07d5df3abedb671e1c49ff7c5d98b72ad7d64
author Ramkumar Radhakrishnan <ramkumar@codeaurora.org> Tue May 24 15:56:21 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 03 10:59:41 2016 -0700
tree 93def3bc3c447cec3a394ece3e94fb38152aaf89
parent 5f57d11c6fc747e39b9660d06d90d8cc22abecbf

sdm: Align GetFirstDisplayInterfaceType() with unit test framework

1. Read msm_fb_type from appropriate sysfs node.
2. Use Sys::Close_() instead of close() while closing fds.

Change-Id: Id8dd4320d995f58b973fbb31ecf4e30d52ce1151
CRs-Fixed: 1005180

sdm/libs/core/fb/hw_info.cpp

diff --git a/sdm/libs/core/fb/hw_info.cpp b/sdm/libs/core/fb/hw_info.cpp
index 25bb01c..a1a928c 100644
--- a/sdm/libs/core/fb/hw_info.cpp
+++ b/sdm/libs/core/fb/hw_info.cpp
@@ -554,7 +554,7 @@
   size_t len = kMaxStringLength;
   ssize_t read;
 
-  FILE *fileptr = Sys::fopen_("/sys/class/graphics/fb0/msm_fb_type", "r");
+  FILE *fileptr = Sys::fopen_("/sys/devices/virtual/graphics/fb0/msm_fb_type", "r");
   if (!fileptr) {
     free(stringbuffer);
     return kErrorHardware;
@@ -570,13 +570,13 @@
     }
   } else {
     free(stringbuffer);
-    fclose(fileptr);
+    Sys::fclose_(fileptr);
     return kErrorHardware;
   }
 
-  fclose(fileptr);
+  Sys::fclose_(fileptr);
 
-  fileptr = Sys::fopen_("/sys/class/graphics/fb0/connected", "r");
+  fileptr = Sys::fopen_("/sys/devices/virtual/graphics/fb0/connected", "r");
   if (!fileptr) {
     // If fb0 is for a DSI/connected panel, then connected node will not exist
     hw_disp_info->is_connected = true;
@@ -584,11 +584,11 @@
     if ((read = Sys::getline_(&line, &len, fileptr)) != -1) {
         hw_disp_info->is_connected =  (!strncmp(line, "1", strlen("1")));
     } else {
-        fclose(fileptr);
+        Sys::fclose_(fileptr);
         free(stringbuffer);
         return kErrorHardware;
     }
-    fclose(fileptr);
+    Sys::fclose_(fileptr);
   }
 
   free(stringbuffer);